Skip to content

Commit b8b83c5

Browse files
prj-prj-
committed
PETSc 3.24.1
1 parent 66e6678 commit b8b83c5

File tree

3 files changed

+19
-75
lines changed

3 files changed

+19
-75
lines changed

‎3rdparty/ff-petsc/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ PETSC_DOWNLOAD_C := --with-metis-dir=$(DIR_INSTALL_REAL) \
5353
--with-parmetis-dir=$(DIR_INSTALL_REAL) \
5454
--with-tetgen-dir=$(DIR_INSTALL_REAL) \
5555
--with-gsl-dir=$(DIR_INSTALL_REAL)
56-
PETSC_DOWNLOAD := --download-metis --download-ptscotch --download-ptscotch-commit=v7.0.10 \
56+
PETSC_DOWNLOAD := --download-metis --download-ptscotch \
5757
--download-hypre --download-parmetis \
5858
--download-superlu --download-suitesparse --download-tetgen \
5959
--download-gsl=https://mirrors.kernel.org/gnu/gsl/gsl-2.8.tar.gz

‎3rdparty/ff-petsc/petsc-cmake-seq.patch‎

Lines changed: 15 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/PTSCOTCH.py petsc-3.24.0-p1/config/BuildSystem/config/packages/PTSCOTCH.py
2-
--- petsc-3.24.0/config/BuildSystem/config/packages/PTSCOTCH.py 2025-03-26 15:00:03
3-
+++ petsc-3.24.0-p1/config/BuildSystem/config/packages/PTSCOTCH.py 2025-03-26 17:06:45
1+
diff --color -Naur petsc-3.24.1/config/BuildSystem/config/packages/PTSCOTCH.py petsc-3.24.1-p1/config/BuildSystem/config/packages/PTSCOTCH.py
2+
--- petsc-3.24.1/config/BuildSystem/config/packages/PTSCOTCH.py 2025-03-26 15:00:03
3+
+++ petsc-3.24.1-p1/config/BuildSystem/config/packages/PTSCOTCH.py 2025-03-26 17:06:45
44
@@ -62,4 +62,10 @@
55

66
args.append('-DBUILD_FORTRAN:BOOL=OFF')
@@ -12,9 +12,9 @@ diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/PTSCOTCH.py p
1212
+ args.append('-DCMAKE_C_COMPILER="'+mpicc.split(None, 1)[0]+'"')
1313
+ args.append('-DCMAKE_CXX_COMPILER="'+mpicxx.split(None, 1)[0]+'"')
1414
return args
15-
diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/SuiteSparse.py petsc-3.24.0-p1/config/BuildSystem/config/packages/SuiteSparse.py
16-
--- petsc-3.24.0/config/BuildSystem/config/packages/SuiteSparse.py 2025-03-26 15:00:03
17-
+++ petsc-3.24.0-p1/config/BuildSystem/config/packages/SuiteSparse.py 2025-03-26 17:07:16
15+
diff --color -Naur petsc-3.24.1/config/BuildSystem/config/packages/SuiteSparse.py petsc-3.24.1-p1/config/BuildSystem/config/packages/SuiteSparse.py
16+
--- petsc-3.24.1/config/BuildSystem/config/packages/SuiteSparse.py 2025-03-26 15:00:03
17+
+++ petsc-3.24.1-p1/config/BuildSystem/config/packages/SuiteSparse.py 2025-03-26 17:07:16
1818
@@ -70,4 +70,10 @@
1919
args.append('-DSUITESPARSE_USE_OPENMP:BOOL='+('ON' if self.openmp.found else 'OFF'))
2020
args.append('-DSUITESPARSE_USE_64BIT_BLAS:BOOL='+('ON' if self.blasLapack.has64bitindices else 'OFF'))
@@ -26,9 +26,9 @@ diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/SuiteSparse.p
2626
+ args.append('-DCMAKE_C_COMPILER="'+mpicc.split(None, 1)[0]+'"')
2727
+ args.append('-DCMAKE_CXX_COMPILER="'+mpicxx.split(None, 1)[0]+'"')
2828
return args
29-
diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/SuperLU.py petsc-3.24.0-p1/config/BuildSystem/config/packages/SuperLU.py
30-
--- petsc-3.24.0/config/BuildSystem/config/packages/SuperLU.py 2025-03-20 05:44:35
31-
+++ petsc-3.24.0-p1/config/BuildSystem/config/packages/SuperLU.py 2025-03-26 17:07:16
29+
diff --color -Naur petsc-3.24.1/config/BuildSystem/config/packages/SuperLU.py petsc-3.24.1-p1/config/BuildSystem/config/packages/SuperLU.py
30+
--- petsc-3.24.1/config/BuildSystem/config/packages/SuperLU.py 2025-03-20 05:44:35
31+
+++ petsc-3.24.1-p1/config/BuildSystem/config/packages/SuperLU.py 2025-03-26 17:07:16
3232
@@ -54,5 +54,11 @@
3333
if item.find('CMAKE_C_FLAGS') >= 0 or item.find('CMAKE_CXX_FLAGS') >= 0:
3434
args[place]=item[:-1]+' '+mangledef+'"'
@@ -41,9 +41,9 @@ diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/SuperLU.py pe
4141
+ args.append('-DCMAKE_CXX_COMPILER="'+mpicxx.split(None, 1)[0]+'"')
4242
return args
4343

44-
diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/METIS.py petsc-3.24.0-p1/config/BuildSystem/config/packages/METIS.py
45-
--- petsc-3.24.0/config/BuildSystem/config/packages/METIS.py 2025-03-08 23:51:15
46-
+++ petsc-3.24.0-p1/config/BuildSystem/config/packages/METIS.py 2025-03-26 17:07:16
44+
diff --color -Naur petsc-3.24.1/config/BuildSystem/config/packages/METIS.py petsc-3.24.1-p1/config/BuildSystem/config/packages/METIS.py
45+
--- petsc-3.24.1/config/BuildSystem/config/packages/METIS.py 2025-03-08 23:51:15
46+
+++ petsc-3.24.1-p1/config/BuildSystem/config/packages/METIS.py 2025-03-26 17:07:16
4747
@@ -45,6 +45,12 @@
4848
if self.framework.argDB['download-metis-use-doubleprecision']:
4949
args.append('-DMETIS_USE_DOUBLEPRECISION=1')
@@ -57,9 +57,9 @@ diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/METIS.py pets
5757
return args
5858

5959
def configureLibrary(self):
60-
diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/Mmg.py petsc-3.24.0-p1/config/BuildSystem/config/packages/Mmg.py
61-
--- petsc-3.24.0/config/BuildSystem/config/packages/Mmg.py 2025-03-26 15:00:03
62-
+++ petsc-3.24.0-p1/config/BuildSystem/config/packages/Mmg.py 2025-03-26 17:07:16
60+
diff --color -Naur petsc-3.24.1/config/BuildSystem/config/packages/Mmg.py petsc-3.24.1-p1/config/BuildSystem/config/packages/Mmg.py
61+
--- petsc-3.24.1/config/BuildSystem/config/packages/Mmg.py 2025-03-26 15:00:03
62+
+++ petsc-3.24.1-p1/config/BuildSystem/config/packages/Mmg.py 2025-03-26 17:07:16
6363
@@ -29,6 +29,12 @@
6464
args.append('-DUSE_VTK=OFF')
6565
args.append('-DMMG_INSTALL_PRIVATE_HEADERS=ON')
@@ -73,59 +73,3 @@ diff --color -Naur petsc-3.24.0/config/BuildSystem/config/packages/Mmg.py petsc-
7373
if self.getDefaultIndexSize() == 64:
7474
int64_t = '''
7575
#if !(defined(PETSC_HAVE_STDINT_H) && defined(PETSC_HAVE_INTTYPES_H) && defined(PETSC_HAVE_MPI_INT64_T))
76-
diff --git petsc-3.24.0/config/BuildSystem/config/compilerOptions.py petsc-3.24.0-p1/config/BuildSystem/config/compilerOptions.py
77-
--- petsc-3.24.0/config/BuildSystem/config/compilerOptions.py
78-
+++ petsc-3.24.0-p1/config/BuildSystem/config/compilerOptions.py
79-
@@ -32,7 +32,7 @@ class CompilerOptions(config.base.Configure):
80-
if config.setCompilers.Configure.isGcc110plus(compiler, self.log):
81-
flags.extend(['-Wno-stringop-overflow'])
82-
# skip -fstack-protector for brew gcc - as this gives SEGV
83-
- if not (config.setCompilers.Configure.isDarwin(self.log) and config.setCompilers.Configure.isGNU(compiler, self.log)):
84-
+ if not ((config.setCompilers.Configure.isDarwin(self.log) or config.setCompilers.Configure.isMINGW(compiler, self.log)) and config.setCompilers.Configure.isGNU(compiler, self.log)):
85-
flags.extend(['-fstack-protector'])
86-
if config.setCompilers.Configure.isDarwinCatalina(self.log) and config.setCompilers.Configure.isClang(compiler, self.log):
87-
flags.extend(['-fno-stack-check'])
88-
@@ -144,7 +144,7 @@ class CompilerOptions(config.base.Configure):
89-
flags.extend(['-Wno-psabi'])
90-
if not any([
91-
# skip -fstack-protector for brew gcc - as this gives SEGV
92-
- config.setCompilers.Configure.isDarwin(self.log) and config.setCompilers.Configure.isGNU(compiler, self.log),
93-
+ (config.setCompilers.Configure.isDarwin(self.log) or config.setCompilers.Configure.isMINGW(compiler, self.log)) and config.setCompilers.Configure.isGNU(compiler, self.log),
94-
# hipcc for ROCm-4.0 crashes on some source files with -fstack-protector
95-
config.setCompilers.Configure.isHIP(compiler, self.log),
96-
]):
97-
diff --git petsc-3.24.0/config/BuildSystem/config/setCompilers.py petsc-3.24.0-p1/config/BuildSystem/config/setCompilers.py
98-
--- petsc-3.24.0/config/BuildSystem/config/setCompilers.py
99-
+++ petsc-3.24.0-p1/config/BuildSystem/config/setCompilers.py
100-
@@ -352,6 +352,15 @@ class Configure(config.base.Configure):
101-
if (int(VMAJOR),int(VMINOR)) >= (11,0):
102-
if log: log.write('Detected Gcc110plus compiler\n')
103-
return 1
104-
+ else:
105-
+ if config.setCompilers.Configure.isGNU(compiler, log) and config.setCompilers.Configure.isMINGW(compiler, log):
106-
+ (output, error, status) = config.base.Configure.executeShellCommand(compiler+' -dumpversion', log = log)
107-
+ strmatch = re.match(r'(\d+)\.(\d+)',output)
108-
+ if strmatch:
109-
+ VMAJOR,VMINOR = strmatch.groups()
110-
+ if (int(VMAJOR),int(VMINOR)) >= (11,0):
111-
+ if log: log.write('Detected Gcc110plus compiler\n')
112-
+ return 1
113-
if log: log.write('Did not detect Gcc110plus compiler\n')
114-
except RuntimeError:
115-
if log: log.write('Did not detect Gcc110plus compiler due to exception\n')
116-
@@ -370,6 +379,15 @@ class Configure(config.base.Configure):
117-
if (int(VMAJOR),int(VMINOR)) >= (15,0):
118-
if log: log.write('Detected Gcc150plus compiler\n')
119-
return 1
120-
+ else:
121-
+ if config.setCompilers.Configure.isGNU(compiler, log) and config.setCompilers.Configure.isMINGW(compiler, log):
122-
+ (output, error, status) = config.base.Configure.executeShellCommand(compiler+' -dumpversion', log = log)
123-
+ strmatch = re.match(r'(\d+)\.(\d+)',output)
124-
+ if strmatch:
125-
+ VMAJOR,VMINOR = strmatch.groups()
126-
+ if (int(VMAJOR),int(VMINOR)) >= (15,0):
127-
+ if log: log.write('Detected Gcc150plus compiler\n')
128-
+ return 1
129-
if log: log.write('Did not detect Gcc150plus compiler\n')
130-
except RuntimeError:
131-
if log: log.write('Did not detect Gcc150plus compiler due to exception\n')

‎3rdparty/getall‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ download('parmmg','https://github.com/MmgTools/ParMmg/archive/v1.5.0.zip',
170170
'https://github.com/MmgTools',
171171
'parmmg.zip',
172172
'52b82cd18108c3fdfd229ac0158ef187');
173-
download('PETSc','https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-3.24.0.tar.gz',
173+
download('PETSc','https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-3.24.1.tar.gz',
174174
'https://web.cels.anl.gov/projects/petsc/download/release-snapshots',
175-
'petsc-3.24.0.tar.gz',
176-
'2e798e2af5676d60132518878d83f842');
175+
'petsc-3.24.1.tar.gz',
176+
'7a0a37d2a9358f1a55d2ea7d91f07148');
177177

178178
download('htool','https://github.com/htool-ddm/htool/archive/d7c0fa8b42c461446b92a4891dea78532eeea6b5.zip',
179179
'https://github.com/htool-ddm/',

0 commit comments

Comments
 (0)