From 9fe315b953684b35c9eded7c216d85ebb3fd82b5 Mon Sep 17 00:00:00 2001 From: "Wileam Y. Phan" <50928756+wyphan@users.noreply.github.com> Date: Wed, 5 Oct 2022 11:45:47 -0400 Subject: Make hwloc both CudaPackage and ROCmPackage (#31334) * Make hwloc both CudaPackage and ROCmPackage * Remove redundant variants --- var/spack/repos/builtin/packages/hwloc/package.py | 7 +++---- 1 file 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") -- cgit v1.2.3-70-g09d2