327a7a4031
* Add PAPI 7.0.1
* Add comment about skipping PAPI 7.0.0
* Add patch to avoid adding Intel ifort/ifx flag on Cray ftn
* Modify patch to include Cray-specific flags
* Adjust recipe to always apply patch for 7.0.1
* Expand Cray compiler checks in patch
* Forgot to update recipe
* Adjust recipe so it looks for hipcc in the correct path
* Revert "Adjust recipe so it looks for hipcc in the correct path"
This reverts commit 0db3df4fe2.
* Patch HIP_PATH to work with Spack-built HIP
* Patch LDFLAGS with llvm-amdgpu path
* Forgot the depends_on line
* libomptarget only builds with clang
* Try a self-consistent build of llvm-amdgpu
* Try making llvm-amdgpu depend on llvm for llvmoffloadarch library
* Update prereq to use rocm-openmp-extras instead
* Refactor llvm-amdgpu to use a version dict
* Fix typo
* Hack to exclude older versions without matching rocm-openmp-extras
* Add PAPI 7.1.0
* Revert changes to llvm-amdgpu
* Fix PAPI 7.1.0 checksum
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff -Naur papi-7.0.1-orig/src/components/rocm/tests/Makefile papi-7.0.1/src/components/rocm/tests/Makefile
|
|
--- papi-7.0.1-orig/src/components/rocm/tests/Makefile 2023-06-19 14:27:44.220943888 -0400
|
|
+++ papi-7.0.1/src/components/rocm/tests/Makefile 2023-06-20 19:09:56.564352488 -0400
|
|
@@ -1,9 +1,9 @@
|
|
NAME = rocm
|
|
include ../../Makefile_comp_tests.target
|
|
PAPI_ROCM_ROOT ?= /opt/rocm
|
|
-
|
|
-CC = $(PAPI_ROCM_ROOT)/hip/bin/hipcc
|
|
-CXX = $(PAPI_ROCM_ROOT)/hip/bin/hipcc
|
|
+HIP_PATH ?= $(PAPI_ROCM_ROOT)/hip
|
|
+CC = $(HIP_PATH)/bin/hipcc
|
|
+CXX = $(HIP_PATH)/bin/hipcc
|
|
CPPFLAGS+= -I$(PAPI_ROCM_ROOT)/include \
|
|
-I$(PAPI_ROCM_ROOT)/include/hip \
|
|
-I$(PAPI_ROCM_ROOT)/include/hsa \
|
|
diff -Naur papi-7.0.1-orig/src/components/rocm_smi/tests/Makefile papi-7.0.1/src/components/rocm_smi/tests/Makefile
|
|
--- papi-7.0.1-orig/src/components/rocm_smi/tests/Makefile 2023-06-19 14:27:44.220943888 -0400
|
|
+++ papi-7.0.1/src/components/rocm_smi/tests/Makefile 2023-06-20 19:10:49.383840816 -0400
|
|
@@ -4,8 +4,8 @@
|
|
NAME=rocm_smi
|
|
include ../../Makefile_comp_tests.target
|
|
PAPI_ROCM_ROOT ?= /opt/rocm
|
|
-HIP_PATH= ${PAPI_ROCM_ROOT}/hip
|
|
-HIPCC=$(HIP_PATH)/bin/hipcc
|
|
+HIP_PATH ?= $(PAPI_ROCM_ROOT)/hip
|
|
+HIPCC = $(HIP_PATH)/bin/hipcc
|
|
|
|
INCLUDE += -I$(PAPI_ROCM_ROOT)/include
|
|
INCLUDE += -I$(PAPI_ROCM_ROOT)/include/rocm_smi
|