zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

legion: do not set HIP_PATH env variable (#41660)

Browse Source 
* legion: do not set HIP_PATH env variable

* flecsi: workaround Legion CMake for +rocm
This commit is contained in:
Richard Berger 2023-12-19 08:14:19 -07:00 committed by GitHub
parent 02eafeee03
commit 2e18fbbdeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/flecsi/package.py
View File

@ -186,6 +186,9 @@ def cmake_args(self):
if "+rocm" in self.spec: if "+rocm" in self.spec:
options.append(self.define("CMAKE_CXX_COMPILER", self.spec["hip"].hipcc)) options.append(self.define("CMAKE_CXX_COMPILER", self.spec["hip"].hipcc))
options.append(self.define("CMAKE_C_COMPILER", self.spec["hip"].hipcc)) options.append(self.define("CMAKE_C_COMPILER", self.spec["hip"].hipcc))
if "backend=legion" in self.spec:
# CMake pulled in via find_package(Legion) won't work without this
options.append(self.define("HIP_PATH", "{0}/hip".format(spec["hip"].prefix)))
elif "+kokkos" in self.spec: elif "+kokkos" in self.spec:
options.append(self.define("CMAKE_CXX_COMPILER", self.spec["kokkos"].kokkos_cxx)) options.append(self.define("CMAKE_CXX_COMPILER", self.spec["kokkos"].kokkos_cxx))
else: else:

6
var/spack/repos/builtin/packages/legion/package.py
View File

@ -277,11 +277,6 @@ def validate_gasnet_root(value):
description="Maximum number of nodes supported by Legion.", description="Maximum number of nodes supported by Legion.",
) )
def setup_build_environment(self, build_env):
spec = self.spec
if "+rocm" in spec:
build_env.set("HIP_PATH", "{0}/hip".format(spec["hip"].prefix))
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec
cmake_cxx_flags = [] cmake_cxx_flags = []
@ -353,6 +348,7 @@ def cmake_args(self):
options.append(from_variant("Legion_HIP_TARGET", "hip_target")) options.append(from_variant("Legion_HIP_TARGET", "hip_target"))
options.append(from_variant("Legion_HIP_ARCH", "amdgpu_target")) options.append(from_variant("Legion_HIP_ARCH", "amdgpu_target"))
options.append(from_variant("Legion_HIJACK_HIP", "hip_hijack")) options.append(from_variant("Legion_HIJACK_HIP", "hip_hijack"))
options.append(self.define("HIP_PATH", "{0}/hip".format(spec["hip"].prefix)))
if "+fortran" in spec: if "+fortran" in spec:
# default is off. # default is off.