From de6c3dc21836c4482a814358967ddaa52b40e5d9 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 27 Mar 2025 18:02:42 +0100 Subject: [PATCH] Let's postpone update of hip handling in camp --- var/spack/repos/builtin/packages/camp/package.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/camp/package.py b/var/spack/repos/builtin/packages/camp/package.py index 868cb4e9c58..dad78f6da72 100644 --- a/var/spack/repos/builtin/packages/camp/package.py +++ b/var/spack/repos/builtin/packages/camp/package.py @@ -2,8 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import os - from spack.package import * @@ -114,14 +112,7 @@ def cmake_args(self): options.append(self.define_from_variant("ENABLE_HIP", "rocm")) if spec.satisfies("+rocm"): - rocm_root = os.path.dirname(spec["llvm-amdgpu"].prefix) - options.append("-DROCM_PATH={0}".format(rocm_root)) - - # there is only one dir like this, but the version component is unknown - options.append( - "-DHIP_CLANG_INCLUDE_PATH=" - + glob.glob("{}/lib/clang/*/include".format(spec["llvm-amdgpu"].prefix))[0] - ) + options.append("-DHIP_ROOT_DIR={0}".format(spec["hip"].prefix)) archs = ";".join(self.spec.variants["amdgpu_target"].value) options.append("-DCMAKE_HIP_ARCHITECTURES={0}".format(archs))