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

Expand Cray compiler checks in patch

Browse Source
This commit is contained in:
Wileam Yonatan Phan 2023-06-19 17:06:48 -05:00
parent 8327d9b9de
commit 15830ee8b0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/papi/intel-freeform.patch → var/spack/repos/builtin/packages/papi/intel-cray-freeform.patch
View File

@ -1,12 +1,13 @@
diff -Naur papi-7.0.1-orig/src/components/sde/tests/Makefile papi-7.0.1/src/components/sde/tests/Makefile 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-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 +++ papi-7.0.1/src/components/sde/tests/Makefile 2023-06-19 16:25:16.749303194 -0400
@@ -1,12 +1,16 @@ @@ -1,12 +1,17 @@
NAME=sde NAME=sde
include ../../Makefile_comp_tests.target include ../../Makefile_comp_tests.target
INCLUDE += -I$(datadir)/sde_lib -I.. INCLUDE += -I$(datadir)/sde_lib -I..
+ +
+intel_compilers := ifort ifx +intel_compilers := ifort ifx
+cray_compilers := ftn crayftn
ifeq ($(notdir $(F77)),gfortran) ifeq ($(notdir $(F77)),gfortran)
FFLAGS +=-ffree-form -ffree-line-length-none FFLAGS +=-ffree-form -ffree-line-length-none
else ifeq ($(notdir $(F77)),flang) else ifeq ($(notdir $(F77)),flang)
@ -14,7 +15,7 @@ diff -Naur papi-7.0.1-orig/src/components/sde/tests/Makefile papi-7.0.1/src/comp
-else -else
+else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),) +else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),)
FFLAGS +=-free FFLAGS +=-free
+else ifeq ($(notdir $(F77)),crayftn) +else ifneq ($(findstring $(notdir $(F77)),$(cray_compilers)),)
+ FFLAGS +=-ffree + FFLAGS +=-ffree
endif endif
FFLAGS +=-g FFLAGS +=-g
@ -22,11 +23,12 @@ diff -Naur papi-7.0.1-orig/src/components/sde/tests/Makefile papi-7.0.1/src/comp
diff -Naur papi-7.0.1-orig/src/components/sysdetect/tests/Makefile papi-7.0.1/src/components/sysdetect/tests/Makefile 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-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 +++ papi-7.0.1/src/components/sysdetect/tests/Makefile 2023-06-19 16:25:43.213238526 -0400
@@ -19,12 +19,15 @@ @@ -19,12 +19,16 @@
FTESTS = FTESTS =
endif endif
+intel_compilers := ifort ifx +intel_compilers := ifort ifx
+cray_compilers := ftn crayftn
ifeq ($(notdir $(F77)),gfortran) ifeq ($(notdir $(F77)),gfortran)
FFLAGS +=-ffree-form -ffree-line-length-none FFLAGS +=-ffree-form -ffree-line-length-none
else ifeq ($(notdir $(F77)),flang) else ifeq ($(notdir $(F77)),flang)
@ -34,7 +36,7 @@ diff -Naur papi-7.0.1-orig/src/components/sysdetect/tests/Makefile papi-7.0.1/sr
-else -else
+else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),) +else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),)
FFLAGS +=-free FFLAGS +=-free
+else ifeq ($(notdir $(F77)),crayftn) +else ifneq ($(findstring $(notdir $(F77)),$(cray_compilers)),)
+ FFLAGS +=-ffree + FFLAGS +=-ffree
endif endif