From 0b8203940ad2ac736c7d0d59a953944a4c14eb13 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 22 Sep 2023 01:58:23 -0500 Subject: OpenBLAS: add v0.3.24 (#40132) Co-authored-by: adamjstewart --- .../repos/builtin/packages/openblas/package.py | 55 ++++++++++++---------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 09aa6963fa..8b00d2983c 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -14,12 +14,15 @@ class Openblas(MakefilePackage): """OpenBLAS: An optimized BLAS library""" homepage = "https://www.openblas.net" - url = "https://github.com/xianyi/OpenBLAS/releases/download/v0.2.19/OpenBLAS-0.2.19.tar.gz" - git = "https://github.com/xianyi/OpenBLAS.git" + url = ( + "https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.2.19/OpenBLAS-0.2.19.tar.gz" + ) + git = "https://github.com/OpenMathLib/OpenBLAS.git" libraries = ["libopenblas"] version("develop", branch="develop") + version("0.3.24", sha256="ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132") version("0.3.23", sha256="5d9491d07168a5d00116cdc068a40022c3455bf9293c7cb86a65b1054d7e5114") version("0.3.22", sha256="7fa9685926ba4f27cfe513adbf9af64d6b6b63f9dcabb37baefad6a65ff347a7") version("0.3.21", sha256="f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca") @@ -88,10 +91,10 @@ class Openblas(MakefilePackage): provides("lapack@3.9.1:", when="@0.3.15:") provides("lapack@3.7.0", when="@0.2.20") - # https://github.com/xianyi/OpenBLAS/pull/3712 + # https://github.com/OpenMathLib/OpenBLAS/pull/3712 patch("cce.patch", when="@0.3.20 %cce") - # https://github.com/xianyi/OpenBLAS/pull/3778 + # https://github.com/OpenMathLib/OpenBLAS/pull/3778 patch("fix-cray-fortran-detection-pr3778.patch", when="@0.3.21") # https://github.com/spack/spack/issues/31732 @@ -101,7 +104,7 @@ class Openblas(MakefilePackage): # OpenBLAS >=3.0 has an official way to disable internal parallel builds patch("make.patch", when="@0.2.16:0.2.20") # This patch is in a pull request to OpenBLAS that has not been handled - # https://github.com/xianyi/OpenBLAS/pull/915 + # https://github.com/OpenMathLib/OpenBLAS/pull/915 # UPD: the patch has been merged starting version 0.2.20 patch("openblas_icc.patch", when="@:0.2.19%intel") patch("openblas_icc_openmp.patch", when="@:0.2.20%intel@16.0:") @@ -111,23 +114,23 @@ class Openblas(MakefilePackage): patch("lapack-0.3.9-xerbl.patch", when="@0.3.8:0.3.9 %intel") # Fixes compilation error on POWER8 with GCC 7 - # https://github.com/xianyi/OpenBLAS/pull/1098 + # https://github.com/OpenMathLib/OpenBLAS/pull/1098 patch("power8.patch", when="@0.2.18:0.2.19 %gcc@7.1.0: target=power8") # Change file comments to work around clang 3.9 assembler bug - # https://github.com/xianyi/OpenBLAS/pull/982 + # https://github.com/OpenMathLib/OpenBLAS/pull/982 patch("openblas0.2.19.diff", when="@0.2.19") # Fix CMake export symbol error - # https://github.com/xianyi/OpenBLAS/pull/1703 + # https://github.com/OpenMathLib/OpenBLAS/pull/1703 patch("openblas-0.3.2-cmake.patch", when="@0.3.1:0.3.2") # Disable experimental TLS code that lead to many threading issues - # https://github.com/xianyi/OpenBLAS/issues/1735#issuecomment-422954465 - # https://github.com/xianyi/OpenBLAS/issues/1761#issuecomment-421039174 - # https://github.com/xianyi/OpenBLAS/pull/1765 + # https://github.com/OpenMathLib/OpenBLAS/issues/1735#issuecomment-422954465 + # https://github.com/OpenMathLib/OpenBLAS/issues/1761#issuecomment-421039174 + # https://github.com/OpenMathLib/OpenBLAS/pull/1765 patch( - "https://github.com/xianyi/OpenBLAS/commit/4d183e5567346f80f2ef97eb98f8601c47f8cb56.patch?full_index=1", + "https://github.com/OpenMathLib/OpenBLAS/commit/4d183e5567346f80f2ef97eb98f8601c47f8cb56.patch?full_index=1", sha256="9b02860bd78252ed9f09abb65a62fff22c0aeca002757d503f5b643a11b744bf", when="@0.3.3", ) @@ -135,30 +138,30 @@ class Openblas(MakefilePackage): # Fix parallel build issues on filesystems # with missing sub-second timestamp resolution patch( - "https://github.com/xianyi/OpenBLAS/commit/79ea839b635d1fd84b6ce8a47e086f01d64198e6.patch?full_index=1", + "https://github.com/OpenMathLib/OpenBLAS/commit/79ea839b635d1fd84b6ce8a47e086f01d64198e6.patch?full_index=1", sha256="1cbadd897d037e6015384aaad70efe0d9eac4382482ee01e3fbe89cde2a1ebea", when="@0.3.0:0.3.3", ) - # Fix https://github.com/xianyi/OpenBLAS/issues/2431 - # Patch derived from https://github.com/xianyi/OpenBLAS/pull/2424 + # Fix https://github.com/OpenMathLib/OpenBLAS/issues/2431 + # Patch derived from https://github.com/OpenMathLib/OpenBLAS/pull/2424 patch("openblas-0.3.8-darwin.patch", when="@0.3.8 platform=darwin") - # Fix ICE in LLVM 9.0.0 https://github.com/xianyi/OpenBLAS/pull/2329 - # Patch as in https://github.com/xianyi/OpenBLAS/pull/2597 + # Fix ICE in LLVM 9.0.0 https://github.com/OpenMathLib/OpenBLAS/pull/2329 + # Patch as in https://github.com/OpenMathLib/OpenBLAS/pull/2597 patch("openblas_appleclang11.patch", when="@0.3.8:0.3.9 %apple-clang@11.0.3") # There was an error in Reference-LAPACK that is triggeret by Xcode12 - # fixed upstream by https://github.com/xianyi/OpenBLAS/pull/2808 and + # fixed upstream by https://github.com/OpenMathLib/OpenBLAS/pull/2808 and # should be included in post 0.3.10 versions. Application to earlier # versions was not tested. - # See also https://github.com/xianyi/OpenBLAS/issues/2870 + # See also https://github.com/OpenMathLib/OpenBLAS/issues/2870 patch( - "https://github.com/xianyi/OpenBLAS/commit/f42e84d46c52f4ee1e05af8f365cd85de8a77b95.patch?full_index=1", + "https://github.com/OpenMathLib/OpenBLAS/commit/f42e84d46c52f4ee1e05af8f365cd85de8a77b95.patch?full_index=1", sha256="d38396ed602c3b655ad8cfc3d70b72726c567643578bf65466527f3a57bbd495", when="@0.3.8:0.3.10 %apple-clang@12.0.0:", ) # Add conditions to f_check to determine the Fujitsu compiler - # See https://github.com/xianyi/OpenBLAS/pull/3010 + # See https://github.com/OpenMathLib/OpenBLAS/pull/3010 # UPD: the patch has been merged starting version 0.3.13 patch("openblas_fujitsu.patch", when="@:0.3.10 %fj") patch("openblas_fujitsu_v0.3.11.patch", when="@0.3.11:0.3.12 %fj") @@ -168,18 +171,18 @@ class Openblas(MakefilePackage): patch("0001-use-usr-bin-env-perl.patch", when="@:0.3.13") # Declare external functions in linktest - # See + # See patch("linktest.patch", when="@0.3.20") # Fix build on ARM Neoverse N1 when using gcc@:9. The 1st patch is context for the 2nd patch: patch( - "https://github.com/xianyi/OpenBLAS/commit/68277282df4adaafaf9b4a01c2eeb629eed99528.patch?full_index=1", + "https://github.com/OpenMathLib/OpenBLAS/commit/68277282df4adaafaf9b4a01c2eeb629eed99528.patch?full_index=1", sha256="a4c642fbaeafbf4178558368212594e99c74a7b6c2a119fd0627f7b54f1ebfb3", when="@0.3.21 %gcc@:9", ) # gcc@:9 doesn't support sve2 and bf16 architecture features, apply upstream fix: patch( - "https://github.com/xianyi/OpenBLAS/commit/c957ad684ed6b8ca64f332221b376f2ad0fdc51a.patch?full_index=1", + "https://github.com/OpenMathLib/OpenBLAS/commit/c957ad684ed6b8ca64f332221b376f2ad0fdc51a.patch?full_index=1", sha256="c20f5188a9145395c37c22ae5c1f72bfc24edfbccbb636cc8f9227345615daa8", when="@0.3.21 %gcc@:9", ) @@ -189,7 +192,7 @@ class Openblas(MakefilePackage): # as GCC only has major.minor releases. But the bound :7.3.0 doesn't hurt) conflicts("%gcc@7:7.3.0,8:8.2", when="@0.3.11:") - # See https://github.com/xianyi/OpenBLAS/issues/3074 + # See https://github.com/OpenMathLib/OpenBLAS/issues/3074 conflicts("%gcc@:10.1", when="@0.3.13 target=ppc64le:") # See https://github.com/spack/spack/issues/3036 @@ -239,7 +242,7 @@ class Openblas(MakefilePackage): # require both. # As of 08/2022 (0.3.21), we can build purely with a C compiler using # a f2c translated LAPACK version - # https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.21 + # https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.21 if self.compiler.fc is None and "~fortran" not in self.spec: raise InstallError( self.compiler.cc -- cgit v1.2.3-70-g09d2