Skip to content

Commit 3f47a93

Browse files
Upgraded all macOS and Linux builds to use PETSc 3.23; clean up
1 parent aa1171d commit 3f47a93

36 files changed

+202
-192
lines changed
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/bin/bash
2+
set -eu
3+
4+
5+
## Constants
6+
#
7+
VER="3.23.6"
8+
9+
PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS
10+
PREFIX="${ISSM_DIR}/externalpackages/petsc/install" # Set to location where external package should be installed
11+
12+
# Download source
13+
${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${VER}.tar.gz" "petsc-${VER}.tar.gz"
14+
15+
# Unpack source
16+
tar -zxvf petsc-${VER}.tar.gz
17+
18+
# Cleanup
19+
rm -rf ${PREFIX} ${PETSC_DIR}
20+
mkdir -p ${PETSC_DIR}
21+
22+
# Move source to $PETSC_DIR
23+
mv petsc-${VER}/* ${PETSC_DIR}
24+
rm -rf petsc-${VER}
25+
26+
# Configure
27+
#
28+
# NOTE:
29+
# - Cannot use --with-fpic option when compiling static libs,
30+
#
31+
# Cannot determine compiler PIC flags if shared libraries is turned off
32+
# Either run using --with-shared-libraries or --with-pic=0 and supply the
33+
# compiler PIC flag via CFLAGS, CXXXFLAGS, and FCFLAGS
34+
#
35+
cd ${PETSC_DIR}
36+
./configure \
37+
--prefix="${PREFIX}" \
38+
--PETSC_DIR="${PETSC_DIR}" \
39+
--with-shared-libraries=0 \
40+
--CFLAGS="-fPIC" \
41+
--CXXFLAGS="-fPIC" \
42+
--FFLAGS="-fPIC" \
43+
--with-debugging=0 \
44+
--with-valgrind=0 \
45+
--with-x=0 \
46+
--with-ssl=0 \
47+
--download-fblaslapack=1 \
48+
--download-metis=1 \
49+
--download-mpich=1 \
50+
--download-mumps=1 \
51+
--download-parmetis=1 \
52+
--download-scalapack=1 \
53+
--download-zlib=1
54+
55+
# Compile and install
56+
make
57+
make install
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#!/bin/bash
2+
set -eu
3+
4+
5+
## Constants
6+
#
7+
VER="3.23.6"
8+
9+
PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS
10+
PREFIX="${ISSM_DIR}/externalpackages/petsc/install" # Set to location where external package should be installed
11+
12+
# Environment
13+
if [ -z ${LDFLAGS+x} ]; then
14+
LDFLAGS=""
15+
fi
16+
17+
# Download source
18+
${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${VER}.tar.gz" "petsc-${VER}.tar.gz"
19+
20+
# Unpack source
21+
tar -zxvf petsc-${VER}.tar.gz
22+
23+
# Cleanup
24+
rm -rf ${PREFIX} ${PETSC_DIR}
25+
mkdir -p ${PETSC_DIR}
26+
27+
# Move source to $PETSC_DIR
28+
mv petsc-${VER}/* ${PETSC_DIR}
29+
rm -rf petsc-${VER}
30+
31+
# Configure
32+
cd ${PETSC_DIR}
33+
./configure \
34+
--prefix="${PREFIX}" \
35+
--PETSC_DIR="${PETSC_DIR}" \
36+
--LDFLAGS="${LDFLAGS}" \
37+
--with-debugging=0 \
38+
--with-valgrind=0 \
39+
--with-x=0 \
40+
--with-ssl=0 \
41+
--with-pic=1 \
42+
--download-fblaslapack=1 \
43+
--download-metis=1 \
44+
--download-mpich=1 \
45+
--download-mumps=1 \
46+
--download-parmetis=1 \
47+
--download-scalapack=1 \
48+
--download-zlib=1
49+
50+
# Compile and install
51+
make
52+
make install
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#!/bin/bash
2+
set -eu
3+
4+
5+
## Constants
6+
#
7+
VER="3.23.6"
8+
9+
PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS
10+
PREFIX="${ISSM_DIR}/externalpackages/petsc/install" # Set to location where external package should be installed
11+
12+
# Download source
13+
${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${VER}.tar.gz" "petsc-${VER}.tar.gz"
14+
15+
# Unpack source
16+
tar -zxvf petsc-${VER}.tar.gz
17+
18+
# Cleanup
19+
rm -rf ${PREFIX} ${PETSC_DIR}
20+
mkdir -p ${PETSC_DIR}
21+
22+
# Move source to $PETSC_DIR
23+
mv petsc-${VER}/* ${PETSC_DIR}
24+
rm -rf petsc-${VER}
25+
26+
# Configure
27+
#
28+
# NOTE:
29+
# - Cannot use --with-fpic option when compiling static libs,
30+
#
31+
# Cannot determine compiler PIC flags if shared libraries is turned off
32+
# Either run using --with-shared-libraries or --with-pic=0 and supply the
33+
# compiler PIC flag via CFLAGS, CXXXFLAGS, and FCFLAGS
34+
#
35+
cd ${PETSC_DIR}
36+
./configure \
37+
--prefix="${PREFIX}" \
38+
--PETSC_DIR="${PETSC_DIR}" \
39+
--with-shared-libraries=0 \
40+
--CFLAGS="-fPIC" \
41+
--CXXFLAGS="-fPIC" \
42+
--FFLAGS="-fPIC" \
43+
--with-debugging=0 \
44+
--with-valgrind=0 \
45+
--with-x=0 \
46+
--with-ssl=0 \
47+
--download-fblaslapack=1 \
48+
--download-metis=1 \
49+
--download-mpich=1 \
50+
--download-mumps=1 \
51+
--download-parmetis=1 \
52+
--download-scalapack=1 \
53+
--download-zlib=1
54+
55+
# Compile and install
56+
make
57+
make install
58+
59+
# Need to make symlinks from libmpich* to libmpi*
60+
ln -s ${PREFIX}/lib/libmpi.a ${PREFIX}/lib/libmpich.a
61+
ln -s ${PREFIX}/lib/libmpicxx.a ${PREFIX}/lib/libmpichcxx.a
62+
ln -s ${PREFIX}/lib/libmpifort.a ${PREFIX}/lib/libmpichf90.a

jenkins/eis-daskhub-python-modules

Lines changed: 0 additions & 81 deletions
This file was deleted.

jenkins/eis-smce-binaries

Lines changed: 0 additions & 80 deletions
This file was deleted.

jenkins/github-linux-basic-codeql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ISSM_CONFIG='\
3030
EXTERNALPACKAGES="
3131
autotools install-linux.sh
3232
cmake install.sh
33-
petsc install-3.22-linux.sh
33+
petsc install-3.23-linux.sh
3434
triangle install-linux.sh
3535
m1qn3 install-linux.sh
3636
semic install.sh

jenkins/github_linux_basic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ISSM_CONFIG='\
3131
EXTERNALPACKAGES="
3232
autotools install-linux.sh
3333
cmake install.sh
34-
petsc install-3.22-linux.sh
34+
petsc install-3.23-linux.sh
3535
triangle install-linux.sh
3636
m1qn3 install-linux.sh
3737
semic install.sh

jenkins/mac-intel-basic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ISSM_CONFIG='\
3232
EXTERNALPACKAGES="
3333
autotools install-mac.sh
3434
cmake install.sh
35-
petsc install-3.22-mac.sh
35+
petsc install-3.23-mac.sh
3636
triangle install-mac.sh
3737
m1qn3 install-mac.sh
3838
semic install.sh

jenkins/mac-intel-binaries-matlab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ISSM_CONFIG='\
4747
EXTERNALPACKAGES="
4848
autotools install-mac.sh
4949
cmake install.sh
50-
petsc install-3.22-mac-static.sh
50+
petsc install-3.23-mac-static.sh
5151
boost install-1.7-mac-static.sh
5252
dakota install-6.2-mac-static.sh
5353
chaco install-mac.sh

jenkins/mac-intel-binaries-python-3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ISSM_CONFIG='\
4747
EXTERNALPACKAGES="
4848
autotools install-mac.sh
4949
cmake install.sh
50-
petsc install-3.22-mac-static.sh
50+
petsc install-3.23-mac-static.sh
5151
boost install-1.7-mac-static.sh
5252
dakota install-6.2-mac-static.sh
5353
chaco install-mac.sh

0 commit comments

Comments
 (0)