diff options
| author | Satish Balay <balay@mcs.anl.gov> | 2018-07-02 15:48:13 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-07-02 15:48:13 -0500 |
| commit | b0f8b7130f49f17f269824b585f7c913c5df6a0f (patch) | |
| tree | eb5f58cd510321f1eee24c57ced7d7dd8888e274 | |
| parent | 6f7e012cab40caf2c89006da10790c4c9bf6ee19 (diff) | |
| download | spack-b0f8b7130f49f17f269824b585f7c913c5df6a0f.tar.gz spack-b0f8b7130f49f17f269824b585f7c913c5df6a0f.tar.bz2 spack-b0f8b7130f49f17f269824b585f7c913c5df6a0f.tar.xz spack-b0f8b7130f49f17f269824b585f7c913c5df6a0f.zip | |
petsc: add in latest release 3.9.3. (#8627)
xl related fixes are 3.9.3 so remove xlc-test-3.9.0.diff
| -rw-r--r-- | var/spack/repos/builtin/packages/petsc/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff | 60 |
2 files changed, 1 insertions, 62 deletions
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 552baa4ad6..52d7314e91 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -42,6 +42,7 @@ class Petsc(Package): version('develop', git='https://bitbucket.org/petsc/petsc.git', branch='master') version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') + version('3.9.3', '7b71d705f66f9961cb0e2da3f9da79a1') version('3.9.2', '8bedc0cd8c8603d54bfd99a6e8f77b3d') version('3.9.1', 'd3a229a188dbeef9b3f29b9a63622fad') version('3.9.0', '34b8a81814ca050a96d58e53a2f0ac7a') @@ -103,8 +104,6 @@ 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 diff --git a/var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff b/var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff deleted file mode 100644 index ce41cfaed5..0000000000 --- a/var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- 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); - |