umpire package: camp.hip_repair_options not safe for CachedCMakePackage

eugeneswalker · eugeneswalker · commit 1aaf096876fe · 2022-09-09T12:25:52.000-07:00
diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py
@@ -3,13 +3,13 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+import glob
 import os
 import socket
 
 import llnl.util.tty as tty
 
 from spack.package import *
-from spack.pkg.builtin.camp import hip_repair_options
 
 
 class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
@@ -188,7 +188,8 @@ def initconfig_hardware_entries(self):
         if "+rocm" in spec:
             entries.append(cmake_cache_option("ENABLE_HIP", True))
             entries.append(cmake_cache_path("HIP_ROOT_DIR", "{0}".format(spec["hip"].prefix)))
-            hip_repair_options(entries, spec)
+            hip_inc = glob.glob("{}/lib/clang/*/include".format(spec["llvm-amdgpu"].prefix))[0]
+            entries.append(cmake_cache_path("HIP_CLANG_INCLUDE_PATH", hip_inc))
             archs = self.spec.variants["amdgpu_target"].value
             if archs != "none":
                 arch_str = ",".join(archs)
