Commit d7a4ee81 authored by Luigi Calori's avatar Luigi Calori
Browse files

add petsc custom package in repo

parent 12a55ca3
diff --git a/config/BuildSystem/config/libraries.py b/config/BuildSystem/config/libraries.py
index 0af92f0..8644b55 100644
--- a/config/BuildSystem/config/libraries.py
+++ b/config/BuildSystem/config/libraries.py
@@ -50,12 +50,7 @@ class Configure(config.base.Configure):
flagName = self.language[-1]+'SharedLinkerFlag'
flagSubst = self.language[-1].upper()+'_LINKER_SLFLAG'
dirname = os.path.dirname(library).replace('\\ ',' ').replace(' ', '\\ ').replace('\\(','(').replace('(', '\\(').replace('\\)',')').replace(')', '\\)')
- if hasattr(self.setCompilers, flagName) and not getattr(self.setCompilers, flagName) is None:
- return [getattr(self.setCompilers, flagName)+dirname,'-L'+dirname,'-l'+name]
- if flagSubst in self.argDB:
- return [self.argDB[flagSubst]+dirname,'-L'+dirname,'-l'+name]
- else:
- return ['-L'+dirname,' -l'+name]
+ return ['-L'+dirname,' -l'+name]
else:
return ['-l'+name]
if os.path.splitext(library)[1] == '.so':
This diff is collapsed.
diff --git c/config/PETSc/Configure.py w/config/PETSc/Configure.py
index ca65368e54..995afd0799 100644
--- c/config/PETSc/Configure.py
+++ w/config/PETSc/Configure.py
@@ -174,19 +174,19 @@ class Configure(config.base.Configure):
self.setCompilers.pushLanguage('C')
fd.write('ccompiler='+self.setCompilers.getCompiler()+'\n')
- fd.write('cflags_extra="'+self.setCompilers.getCompilerFlags().strip()+'"\n')
- fd.write('cflags_dep="'+self.compilers.dependenciesGenerationFlag.get('C','')+'"\n')
- fd.write('ldflag_rpath="'+self.setCompilers.CSharedLinkerFlag+'"\n')
+ fd.write('cflags_extra='+self.setCompilers.getCompilerFlags().strip()+'\n')
+ fd.write('cflags_dep='+self.compilers.dependenciesGenerationFlag.get('C','')+'\n')
+ fd.write('ldflag_rpath='+self.setCompilers.CSharedLinkerFlag+'\n')
self.setCompilers.popLanguage()
if hasattr(self.compilers, 'C++'):
self.setCompilers.pushLanguage('C++')
fd.write('cxxcompiler='+self.setCompilers.getCompiler()+'\n')
- fd.write('cxxflags_extra="'+self.setCompilers.getCompilerFlags().strip()+'"\n')
+ fd.write('cxxflags_extra='+self.setCompilers.getCompilerFlags().strip()+'\n')
self.setCompilers.popLanguage()
if hasattr(self.compilers, 'FC'):
self.setCompilers.pushLanguage('FC')
fd.write('fcompiler='+self.setCompilers.getCompiler()+'\n')
- fd.write('fflags_extra="'+self.setCompilers.getCompilerFlags().strip()+'"\n')
+ fd.write('fflags_extra='+self.setCompilers.getCompilerFlags().strip()+'\n')
self.setCompilers.popLanguage()
fd.write('\n')
From 6982d0159d8c95d8c403e81563a610a34c8cd8ec Mon Sep 17 00:00:00 2001
From: Satish Balay <balay@mcs.anl.gov>
Date: Fri, 22 Mar 2019 13:51:07 -0500
Subject: [PATCH] configure: work-around xcode warnings of type:
ld: warning: text-based stub file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.tbd and library file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.tbd and library file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib are out of sync. Falling back to library file for linking.
Reported-by: Denis Davydov <davydden@gmail.com>
Reported-by: Amneet Pal Bhalla <asbhalla@sdsu.edu>
Reported-by: DAFNAKIS PANAGIOTIS <panagiotis.dafnakis@polito.it>
---
config/BuildSystem/config/compilers.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/config/BuildSystem/config/compilers.py b/config/BuildSystem/config/compilers.py
index 7bd8093..eedf456 100644
--- a/config/BuildSystem/config/compilers.py
+++ b/config/BuildSystem/config/compilers.py
@@ -4,6 +4,12 @@ import re
import os
import shutil
+def remove_xcode_verbose(buf):
+ retbuf =[]
+ for line in buf.splitlines():
+ if not line.startswith('ld: warning: text-based stub file'): retbuf.append(line)
+ return ('\n').join(retbuf)
+
class MissingProcessor(RuntimeError):
pass
@@ -242,6 +248,7 @@ class Configure(config.base.Configure):
self.setCompilers.LDFLAGS = oldFlags
self.popLanguage()
+ output = remove_xcode_verbose(output)
# PGI: kill anything enclosed in single quotes
if output.find('\'') >= 0:
# Cray has crazy non-matching single quotes so skip the removal
@@ -552,6 +559,7 @@ class Configure(config.base.Configure):
self.setCompilers.LDFLAGS = oldFlags
self.popLanguage()
+ output = remove_xcode_verbose(output)
# PGI: kill anything enclosed in single quotes
if output.find('\'') >= 0:
if output.count('\'')%2: raise RuntimeError('Mismatched single quotes in C library string')
@@ -939,6 +947,7 @@ class Configure(config.base.Configure):
self.setCompilers.LDFLAGS = oldFlags
self.popLanguage()
+ output = remove_xcode_verbose(output)
# replace \CR that ifc puts in each line of output
output = output.replace('\\\n', '')
--
2.10.5
--- a/gmakefile.test
+++ b/gmakefile.test
@@ -127,11 +127,14 @@
endif
-@$(GFORTRAN_DEP_CLEANUP)
+#add xlf2003 flags
+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) $(FC_MODULE_FLAG)$(MODDIR)
+ $(PETSC_COMPILE.F) ${XLF2003FLAGS} -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) $(FC_MODULE_FLAG)$(MODDIR)
endif
-@$(GFORTRAN_DEP_CLEANUP)
commit 5849cfbb8c629127894f722457da7b2cbb7f6a0b
Author: Satish Balay <balay@mcs.anl.gov>
Date: Sun Mar 31 21:43:12 2019 -0500
dm: remove duplicate PetscFECreate() definition from f90 modules. This fixes IBM xlf build.
"/tmp/dobrev1/spack-stage/spack-stage-Vp2QRG/petsc-3.11.0/src/tao/f90-mod/petsctaomod.F", line 38.13: 1514-264 (S) Procedure petscfecreate has more than one interface accessible by use association. The interfaces are assumed to be the same.
1501-511 Compilation failed for file petsctaomod.F.
Reported-by: "Dobrev, Veselin A." <dobrev1@llnl.gov>
diff --git a/src/dm/f90-mod/petscdt.h90 b/src/dm/f90-mod/petscdt.h90
index 339f7fd41e..766f0e37dc 100644
--- a/src/dm/f90-mod/petscdt.h90
+++ b/src/dm/f90-mod/petscdt.h90
@@ -49,15 +49,6 @@
End Subroutine
End Interface
- Interface
- Subroutine PetscFECreate(c,f,ierr)
- use petscdmdef
- MPI_Comm, intent(in) :: c
- PetscFE, intent(out) :: f
- PetscErrorCode, intent(out) :: ierr
- End Subroutine
- End Interface
-
Interface
Subroutine PetscFECreateDefault(c,d,n,i,str,o,f,ierr)
use petscdmdef
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment