summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreugeneswalker <38933153+eugeneswalker@users.noreply.github.com>2023-10-24 00:08:05 -0700
committerGitHub <noreply@github.com>2023-10-24 01:08:05 -0600
commitcf9a32e6db7f106e0cac164b76b7dcc6b7bcdfbb (patch)
treed826eb688b0028f1e62d352576015cbd964b8d7a
parentbc54aa1e8219954001d2f9e44974c6a99cd58ce9 (diff)
downloadspack-cf9a32e6db7f106e0cac164b76b7dcc6b7bcdfbb.tar.gz
spack-cf9a32e6db7f106e0cac164b76b7dcc6b7bcdfbb.tar.bz2
spack-cf9a32e6db7f106e0cac164b76b7dcc6b7bcdfbb.tar.xz
spack-cf9a32e6db7f106e0cac164b76b7dcc6b7bcdfbb.zip
exago: fix v1.5.1 tag; only allow python up to 3.10 for for @:1.5 (#40676)
* exago: fix v1.5.1 tag; only allow python up to 3.10 for for @:1.5 due to pybind error with py 3.11 * hiop@:1.0 +cuda: constrain to cuda@:11.9
-rw-r--r--var/spack/repos/builtin/packages/exago/package.py4
-rw-r--r--var/spack/repos/builtin/packages/hiop/package.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/exago/package.py b/var/spack/repos/builtin/packages/exago/package.py
index d28b4fa1f8..b38aff0147 100644
--- a/var/spack/repos/builtin/packages/exago/package.py
+++ b/var/spack/repos/builtin/packages/exago/package.py
@@ -17,7 +17,7 @@ class Exago(CMakePackage, CudaPackage, ROCmPackage):
git = "https://github.com/pnnl/ExaGO.git"
maintainers("ryandanehy", "cameronrutherford", "pelesh")
- version("1.5.1", commit="7abe482c8da0e247f9de4896f5982c4cacbecd78", submodules=True)
+ version("1.5.1", tag="v1.5.1", submodules=True)
version("1.5.0", commit="227f49573a28bdd234be5500b3733be78a958f15", submodules=True)
version("1.4.1", commit="ea607c685444b5f345bfdc9a59c345f0f30adde2", submodules=True)
version("1.4.0", commit="4f4c3fdb40b52ace2d6ba000e7f24b340ec8e886", submodules=True)
@@ -64,7 +64,7 @@ class Exago(CMakePackage, CudaPackage, ROCmPackage):
)
# Dependencies
- depends_on("python@3.6:", when="@1.3.0:+python")
+ depends_on("python@3.6:3.10", when="@1.3.0:1.5+python")
depends_on("py-pytest", type=("build", "run"), when="@1.5.0:+python")
depends_on("py-mpi4py", when="@1.3.0:+mpi+python")
depends_on("pkgconfig", type="build")
diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py
index ff62c7da56..9ceedc36b4 100644
--- a/var/spack/repos/builtin/packages/hiop/package.py
+++ b/var/spack/repos/builtin/packages/hiop/package.py
@@ -104,6 +104,10 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage):
depends_on("magma@{0}:".format(magma_v), when="@{0}:+rocm".format(hiop_v))
depends_on("cuda@11:", when="@develop:+cuda")
+
+ # https://github.com/spack/spack/issues/40678
+ depends_on("cuda@:11.9", when="@:1.0 +cuda")
+
depends_on("raja", when="+raja")
depends_on("umpire", when="+raja")
depends_on("raja+openmp", when="+raja~cuda~rocm")