summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Frasch <simon.frasch@cscs.ch>2021-06-18 17:55:29 +0200
committerGitHub <noreply@github.com>2021-06-18 09:55:29 -0600
commit58272c9d5788561bce10d69b6ec136f28e0f11ad (patch)
tree4d6ba52aa2fdb1baa1476c25baa32fae09c69d93
parent1b51f09bf06cd28103af257a8ec2492cdf0679c4 (diff)
downloadspack-58272c9d5788561bce10d69b6ec136f28e0f11ad.tar.gz
spack-58272c9d5788561bce10d69b6ec136f28e0f11ad.tar.bz2
spack-58272c9d5788561bce10d69b6ec136f28e0f11ad.tar.xz
spack-58272c9d5788561bce10d69b6ec136f28e0f11ad.zip
spla: add version 1.5.0 and fix compilation with amdblis (#24374)
-rw-r--r--var/spack/repos/builtin/packages/spla/0001-amd_blis.patch13
-rw-r--r--var/spack/repos/builtin/packages/spla/package.py5
2 files changed, 18 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/spla/0001-amd_blis.patch b/var/spack/repos/builtin/packages/spla/0001-amd_blis.patch
new file mode 100644
index 0000000000..1bcc417b2b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/spla/0001-amd_blis.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/FindBLIS.cmake b/cmake/modules/FindBLIS.cmake
+index 3d6fb5d..2577598 100644
+--- a/cmake/modules/FindBLIS.cmake
++++ b/cmake/modules/FindBLIS.cmake
+@@ -52,7 +52,7 @@ endif()
+
+ find_library(
+ BLIS_LIBRARIES
+- NAMES "blis"
++ NAMES "blis-mt" "blis"
+ HINTS ${_BLIS_PATHS}
+ PATH_SUFFIXES "blis/lib" "blis/lib64" "blis"
+ )
diff --git a/var/spack/repos/builtin/packages/spla/package.py b/var/spack/repos/builtin/packages/spla/package.py
index c041a19ad2..d4d1237909 100644
--- a/var/spack/repos/builtin/packages/spla/package.py
+++ b/var/spack/repos/builtin/packages/spla/package.py
@@ -15,6 +15,7 @@ class Spla(CMakePackage):
url = "https://github.com/eth-cscs/spla/archive/v1.0.0.tar.gz"
git = 'https://github.com/eth-cscs/spla.git'
+ version('1.5.0', sha256='bea782d46ce615e1c40efc2bfb19d95e3b59f332fc9ca83ac7e6684b8ac2dd93')
version('1.4.0', sha256='364a9fe759fddec8a0839cf79f1cf0619fc36f4d4c15f1c2b1f437249d7840c6')
version('1.3.0', sha256='ff05a22bd655607ff941f3228ac8605a813e1eec6eaa49fbcf7b58a3a4cf5f00')
version('1.2.1', sha256='4d7237f752dc6257778c84ee19c9635072b1cb8ce8d9ab6e34a047f63a736b29')
@@ -47,6 +48,10 @@ class Spla(CMakePackage):
depends_on('blis threads=openmp', when='+openmp ^blis')
depends_on('intel-mkl threads=openmp', when='+openmp ^intel-mkl')
+ # Fix CMake find module for AMD BLIS,
+ # which uses a different library name for the multi-threaded version
+ patch('0001-amd_blis.patch', when='@1.3.0:1.4.0 ^amdblis')
+
def cmake_args(self):
args = [
self.define_from_variant('SPLA_OMP', 'openmp'),