llvm-amdgpu: remove the openmp variant. (#42807)

Add rocm-openmp-extras package as a dependency for +openmp for rocm

5 files changed, 6 insertions, 12 deletions

diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py
index be41c6655f..94a146fc90 100644
--- a/var/spack/repos/builtin/packages/hwloc/package.py
+++ b/var/spack/repos/builtin/packages/hwloc/package.py
@@ -133,7 +133,7 @@ class Hwloc(AutotoolsPackage, CudaPackage, ROCmPackage):
         depends_on("rocm-opencl", when="+opencl")
         # Avoid a circular dependency since the openmp
         # variant of llvm-amdgpu depends on hwloc.
-        depends_on("llvm-amdgpu~openmp", when="+opencl")
+        depends_on("llvm-amdgpu", when="+opencl")
 
     with when("+oneapi-level-zero"):
         depends_on("oneapi-level-zero")
diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py
index 042bd5ce27..0a78196563 100644
--- a/var/spack/repos/builtin/packages/lammps/package.py
+++ b/var/spack/repos/builtin/packages/lammps/package.py
@@ -640,7 +640,8 @@ class Lammps(CMakePackage, CudaPackage, ROCmPackage, PythonExtension):
     depends_on("vtk", when="+user-vtk")
     depends_on("vtk", when="+vtk")
     depends_on("hipcub", when="~kokkos +rocm")
-    depends_on("llvm-amdgpu +openmp", when="+rocm +openmp", type="build")
+    depends_on("llvm-amdgpu ", when="+rocm", type="build")
+    depends_on("rocm-openmp-extras", when="+rocm +openmp", type="build")
 
     # propagate CUDA and ROCm architecture when +kokkos
     for arch in CudaPackage.cuda_arch_values:
diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
index 7082f1bab0..731f3d9bef 100644
--- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
+++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
@@ -53,7 +53,6 @@ class LlvmAmdgpu(CMakePackage):
             "standalone spack package."
         ),
     )
-    variant("openmp", default=False, description="Enable OpenMP")
     variant(
         "llvm_dylib",
         default=False,
@@ -78,11 +77,6 @@ class LlvmAmdgpu(CMakePackage):
     depends_on("ncurses+termlib", type="link")
     depends_on("pkgconfig", type="build")
 
-    # openmp dependencies
-    depends_on("perl-data-dumper", type="build", when="+openmp")
-    depends_on("hwloc", when="+openmp")
-    depends_on("elf", type="link", when="+openmp")
-
     # OpenMP clang toolchain looks for bitcode files in llvm/bin/../lib
     # as per 5.2.0 llvm code. It used to be llvm/bin/../lib/libdevice.
     # Below patch is to look in the old path.
@@ -189,8 +183,6 @@ class LlvmAmdgpu(CMakePackage):
 
     def cmake_args(self):
         llvm_projects = ["clang", "lld", "clang-tools-extra", "compiler-rt"]
-        if "+openmp" in self.spec:
-            llvm_projects.append("openmp")
         llvm_runtimes = ["libcxx", "libcxxabi"]
         args = [
             self.define("LLVM_ENABLE_Z3_SOLVER", "OFF"),
diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py
index 9f79cfd45c..89f6508c7f 100644
--- a/var/spack/repos/builtin/packages/papi/package.py
+++ b/var/spack/repos/builtin/packages/papi/package.py
@@ -68,7 +68,8 @@ class Papi(AutotoolsPackage, ROCmPackage):
     depends_on("cuda", when="+nvml")
     depends_on("hsa-rocr-dev", when="+rocm")
     depends_on("rocprofiler-dev", when="+rocm")
-    depends_on("llvm-amdgpu +openmp", when="+rocm")
+    depends_on("llvm-amdgpu", when="+rocm")
+    depends_on("rocm-openmp-extras", when="+rocm")
     depends_on("rocm-smi-lib", when="+rocm_smi")
 
     conflicts("%gcc@8:", when="@5.3.0", msg="Requires GCC version less than 8.0")
diff --git a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py
index 1693311c8d..3e9583033f 100644
--- a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py
+++ b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py
@@ -205,7 +205,7 @@ class RocmOpenmpExtras(Package):
         depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
         depends_on(f"comgr@{ver}", when=f"@{ver}")
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
-        depends_on(f"llvm-amdgpu@{ver} ~openmp", when=f"@{ver}")
+        depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
 
     for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")