diff mbox series

[1/1] package/openblas: bump to version v0.3.20

Message ID 20220305175041.2225915-1-ju.o@free.fr
State Accepted
Headers show
Series [1/1] package/openblas: bump to version v0.3.20 | expand

Commit Message

Julien Olivain March 5, 2022, 5:50 p.m. UTC
This commit dropped a patch included upstream. The other patch was
rebased.

For change log since v0.3.18, see:
- https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.19
- https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.20

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
Tested with:

    make check-package
    ...
    0 warnings generated

    ./utils/test-pkg -p openblas -a
    ...
    45 builds, 25 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
---
 ...nsider-Os-when-determining-LAPACK_NO.patch | 31 -------------------
 ...on-t-specify-optimization-level-bui.patch} |  9 +++---
 package/openblas/openblas.hash                |  2 +-
 package/openblas/openblas.mk                  |  2 +-
 4 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch
 rename package/openblas/{0002-Makefile.system-don-t-specify-optimization-level-bui.patch => 0001-Makefile.system-don-t-specify-optimization-level-bui.patch} (86%)

Comments

Arnout Vandecappelle March 15, 2022, 9:20 p.m. UTC | #1
On 05/03/2022 18:50, Julien Olivain wrote:
> This commit dropped a patch included upstream. The other patch was
> rebased.
> 
> For change log since v0.3.18, see:
> - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.19
> - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.20
> 
> Signed-off-by: Julien Olivain <ju.o@free.fr>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
> Tested with:
> 
>      make check-package
>      ...
>      0 warnings generated
> 
>      ./utils/test-pkg -p openblas -a
>      ...
>      45 builds, 25 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
> ---
>   ...nsider-Os-when-determining-LAPACK_NO.patch | 31 -------------------
>   ...on-t-specify-optimization-level-bui.patch} |  9 +++---
>   package/openblas/openblas.hash                |  2 +-
>   package/openblas/openblas.mk                  |  2 +-
>   4 files changed, 6 insertions(+), 38 deletions(-)
>   delete mode 100644 package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch
>   rename package/openblas/{0002-Makefile.system-don-t-specify-optimization-level-bui.patch => 0001-Makefile.system-don-t-specify-optimization-level-bui.patch} (86%)
> 
> diff --git a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch
> deleted file mode 100644
> index f9278bd099..0000000000
> --- a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001
> -From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> -Date: Fri, 5 Mar 2021 11:15:52 +0100
> -Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags
> -
> -gcc also supports -O, -Og and -Os as optimization flags.
> -They may be given on the make command-line by users.
> -
> -For the calculation of LAPACK_NOOPT, all such flags should be considered.
> -
> -Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> ----
> - Makefile | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/Makefile b/Makefile
> -index a22e16ba..fc5fe3f5 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -32,7 +32,7 @@ export NOFORTRAN
> - export NO_LAPACK
> - endif
> -
> --LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS))
> -+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS))
> -
> - SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test
> -
> ---
> -2.26.2
> -
> diff --git a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch
> similarity index 86%
> rename from package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch
> rename to package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch
> index bcc3e0eb6a..e0c738748a 100644
> --- a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch
> +++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch
> @@ -1,4 +1,4 @@
> -From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001
> +From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001
>   From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
>   Date: Fri, 5 Mar 2021 14:09:23 +0100
>   Subject: [PATCH] Makefile.system: don't specify optimization level
> @@ -12,16 +12,15 @@ The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives.
>   Remove the optimization level specified in openblas itself.
>   
>   Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> -
>   ---
>    Makefile.system | 4 ++--
>    1 file changed, 2 insertions(+), 2 deletions(-)
>   
>   diff --git a/Makefile.system b/Makefile.system
> -index 1e30d05a..04b0be16 100644
> +index 438a8148..9de1bbd5 100644
>   --- a/Makefile.system
>   +++ b/Makefile.system
> -@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g
> +@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g
>    endif
>    
>    ifndef COMMON_OPT
> @@ -36,5 +35,5 @@ index 1e30d05a..04b0be16 100644
>    
>    override CFLAGS     += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR)
>   --
> -2.26.2
> +2.35.1
>   
> diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash
> index a1e35f4fc4..71fc4d34c5 100644
> --- a/package/openblas/openblas.hash
> +++ b/package/openblas/openblas.hash
> @@ -1,3 +1,3 @@
>   # Locally calculated
> -sha256  1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb  openblas-0.3.18.tar.gz
> +sha256  8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c  openblas-0.3.20.tar.gz
>   sha256  190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff  LICENSE
> diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk
> index 4d506fa618..608c2f24ea 100644
> --- a/package/openblas/openblas.mk
> +++ b/package/openblas/openblas.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -OPENBLAS_VERSION = 0.3.18
> +OPENBLAS_VERSION = 0.3.20
>   OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION)
>   OPENBLAS_LICENSE = BSD-3-Clause
>   OPENBLAS_LICENSE_FILES = LICENSE
diff mbox series

Patch

diff --git a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch
deleted file mode 100644
index f9278bd099..0000000000
--- a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001
-From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
-Date: Fri, 5 Mar 2021 11:15:52 +0100
-Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags
-
-gcc also supports -O, -Og and -Os as optimization flags.
-They may be given on the make command-line by users.
-
-For the calculation of LAPACK_NOOPT, all such flags should be considered.
-
-Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index a22e16ba..fc5fe3f5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -32,7 +32,7 @@ export NOFORTRAN
- export NO_LAPACK
- endif
- 
--LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS))
-+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS))
- 
- SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test
- 
--- 
-2.26.2
-
diff --git a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch
similarity index 86%
rename from package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch
rename to package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch
index bcc3e0eb6a..e0c738748a 100644
--- a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch
+++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch
@@ -1,4 +1,4 @@ 
-From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001
+From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001
 From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 Date: Fri, 5 Mar 2021 14:09:23 +0100
 Subject: [PATCH] Makefile.system: don't specify optimization level
@@ -12,16 +12,15 @@  The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives.
 Remove the optimization level specified in openblas itself.
 
 Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
-
 ---
  Makefile.system | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.system b/Makefile.system
-index 1e30d05a..04b0be16 100644
+index 438a8148..9de1bbd5 100644
 --- a/Makefile.system
 +++ b/Makefile.system
-@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g
+@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g
  endif
  
  ifndef COMMON_OPT
@@ -36,5 +35,5 @@  index 1e30d05a..04b0be16 100644
  
  override CFLAGS     += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR)
 -- 
-2.26.2
+2.35.1
 
diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash
index a1e35f4fc4..71fc4d34c5 100644
--- a/package/openblas/openblas.hash
+++ b/package/openblas/openblas.hash
@@ -1,3 +1,3 @@ 
 # Locally calculated
-sha256  1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb  openblas-0.3.18.tar.gz
+sha256  8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c  openblas-0.3.20.tar.gz
 sha256  190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff  LICENSE
diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk
index 4d506fa618..608c2f24ea 100644
--- a/package/openblas/openblas.mk
+++ b/package/openblas/openblas.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-OPENBLAS_VERSION = 0.3.18
+OPENBLAS_VERSION = 0.3.20
 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION)
 OPENBLAS_LICENSE = BSD-3-Clause
 OPENBLAS_LICENSE_FILES = LICENSE