forked from spack/spack
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add PAPI 7.0.1 and 7.1.0 (spack#38443)
* 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 0db3df4. * 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
- Loading branch information
1 parent
980dab3
commit 8da0320
Showing
3 changed files
with
81 additions
and
1 deletion.
There are no files selected for viewing
43 changes: 43 additions & 0 deletions
43
var/spack/repos/builtin/packages/papi/intel-cray-freeform.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
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 \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
var/spack/repos/builtin/packages/papi/spack-hip-path.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
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 |