source: issm/oecreview/Archive/24307-24683/ISSM-24330-24331.diff

Last change on this file was 24684, checked in by Mathieu Morlighem, 5 years ago

CHG: added new review
File size: 8.6 KB
RevLine 
[24684]1Index: ../trunk-jpl/externalpackages/mpich/install-3.2-linux64.sh
2===================================================================
3--- ../trunk-jpl/externalpackages/mpich/install-3.2-linux64.sh (revision 24330)
4+++ ../trunk-jpl/externalpackages/mpich/install-3.2-linux64.sh (revision 24331)
5@@ -1,30 +1,39 @@
6 #!/bin/bash
7 set -eu
8
9-#Some cleanup
10-rm -rf src install mpich-3.2
11-mkdir src install
12
13-#Download from ISSM server
14-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/mpich-3.2.tar.gz' 'mpich-3.2.tar.gz'
15+## Constants
16+#
17+VER="3.2"
18
19-#Untar
20-tar -zxvf mpich-3.2.tar.gz
21+# Download source
22+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/mpich-${VER}.tar.gz" "mpich-${VER}.tar.gz"
23
24-#Move mpich into src directory
25-mv mpich-3.2/* src
26-rm -rf mpich-3.2
27+# Unpack source
28+tar -zxvf mpich-$VER.tar.gz
29
30-#Configure mpich
31+# Cleanup
32+rm -rf src install
33+mkdir src install
34+
35+# Move source into 'src' directory
36+mv mpich-$VER/* src
37+rm -rf mpich-$VER
38+
39+# Configure
40 cd src
41 ./configure \
42- --prefix="$ISSM_DIR/externalpackages/mpich/install" \
43+ --prefix="${ISSM_DIR}/externalpackages/mpich/install" \
44 --enable-shared
45
46-#Compile mpich (this new version supports parallel make)
47+# Compile and install
48 if [ $# -eq 0 ]; then
49 make
50+ make install
51 else
52 make -j $1
53+ make -j $1 install
54 fi
55-make install
56+
57+# Return to initial directory
58+cd ..
59Index: ../trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh
60===================================================================
61--- ../trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh (revision 24330)
62+++ ../trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh (revision 24331)
63@@ -1,36 +1,54 @@
64 #!/bin/bash
65 set -eu
66
67-#Some cleanup
68-rm -rf install petsc-3.7.6 src
69+
70+## Constants
71+#
72+VER="3.7.6"
73+
74+# Download source
75+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${VER}.tar.gz" "petsc-${VER}.tar.gz"
76+
77+# Unpack source
78+tar -zxvf petsc-$VER.tar.gz
79+
80+# Cleanup
81+rm -rf install src
82 mkdir install src
83
84-#Download from ISSM server
85-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/petsc-lite-3.7.6.tar.gz' 'petsc-3.7.6.tar.gz'
86+# Move source to 'src' directory
87+mv petsc-$VER/* src/
88+rm -rf petsc-$VER
89
90-#Untar and move petsc to install directory
91-tar -zxvf petsc-3.7.6.tar.gz
92-mv petsc-3.7.6/* src/
93-rm -rf petsc-3.7.6
94-
95-#configure
96+# Configure
97 cd src
98 ./config/configure.py \
99- --prefix="$ISSM_DIR/externalpackages/petsc/install" \
100- --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
101- --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
102+ --prefix="${ISSM_DIR}/externalpackages/petsc/install" \
103+ --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \
104+ --with-mpi-dir="${ISSM_DIR}/externalpackages/mpich/install" \
105+ --with-blas-lib="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" \
106+ --with-lapack-lib="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" \
107 --with-debugging=0 \
108 --with-valgrind=0 \
109 --with-x=0 \
110 --with-ssl=0 \
111 --with-shared-libraries=1 \
112+ --download-zlib=1\
113+ --download-hdf5=1 \
114+ --download-netcdf=1 \
115 --download-metis=1 \
116 --download-parmetis=1 \
117- --download-mumps=1 \
118 --download-scalapack=1 \
119- --download-fblaslapack=1 \
120- --with-pic=1
121+ --download-mumps=1
122
123-#Compile and intall
124-make
125-make install
126+# Compile and install
127+if [ $# -eq 0 ]; then
128+ make
129+ make install
130+else
131+ make -j $1
132+ make -j $1 install
133+fi
134+
135+# Return to initial directory
136+cd ..
137Index: ../trunk-jpl/jenkins/linux64_ross
138===================================================================
139--- ../trunk-jpl/jenkins/linux64_ross (revision 24330)
140+++ ../trunk-jpl/jenkins/linux64_ross (revision 24331)
141@@ -2,15 +2,16 @@
142 # 1: ISSM general configuration #
143 #-------------------------------#
144
145-#MATLAB path
146+# MATLAB path
147 MATLAB_PATH="/usr/local/MATLAB/R2015a"
148
149-#ISSM CONFIGURATION
150-ISSM_CONFIG='--prefix=$ISSM_DIR \
151+# ISSM CONFIGURATION
152+ISSM_CONFIG='\
153+ --prefix=$ISSM_DIR \
154 --disable-static \
155 --with-matlab-dir=$MATLAB_PATH \
156 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
157- --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
158+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
159 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
160 --with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
161 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
162@@ -36,13 +37,13 @@
163 # 3: External packages installation #
164 #-----------------------------------#
165
166-#List of external packages to be installed and their installation scripts
167+# List of external packages to be installed and their installation scripts
168 EXTERNALPACKAGES="
169 autotools install.sh
170 cmake install.sh
171- mpich install-3.3.sh
172+ mpich install-3.2-linux64.sh
173 lapack install-3.8-linux.sh
174- petsc install-3.11-linux.sh
175+ petsc install-3.7-linux64.sh
176 triangle install-linux64.sh
177 chaco install.sh
178 m1qn3 install.sh
179Index: ../trunk-jpl/jenkins/linux64_ross_python
180===================================================================
181--- ../trunk-jpl/jenkins/linux64_ross_python (revision 24330)
182+++ ../trunk-jpl/jenkins/linux64_ross_python (revision 24331)
183@@ -1,4 +1,3 @@
184-
185 #-------------------------------#
186 # 1: ISSM general configuration #
187 #-------------------------------#
188@@ -9,37 +8,45 @@
189 --with-python-dir=/usr \
190 --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
191 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
192- --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
193- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
194+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
195+ --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
196+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
197 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
198- --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
199 --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
200 --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
201 --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
202 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
203- --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
204+ --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
205 --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
206+ --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
207 --with-numthreads=4 \
208 --enable-development \
209- --enable-debugging '
210+ --enable-debugging \
211+'
212
213-#PYTHON and MATLAB testing
214+# Test suites
215 MATLAB_TEST=0
216 PYTHON_TEST=1
217+JAVASCRIPT_TEST=0
218+EXAMPLES_TEST=0
219
220 #-----------------------------------#
221 # 3: External packages installation #
222 #-----------------------------------#
223
224-#List of external packages to be installed and their installation scripts
225-EXTERNALPACKAGES="autotools install.sh
226- cmake install.sh
227- mpich install-3.2-linux64.sh
228- petsc install-3.7-linux64.sh
229- triangle install-linux64.sh
230- chaco install.sh
231- m1qn3 install.sh
232- shell2junit install.sh"
233+# List of external packages to be installed and their installation scripts
234+EXTERNALPACKAGES="
235+ autotools install.sh
236+ cmake install.sh
237+ mpich install-3.2-linux64.sh
238+ lapack install-3.8-linux.sh
239+ petsc install-3.7-linux64.sh
240+ triangle install-linux64.sh
241+ chaco install.sh
242+ m1qn3 install.sh
243+ semic install.sh
244+ shell2junit install.sh
245+"
246
247 #-----------------#
248 # 4: test options #
249@@ -47,10 +54,10 @@
250
251 #number of cpus used in ISSM installation and compilation (one is usually
252 #safer as some packages are very sensitive to parallel compilation)
253-NUMCPUS_INSTALL=10
254+NUMCPUS_INSTALL=8
255
256 #number of cpus used in the nightly runs.
257-NUMCPUS_RUN=5
258+NUMCPUS_RUN=8
259
260 #Nightly run options. The matlab routine runme.m will be called
261 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
262Index: ../trunk-jpl/jenkins/linux64_ross_se
263===================================================================
264--- ../trunk-jpl/jenkins/linux64_ross_se (revision 24330)
265+++ ../trunk-jpl/jenkins/linux64_ross_se (revision 24331)
266@@ -41,9 +41,9 @@
267 EXTERNALPACKAGES="
268 autotools install.sh
269 cmake install.sh
270- mpich install-3.3.sh
271+ mpich install-3.2-linux64.sh
272 lapack install-3.8-linux.sh
273- petsc install-3.11-linux.sh
274+ petsc install-3.7-linux64.sh
275 triangle install-linux64.sh
276 chaco install.sh
277 m1qn3 install.sh
Note: See TracBrowser for help on using the repository browser.