summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatish Balay <balay@mcs.anl.gov>2024-11-11 11:18:03 -0600
committerGitHub <noreply@github.com>2024-11-11 11:18:03 -0600
commit3b423a67a29d266cd1722b86a4420126b443811e (patch)
treecace7922162860f0e046d2df8ced9afeb1e79e8a
parentb803dabb2c28e93c41f62977c65aad385594b8f9 (diff)
downloadspack-3b423a67a29d266cd1722b86a4420126b443811e.tar.gz
spack-3b423a67a29d266cd1722b86a4420126b443811e.tar.bz2
spack-3b423a67a29d266cd1722b86a4420126b443811e.tar.xz
spack-3b423a67a29d266cd1722b86a4420126b443811e.zip
butterflypack: add v3.2.0, strumpack: add v8.0.0 (#47462)
* butterflypack: add v3.2.0 * strumpack: add v8.0.0 * restrict fj patch to @1.2.0 * Update var/spack/repos/builtin/packages/butterflypack/package.py Co-authored-by: Wouter Deconinck <wdconinc@gmail.com> --------- Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
-rw-r--r--var/spack/repos/builtin/packages/butterflypack/package.py7
-rw-r--r--var/spack/repos/builtin/packages/strumpack/package.py3
2 files changed, 7 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/butterflypack/package.py b/var/spack/repos/builtin/packages/butterflypack/package.py
index 7fc6cbd77b..c36d1d3a4b 100644
--- a/var/spack/repos/builtin/packages/butterflypack/package.py
+++ b/var/spack/repos/builtin/packages/butterflypack/package.py
@@ -28,6 +28,7 @@ class Butterflypack(CMakePackage):
license("BSD-3-Clause-LBNL")
version("master", branch="master")
+ version("3.2.0", sha256="0f1570947f0a7c0e130bbec3abbb2fa275ae453dc3f428e7a3a2265fecafe1ae")
version("2.4.0", sha256="12d04e7101b2c8292b5c62d9f42b5cd1e8a3c5af639d2665596e3e4255fd0804")
version("2.2.2", sha256="73f67073e4291877f1eee19483a8a7b3c761eaf79a75805d52105ceedead85ea")
version("2.2.1", sha256="4cedc2896a6b368773ce4f9003aa2c0230baf56a4464a6b899a155e01406a232")
@@ -61,9 +62,9 @@ class Butterflypack(CMakePackage):
# https://github.com/spack/spack/issues/31818
patch("qopenmp-for-oneapi.patch", when="@2.1.1 %oneapi")
- patch("longline.patch", when="%fj")
- patch("fjfortran.patch", when="%fj")
- patch("isnan.patch", when="%fj")
+ patch("longline.patch", when="@1.2.0 %fj")
+ patch("fjfortran.patch", when="@1.2.0 %fj")
+ patch("isnan.patch", when="@1.2.0 %fj")
def cmake_args(self):
spec = self.spec
diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py
index cb1428dcff..fc600ac42e 100644
--- a/var/spack/repos/builtin/packages/strumpack/package.py
+++ b/var/spack/repos/builtin/packages/strumpack/package.py
@@ -36,6 +36,7 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage):
license("BSD-3-Clause-LBNL")
version("master", branch="master")
+ version("8.0.0", sha256="11cc8645d622a16510b39a20efc64f34862b41976152d17f9fbf3e91f899766c")
version("7.2.0", sha256="6988c00c3213f13e53d75fb474102358f4fecf07a4b4304b7123d86fdc784639")
version("7.1.3", sha256="c951f38ee7af20da3ff46429e38fcebd57fb6f12619b2c56040d6da5096abcb0")
version("7.1.2", sha256="262a0193fa1682d0eaa90363f739e0be7a778d5deeb80e4d4ae12446082a39cc")
@@ -86,9 +87,11 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage):
depends_on("parmetis", when="+parmetis")
depends_on("scotch~metis", when="+scotch")
depends_on("scotch~metis+mpi", when="+scotch+mpi")
+ depends_on("scotch@7.0.4:", when="@8.0.0: +scotch")
depends_on("butterflypack@1.1.0", when="@3.3.0:3.9 +butterflypack+mpi")
depends_on("butterflypack@1.2.0:", when="@4.0.0: +butterflypack+mpi")
depends_on("butterflypack@2.1.0:", when="@6.3.0: +butterflypack+mpi")
+ depends_on("butterflypack@3.2.0:", when="@8.0.0: +butterflypack+mpi")
depends_on("cuda", when="@4.0.0: +cuda")
depends_on("zfp@0.5.5", when="@:7.0.1 +zfp")
depends_on("zfp", when="@7.0.2: +zfp")