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
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
diff -Naur papi-7.0.1-orig/src/components/sde/tests/Makefile papi-7.0.1/src/components/sde/tests/Makefile
|
|
--- papi-7.0.1-orig/src/components/sde/tests/Makefile 2023-06-19 14:27:44.224943877 -0400
|
|
+++ papi-7.0.1/src/components/sde/tests/Makefile 2023-06-19 16:25:16.749303194 -0400
|
|
@@ -1,12 +1,17 @@
|
|
NAME=sde
|
|
include ../../Makefile_comp_tests.target
|
|
INCLUDE += -I$(datadir)/sde_lib -I..
|
|
+
|
|
+intel_compilers := ifort ifx
|
|
+cray_compilers := ftn crayftn
|
|
ifeq ($(notdir $(F77)),gfortran)
|
|
FFLAGS +=-ffree-form -ffree-line-length-none
|
|
else ifeq ($(notdir $(F77)),flang)
|
|
FFLAGS +=-ffree-form
|
|
-else
|
|
+else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),)
|
|
FFLAGS +=-free
|
|
+else ifneq ($(findstring $(notdir $(F77)),$(cray_compilers)),)
|
|
+ FFLAGS +=-ffree
|
|
endif
|
|
FFLAGS +=-g
|
|
CFLAGS +=-g
|
|
diff -Naur papi-7.0.1-orig/src/components/sysdetect/tests/Makefile papi-7.0.1/src/components/sysdetect/tests/Makefile
|
|
--- papi-7.0.1-orig/src/components/sysdetect/tests/Makefile 2023-06-19 14:27:44.220943888 -0400
|
|
+++ papi-7.0.1/src/components/sysdetect/tests/Makefile 2023-06-19 16:25:43.213238526 -0400
|
|
@@ -19,12 +19,16 @@
|
|
FTESTS =
|
|
endif
|
|
|
|
+intel_compilers := ifort ifx
|
|
+cray_compilers := ftn crayftn
|
|
ifeq ($(notdir $(F77)),gfortran)
|
|
FFLAGS +=-ffree-form -ffree-line-length-none
|
|
else ifeq ($(notdir $(F77)),flang)
|
|
FFLAGS +=-ffree-form
|
|
-else
|
|
+else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),)
|
|
FFLAGS +=-free
|
|
+else ifneq ($(findstring $(notdir $(F77)),$(cray_compilers)),)
|
|
+ FFLAGS +=-ffree
|
|
endif
|
|
|
|
TESTS = query_device_simple \
|