diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/kokkos/package.py | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 99f45c3fd4..92daad8bd0 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os.path -from llnl.util import tty +from llnl.util import lang, tty from spack.package import * @@ -175,22 +175,14 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): description="Intel GPU architecture", ) - devices_values = list(devices_variants.keys()) - for dev in devices_variants: - dflt, desc = devices_variants[dev] + for dev, (dflt, desc) in devices_variants.items(): variant(dev, default=dflt, description=desc) conflicts("+cuda", when="+rocm", msg="CUDA and ROCm are not compatible in Kokkos.") - options_values = list(options_variants.keys()) - for opt in options_values: - if "cuda" in opt: - conflicts("+%s" % opt, when="~cuda", msg="Must enable CUDA to use %s" % opt) - dflt, desc = options_variants[opt] - variant(opt, default=dflt, description=desc) + for opt, (dflt, desc) in options_variants.items(): + variant(opt, default=dflt, description=desc, when=("+cuda" if "cuda" in opt else None)) - tpls_values = list(tpls_variants.keys()) - for tpl in tpls_values: - dflt, desc = tpls_variants[tpl] + for tpl, (dflt, desc) in tpls_variants.items(): variant(tpl, default=dflt, description=desc) depends_on(tpl, when="+%s" % tpl) @@ -264,7 +256,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): optname = "Kokkos_%s_%s" % (cmake_prefix, opt.upper()) # Explicitly enable or disable option = self.define_from_variant(optname, variant_name) - if option not in spack_options: + if option: spack_options.append(option) def setup_dependent_package(self, module, dependent_spec): @@ -316,11 +308,11 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): for arch in spack_microarches: options.append(self.define("Kokkos_ARCH_" + arch.upper(), True)) - self.append_args("ENABLE", self.devices_values, options) - self.append_args("ENABLE", self.options_values, options) - self.append_args("ENABLE", self.tpls_values, options) + self.append_args("ENABLE", self.devices_variants.keys(), options) + self.append_args("ENABLE", self.options_variants.keys(), options) + self.append_args("ENABLE", self.tpls_variants.keys(), options) - for tpl in self.tpls_values: + for tpl in self.tpls_variants: if spec.variants[tpl].value: options.append(self.define(tpl + "_DIR", spec[tpl].prefix)) @@ -334,7 +326,8 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): if self.spec.satisfies("%oneapi") or self.spec.satisfies("%intel"): options.append(self.define("CMAKE_CXX_FLAGS", "-fp-model=precise")) - return options + # Remove duplicate options + return lang.dedupe(options) test_script_relative_path = join_path("scripts", "spack_test") |