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

legion +rocm: apply patch for --offload-arch (#37775)

Browse Source 
* legion +rocm: apply patch for --offload-arch

* constrain to latest version
This commit is contained in:
eugeneswalker 2023-05-18 22:03:50 -05:00 committed by GitHub
parent 69ea180d26
commit 2ac3435810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
var/spack/repos/builtin/packages/legion/hip-offload-arch.patch Normal file
View File

@ -0,0 +1,24 @@
diff -ruN spack-src/CMakeLists.txt spack-src-patched/CMakeLists.txt
--- spack-src/CMakeLists.txt 2023-05-18 14:18:00.897162488 -0400
+++ spack-src-patched/CMakeLists.txt 2023-05-18 14:20:09.532413649 -0400
@@ -495,7 +495,7 @@
if("${Legion_HIP_ARCH}" STREQUAL "")
set(HIP_GENCODE "")
else()
- set(HIP_GENCODE "--offload-target=${Legion_HIP_ARCH}")
+ set(HIP_GENCODE "--offload-arch=${Legion_HIP_ARCH}")
endif()
endif()
diff -ruN spack-src/runtime/runtime.mk spack-src-patched/runtime/runtime.mk
--- spack-src/runtime/runtime.mk 2023-05-18 14:18:00.969164248 -0400
+++ spack-src-patched/runtime/runtime.mk 2023-05-18 14:20:51.317470176 -0400
@@ -499,7 +499,7 @@
HIPCC_FLAGS += -O2
endif
ifneq ($(strip $(HIP_ARCH)),)
- HIPCC_FLAGS += --offload-target=$(HIP_ARCH)
+ HIPCC_FLAGS += --offload-arch=$(HIP_ARCH)
endif
LEGION_LD_FLAGS += -lm -L$(HIP_PATH)/lib -lamdhip64
else ifeq ($(strip $(HIP_TARGET)),CUDA)

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

@ -70,6 +70,9 @@ class Legion(CMakePackage, ROCmPackage):
depends_on("kokkos@3.3.01:~cuda", when="+kokkos~cuda")
depends_on("kokkos@3.3.01:~cuda+openmp", when="+kokkos+openmp")
# https://github.com/spack/spack/issues/37232#issuecomment-1553376552
patch("hip-offload-arch.patch", when="@23.03.0 +rocm")
# HIP specific
variant(
"hip_hijack",