From 0e9b5a05e8b3cb037923f3c299a988d6952fd253 Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:16:14 -0500 Subject: mgard: add 2023-03-31, 2023-01-10 (#36585) --- var/spack/repos/builtin/packages/mgard/package.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mgard/package.py b/var/spack/repos/builtin/packages/mgard/package.py index f79ecf3961..dee7723e1b 100644 --- a/var/spack/repos/builtin/packages/mgard/package.py +++ b/var/spack/repos/builtin/packages/mgard/package.py @@ -18,6 +18,10 @@ class Mgard(CMakePackage, CudaPackage): maintainers("robertu94") + tags = ["e4s"] + + version("2023-03-31", commit="a8a04a86ff30f91d0b430a7c52960a12fa119589", preferred=True) + version("2023-01-10", commit="3808bd8889a0f8e6647fc0251a3189bc4dfc920f") version("2022-11-18", commit="72dd230ed1af88f62ed3c0f662e2387a6e587748") version("2021-11-12", commit="3c05c80a45a51bb6cc5fb5fffe7b1b16787d3366") version("2020-10-01", commit="b67a0ac963587f190e106cc3c0b30773a9455f7a") @@ -46,11 +50,14 @@ class Mgard(CMakePackage, CudaPackage): conflicts("%gcc@:7", when="@2022-11-18:", msg="requires std::optional and other c++17 things") def cmake_args(self): + spec = self.spec args = ["-DBUILD_TESTING=OFF"] args.append(self.define_from_variant("MGARD_ENABLE_CUDA", "cuda")) - if "+cuda" in self.spec: - cuda_arch = self.spec.variants["cuda_arch"].value - args.append("-DCUDA_ARCH_STRING={}".format(";".join(cuda_arch))) + if "+cuda" in spec: + cuda_arch_list = spec.variants["cuda_arch"].value + arch_str = ";".join(cuda_arch_list) + if cuda_arch_list[0] != "none": + args.append(self.define("CMAKE_CUDA_ARCHITECTURES", arch_str)) if self.spec.satisfies("@:2021-11-12"): if "+cuda" in self.spec: if "75" in cuda_arch: -- cgit v1.2.3-70-g09d2