hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

beatnik: mall changes for v1.0 (#40726)

Browse source 
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
This commit is contained in:
Patrick Bridges 2023-10-31 15:28:48 -06:00 committed by GitHub
parent 343ed8a3fa
commit 4738b45fb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
var/spack/repos/builtin/packages/beatnik/package.py
View file

@ -14,8 +14,7 @@ class Beatnik(CMakePackage, CudaPackage, ROCmPackage):
maintainers("patrickb314", "JStewart28") maintainers("patrickb314", "JStewart28")
# Add proper versions and checksums here. Will add 1.0 when a proper SHA is available version("1.0", commit="ae31ef9cb44678d5ace77994b45b0778defa3d2f")
# version("1.0", sha256="XXX")
version("develop", branch="develop") version("develop", branch="develop")
version("main", branch="main") version("main", branch="main")
@ -55,6 +54,7 @@ class Beatnik(CMakePackage, CudaPackage, ROCmPackage):
conflicts("mpich ~rocm", when="+rocm") conflicts("mpich ~rocm", when="+rocm")
conflicts("openmpi ~cuda", when="+cuda") conflicts("openmpi ~cuda", when="+cuda")
conflicts("^intel-mpi") # Heffte won't build with intel MPI because of needed C++ MPI support 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 # Propagate CUDA and AMD GPU targets to cabana
for cuda_arch in CudaPackage.cuda_arch_values: for cuda_arch in CudaPackage.cuda_arch_values:

1
var/spack/repos/builtin/packages/silo/package.py
View file

@ -111,7 +111,6 @@ def flag_handler(self, name, flags):
if "+hdf5" in spec: if "+hdf5" in spec:
if spec["hdf5"].satisfies("~shared"): if spec["hdf5"].satisfies("~shared"):
flags.append("-ldl") flags.append("-ldl")
flags.append(spec["readline"].libs.search_flags)
if "+pic" in spec: if "+pic" in spec:
if name == "cflags": if name == "cflags":