summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Bridges <patrickb314@gmail.com>2023-10-31 15:28:48 -0600
committerGitHub <noreply@github.com>2023-10-31 22:28:48 +0100
commit4738b45fb1252daf6c3c40734d514e7f845c46d0 (patch)
treee91f5683f411f2a95b6c7c5cf3d45118a194bb46
parent343ed8a3faa9927045a26b9b569a261811e61716 (diff)
downloadspack-4738b45fb1252daf6c3c40734d514e7f845c46d0.tar.gz
spack-4738b45fb1252daf6c3c40734d514e7f845c46d0.tar.bz2
spack-4738b45fb1252daf6c3c40734d514e7f845c46d0.tar.xz
spack-4738b45fb1252daf6c3c40734d514e7f845c46d0.zip
beatnik: mall changes for v1.0 (#40726)
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
-rw-r--r--var/spack/repos/builtin/packages/beatnik/package.py4
-rw-r--r--var/spack/repos/builtin/packages/silo/package.py1
2 files changed, 2 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/beatnik/package.py b/var/spack/repos/builtin/packages/beatnik/package.py
index aa39194494..9afa9afa38 100644
--- a/var/spack/repos/builtin/packages/beatnik/package.py
+++ b/var/spack/repos/builtin/packages/beatnik/package.py
@@ -14,8 +14,7 @@ class Beatnik(CMakePackage, CudaPackage, ROCmPackage):
maintainers("patrickb314", "JStewart28")
- # Add proper versions and checksums here. Will add 1.0 when a proper SHA is available
- # version("1.0", sha256="XXX")
+ version("1.0", commit="ae31ef9cb44678d5ace77994b45b0778defa3d2f")
version("develop", branch="develop")
version("main", branch="main")
@@ -55,6 +54,7 @@ class Beatnik(CMakePackage, CudaPackage, ROCmPackage):
conflicts("mpich ~rocm", when="+rocm")
conflicts("openmpi ~cuda", when="+cuda")
conflicts("^intel-mpi") # Heffte won't build with intel MPI because of needed C++ MPI support
+ conflicts("^spectrum-mpi", when="^cuda@11.3:") # cuda-aware spectrum is broken with cuda 11.3:
# Propagate CUDA and AMD GPU targets to cabana
for cuda_arch in CudaPackage.cuda_arch_values:
diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py
index 4b4a0194e8..2678b0d7c5 100644
--- a/var/spack/repos/builtin/packages/silo/package.py
+++ b/var/spack/repos/builtin/packages/silo/package.py
@@ -111,7 +111,6 @@ class Silo(AutotoolsPackage):
if "+hdf5" in spec:
if spec["hdf5"].satisfies("~shared"):
flags.append("-ldl")
- flags.append(spec["readline"].libs.search_flags)
if "+pic" in spec:
if name == "cflags":