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

sirius: simplify hip architectures, fix umpire dependency (#39776)

Browse source
This commit is contained in:
Simon Pintarelli 2023-09-06 23:46:38 +02:00 committed by GitHub
parent 865c8b606c
commit 1c0dbab821
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
var/spack/repos/builtin/packages/sirius/package.py
View file

@ -240,7 +240,7 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage):
depends_on("costa+shared", when="@7.3.2:") depends_on("costa+shared", when="@7.3.2:")
with when("@7.5: +memory_pool"): with when("@7.5: +memory_pool"):
depends_on("umpire") depends_on("umpire~cuda~rocm", when="~cuda~rocm")
depends_on("umpire+cuda~device_alloc", when="+cuda") depends_on("umpire+cuda~device_alloc", when="+cuda")
depends_on("umpire+rocm~device_alloc", when="+rocm") depends_on("umpire+rocm~device_alloc", when="+rocm")
@ -347,12 +347,6 @@ def cmake_args(self):
if "+rocm" in spec: if "+rocm" in spec:
archs = ",".join(self.spec.variants["amdgpu_target"].value) archs = ",".join(self.spec.variants["amdgpu_target"].value)
args.extend( args.extend([self.define("CMAKE_HIP_ARCHITECTURES", archs)])
[
self.define("HIP_ROOT_DIR", spec["hip"].prefix),
self.define("HIP_HCC_FLAGS", "--amdgpu-target={0}".format(archs)),
self.define("HIP_CXX_COMPILER", self.spec["hip"].hipcc),
]
)
return args return args