diff options
| author | Wileam Y. Phan <50928756+wyphan@users.noreply.github.com> | 2022-10-05 11:45:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-05 09:45:47 -0600 |
| commit | 9fe315b953684b35c9eded7c216d85ebb3fd82b5 (patch) | |
| tree | 2132da05ecb6b9c1840fe35a84e9f2ba3cae3518 | |
| parent | 592d97137a4f04245ef07290ce592674381f173d (diff) | |
| download | spack-9fe315b953684b35c9eded7c216d85ebb3fd82b5.tar.gz spack-9fe315b953684b35c9eded7c216d85ebb3fd82b5.tar.bz2 spack-9fe315b953684b35c9eded7c216d85ebb3fd82b5.tar.xz spack-9fe315b953684b35c9eded7c216d85ebb3fd82b5.zip | |
Make hwloc both CudaPackage and ROCmPackage (#31334)
* Make hwloc both CudaPackage and ROCmPackage
* Remove redundant variants
| -rw-r--r-- | var/spack/repos/builtin/packages/hwloc/package.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index 461165d05a..4c67d3e32b 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -8,7 +8,7 @@ import sys from spack.package import * -class Hwloc(AutotoolsPackage): +class Hwloc(AutotoolsPackage, CudaPackage, ROCmPackage): """The Hardware Locality (hwloc) software project. The Portable Hardware Locality (hwloc) software package @@ -64,7 +64,6 @@ class Hwloc(AutotoolsPackage): variant("nvml", default=False, description="Support NVML device discovery") variant("gl", default=False, description="Support GL device discovery") - variant("cuda", default=False, description="Support CUDA devices") variant("libxml2", default=True, description="Build with libxml2") variant("libudev", default=False, description="Build with libudev") variant( @@ -167,8 +166,8 @@ class Hwloc(AutotoolsPackage): args.append("--disable-rsmi") if "+rocm" in self.spec: - args.append("--with-rocm={0}".format(self.spec["rocm"].prefix)) - args.append("--with-rocm-version={0}".format(self.spec["rocm"].version)) + args.append("--with-rocm={0}".format(self.spec["hip"].prefix)) + args.append("--with-rocm-version={0}".format(self.spec["hip"].version)) if "+netloc" in self.spec: args.append("--enable-netloc") |