diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/aml/package.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/aml/package.py b/var/spack/repos/builtin/packages/aml/package.py index 5d4114a275..88e0125622 100644 --- a/var/spack/repos/builtin/packages/aml/package.py +++ b/var/spack/repos/builtin/packages/aml/package.py @@ -31,6 +31,7 @@ class Aml(AutotoolsPackage): # version string is generated from git tags, requires entire repo version("master", branch="master", submodules=True, get_full_repo=True) + version("0.2.1", sha256="bae49e89ed0f2a2ad3547430e79b7e4c018d6228c6ed951a12d59afd0b35f71c") version("0.2.0", sha256="2044a2f3f1d7a19827dd9c0726172b690189b4d3fe938656c4160c022468cc4a") version( "0.1.0", @@ -45,10 +46,12 @@ class Aml(AutotoolsPackage): variant("ze", default=False, description="Support for memory operations on top of Level Zero.") variant("hip", default=False, description="Support for memory operations on top of HIP.") variant("cuda", default=False, description="Support for memory operations on top of CUDA.") - variant("hwloc", default=False, description="Enable feature related to topology management") + variant("hwloc", default=True, description="Enable feature related to topology management") variant( "hip-platform", - values=disjoint_sets(("amd", "nvidia")), + values=("none", conditional("amd", when="+hip"), conditional("nvidia", when="+cuda")), + default="none", + multi=False, description="HIP backend platform.", ) @@ -68,6 +71,10 @@ class Aml(AutotoolsPackage): depends_on("hwloc@2.1:", when="+hwloc") # - ocl-icd >= 2.1 becomes a dependency when +opencl variant is used. depends_on("ocl-icd@2.1:", when="+opencl") + # Required on master for autoconf pull the right pkg.m4 macros, + # and on other builds to detect dependencies + # Note: This does NOT work with pkg-config but requires pkgconf! + depends_on("pkgconf", type="build") # when on master, we need all the autotools and extras to generate files. with when("@master"): @@ -75,9 +82,6 @@ class Aml(AutotoolsPackage): depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") - # Required to have pkg config macros in configure. - # Note: This does NOT work with pkg-config but requires pkgconf! - depends_on("pkgconf", type="build") # Required to generate AML version in configure. depends_on("git", type="build") @@ -91,9 +95,9 @@ class Aml(AutotoolsPackage): config_args.extend(self.with_or_without(b)) if self.spec.satisfies("%oneapi"): config_args += ["--with-openmp-flags=-fiopenmp -fopenmp-targets=spir64"] - if "hip-platform=amd" in self.spec: + if self.spec.variants["hip-platform"].value == "amd": config_args += ["--with-hip-platform=amd"] - if "hip-platform=nvidia" in self.spec: + if self.spec.variants["hip-platform"].value == "nvidia": config_args += ["--with-hip-platform=nvidia"] return config_args |