From b3679406d04349d40d99692855135faed2c85b4a Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Mon, 28 Nov 2022 16:03:27 -0500 Subject: omegah: new scorec version, fix cuda flags (#34169) --- var/spack/repos/builtin/packages/omega-h/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index c9660995a4..ee9f713a42 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -19,6 +19,11 @@ class OmegaH(CMakePackage, CudaPackage): maintainers = ["cwsmith"] tags = ["e4s"] version("main", branch="main") + version( + "scorec.10.6.0", + commit="f376fad4741b55a4b2482218eb3437d719b7c72e", + git="https://github.com/SCOREC/omega_h.git", + ) version( "scorec.10.1.0", commit="e88912368e101d940f006019585701a704295ab0", @@ -97,7 +102,10 @@ class OmegaH(CMakePackage, CudaPackage): cuda_arch_list = self.spec.variants["cuda_arch"].value cuda_arch = cuda_arch_list[0] if cuda_arch != "none": - args.append("-DOmega_h_CUDA_ARCH={0}".format(cuda_arch)) + if "scorec" in str(self.spec.version): + args.append("-DOmega_h_CUDA_ARCH={0}".format(cuda_arch)) + else: + args.append("-DCMAKE_CUDA_FLAGS=-arch=sm_{0}".format(cuda_arch)) else: args.append("-DOmega_h_USE_CUDA:BOOL=OFF") if "+trilinos" in self.spec: -- cgit v1.2.3-60-g2f50