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

patch petsc test cases for XL compiler (#8091)

Browse Source 
- After spack install, these test cases are built in a seperate step, outside of spack, but they need to patched after staging so users don't have to do it in a seperate step.

- The test cases are installed under `<petsc install directory>/share/petsc/examples` and can be built and executed by invoking `gmake -f gmakefile.test` in that directory.
This commit is contained in:
Serban Maerean
2018-05-15 02:53:05 -04:00
committed by Todd Gamblin
parent b956608631
commit 0598f70de2
2 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/petsc/package.py
View File

@@ -102,6 +102,8 @@ class Petsc(Package):
patch('macos-clang-8.1.0.diff',
when='@3.7.5%clang@8.1.0:')
patch('pkg-config-3.7.6-3.8.4.diff', when='@3.7.6:3.8.4')
patch('xlc-test-3.9.0.diff', when='@3.9: %xl')
patch('xlc-test-3.9.0.diff', when='@3.9: %xl_r')
# Virtual dependencies
# Git repository needs sowing to build Fortran interface

60
var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff Normal file
View File

@@ -0,0 +1,60 @@
--- a/gmakefile.test
+++ b/gmakefile.test
@@ -123,15 +123,16 @@
ifeq ($(FC_MODULE_OUTPUT_FLAG),)
$(call quiet,FCMOD) $(MODDIR) && $(FC) -c $(FC_FLAGS) $(FFLAGS) $(FCPPFLAGS) $(FC_DEPFLAGS) -I$(dir $<) $(abspath $<) -o $(abspath $@)
else
- $(PETSC_COMPILE.F) -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR)
+ $(PETSC_COMPILE.F) -I$(dir $<) -I$(MODDIR) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR)
endif
-@$(GFORTRAN_DEP_CLEANUP)
+XLF2003FLAGS = "-qxlf2003=polymorphic:bozlitargs:stopexcept:volatile:autorealloc"
$(TESTDIR)/%.o : $(EXAMPLESDIR)/%.F90 | $$(@D)/.DIR
ifeq ($(FC_MODULE_OUTPUT_FLAG),)
$(call quiet,FCMOD) $(MODDIR) && $(FC) -c $(FC_FLAGS) $(FFLAGS) $(FCPPFLAGS) $(FC_DEPFLAGS) -I$(dir $<) $(abspath $<) -o $(abspath $@)
else
- $(PETSC_COMPILE.F) -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR)
+ $(PETSC_COMPILE.F) ${XLF2003FLAGS} -I$(dir $<) -I$(MODDIR) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR)
endif
-@$(GFORTRAN_DEP_CLEANUP)
--- a/src/ksp/ksp/examples/tutorials/ex6f.F90
+++ b/src/ksp/ksp/examples/tutorials/ex6f.F90
@@ -173,7 +173,7 @@
call PetscOptionsHasName(PETSC_NULL_OPTIONS,PETSC_NULL_CHARACTER,'-mat_view',pflag,ierr)
if (pflag) then
if (rank .eq. 0) write(6,100)
- call flush(6)
+ call flush_(6)
endif
call MatConvert(A,MATSAME,MAT_INITIAL_MATRIX,A2,ierr)
! All other times: Set previous solution as initial guess for next solve.
@@ -190,7 +190,7 @@
call MatAssemblyBegin(A,MAT_FINAL_ASSEMBLY,ierr)
if (pflag) then
if (rank .eq. 0) write(6,110)
- call flush(6)
+ call flush_(6)
endif
call MatAssemblyEnd(A,MAT_FINAL_ASSEMBLY,ierr)
--- a/src/vec/vec/examples/tutorials/ex21.c
+++ b/src/vec/vec/examples/tutorials/ex21.c
@@ -8,13 +8,13 @@
#define f90array1daccessmystruct_ F90ARRAY1DACCESSMYSTRUCT
#define f90array1ddestroymystruct_ F90ARRAY1DDESTROYMYSTRUCT
#define f90array1dgetaddrmystruct_ F90ARRAY1DGETADDRMYSTRUCT
-#elif !defined(PETSC_HAVE_FORTRAN_UNDERSCORE)
+#elif defined(PETSC_HAVE_FORTRAN_NOUNDERSCORE)
#define vecgetarraymystruct_ vecgetarraymystruct
#define vecrestorearraymystruct_ vecrestorearraymystruct
#define f90array1dcreatemystruct_ f90array1dcreatemystruct
#define f90array1daccessmystruct_ f90array1daccessmystruct
#define f90array1ddestroymystruct_ f90array1ddestroymystruct
-#define f90array1dgetaddrmystruc_ f90array1dgetaddrmystruct
+#define f90array1dgetaddrmystruct_ f90array1dgetaddrmystruct
#endif
PETSC_EXTERN void PETSC_STDCALL f90array1dcreatemystruct_(void *,PetscInt *,PetscInt *,F90Array1d * PETSC_F90_2PTR_PROTO_NOVAR);