source: issm/oecreview/Archive/26740-27031/ISSM-26751-26752.diff@ 27032

Last change on this file since 27032 was 27032, checked in by Mathieu Morlighem, 3 years ago

CHG: added 26740-27031
File size: 15.2 KB
RevLine 
[27032]1Index: ../trunk-jpl/etc/environment.sh
2===================================================================
3--- ../trunk-jpl/etc/environment.sh (revision 26751)
4+++ ../trunk-jpl/etc/environment.sh (revision 26752)
5@@ -503,7 +503,7 @@
6 ld_library_path_append "${SQLITE_ROOT}/lib"
7 fi
8
9-LIBTIFF_ROOT="${ISSM_EXT_SHARED_DIR}/libtiff/install"
10+LIBTIFF_ROOT="${ISSM_EXT_DIR}/libtiff/install"
11 if [ -d "${LIBTIFF_ROOT}" ]; then
12 dyld_library_path_append "${LIBTIFF_ROOT}/install/libtiff"
13 ld_library_path_append "${LIBTIFF_ROOT}/install/libtiff"
14Index: ../trunk-jpl/externalpackages/proj/install-6 static.sh
15===================================================================
16--- ../trunk-jpl/externalpackages/proj/install-6 static.sh (nonexistent)
17+++ ../trunk-jpl/externalpackages/proj/install-6 static.sh (revision 26752)
18@@ -0,0 +1,57 @@
19+#!/bin/bash
20+set -eu
21+
22+
23+# Constants
24+#
25+VER="6.2.1"
26+
27+PREFIX="${ISSM_DIR}/externalpackages/proj/install" # Set to location where external package should be installed
28+
29+## Environment
30+#
31+export CC=mpicc
32+export CXX=mpicxx
33+
34+# NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently
35+# requires,
36+#
37+# SQLITE3_LIBS="-lsqlite3".
38+#
39+# On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
40+#
41+# apt-get install sqlite3 libsqlite3-dev
42+#
43+export SQLITE3_LIBS="-lsqlite3"
44+
45+# Cleanup
46+rm -rf ${PREFIX} src
47+mkdir -p ${PREFIX} src
48+
49+# Download source
50+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/proj-${VER}.tar.gz" "proj-${VER}.tar.gz"
51+
52+# Unpack source
53+tar -zxvf proj-${VER}.tar.gz
54+
55+# Move source into 'src' directory
56+mv proj-${VER}/* src
57+rm -rf proj-${VER}
58+
59+# Configure
60+cd src
61+./configure \
62+ --prefix="${PREFIX}" \
63+ --disable-dependency-tracking \
64+ --enable-fast-install \
65+ --disable-shared \
66+ --disable-tiff
67+
68+# Compile and install
69+if [ $# -eq 0 ]; then
70+ make
71+ make install
72+else
73+ make -j $1
74+ make -j $1 install
75+fi
76
77Property changes on: ../trunk-jpl/externalpackages/proj/install-6 static.sh
78___________________________________________________________________
79Added: svn:executable
80## -0,0 +1 ##
81+*
82\ No newline at end of property
83Index: ../trunk-jpl/externalpackages/proj/install-6.sh
84===================================================================
85--- ../trunk-jpl/externalpackages/proj/install-6.sh (revision 26751)
86+++ ../trunk-jpl/externalpackages/proj/install-6.sh (revision 26752)
87@@ -12,15 +12,15 @@
88 #
89 export CC=mpicc
90 export CXX=mpicxx
91+
92 # NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently
93-# requires,
94+# requires,
95 #
96-# SQLITE3_LIBS="-lsqlite3".
97+# SQLITE3_LIBS="-lsqlite3".
98 #
99-# On Ubuntu Linux, install the SQLite3 binary, libraries and headers
100-# with,
101+# On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
102 #
103-# `apt-get install sqlite3 libsqlite3-dev`
104+# apt-get install sqlite3 libsqlite3-dev
105 #
106 export SQLITE3_LIBS="-lsqlite3"
107
108Index: ../trunk-jpl/externalpackages/proj/install-8-static-with_tests.sh
109===================================================================
110--- ../trunk-jpl/externalpackages/proj/install-8-static-with_tests.sh (revision 26751)
111+++ ../trunk-jpl/externalpackages/proj/install-8-static-with_tests.sh (revision 26752)
112@@ -20,7 +20,7 @@
113 #
114 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
115 #
116-# `apt-get install sqlite3 libsqlite3-dev`
117+# apt-get install sqlite3 libsqlite3-dev
118 #
119 export SQLITE3_LIBS="-lsqlite3"
120
121Index: ../trunk-jpl/externalpackages/proj/install-8-static.sh
122===================================================================
123--- ../trunk-jpl/externalpackages/proj/install-8-static.sh (revision 26751)
124+++ ../trunk-jpl/externalpackages/proj/install-8-static.sh (revision 26752)
125@@ -20,7 +20,7 @@
126 #
127 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
128 #
129-# `apt-get install sqlite3 libsqlite3-dev`
130+# apt-get install sqlite3 libsqlite3-dev
131 #
132 export SQLITE3_LIBS="-lsqlite3"
133
134Index: ../trunk-jpl/externalpackages/proj/install-8-with_tests.sh
135===================================================================
136--- ../trunk-jpl/externalpackages/proj/install-8-with_tests.sh (revision 26751)
137+++ ../trunk-jpl/externalpackages/proj/install-8-with_tests.sh (revision 26752)
138@@ -20,7 +20,7 @@
139 #
140 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
141 #
142-# `apt-get install sqlite3 libsqlite3-dev`
143+# apt-get install sqlite3 libsqlite3-dev
144 #
145 export SQLITE3_LIBS="-lsqlite3"
146
147Index: ../trunk-jpl/externalpackages/proj/install-8.sh
148===================================================================
149--- ../trunk-jpl/externalpackages/proj/install-8.sh (revision 26751)
150+++ ../trunk-jpl/externalpackages/proj/install-8.sh (revision 26752)
151@@ -20,7 +20,7 @@
152 #
153 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
154 #
155-# `apt-get install sqlite3 libsqlite3-dev`
156+# apt-get install sqlite3 libsqlite3-dev
157 #
158 export SQLITE3_LIBS="-lsqlite3"
159
160Index: ../trunk-jpl/jenkins/aws-amazon_linux-solid_earth
161===================================================================
162--- ../trunk-jpl/jenkins/aws-amazon_linux-solid_earth (revision 26751)
163+++ ../trunk-jpl/jenkins/aws-amazon_linux-solid_earth (revision 26752)
164@@ -41,7 +41,7 @@
165 boost install-1.7-linux.sh
166 curl install-7-linux.sh
167 netcdf install-4.7-parallel.sh
168- proj install-8.sh
169+ proj install-6.sh
170 gdal install-3-python.sh
171 gshhg install.sh
172 gmt install-6-linux.sh
173Index: ../trunk-jpl/jenkins/pine_island-mac-binaries-matlab
174===================================================================
175--- ../trunk-jpl/jenkins/pine_island-mac-binaries-matlab (revision 26751)
176+++ ../trunk-jpl/jenkins/pine_island-mac-binaries-matlab (revision 26752)
177@@ -51,7 +51,7 @@
178 dakota install-6.2-mac-static.sh
179 curl install-7-mac-static.sh
180 netcdf install-4.7-parallel-static.sh
181- proj install-8-static.sh
182+ proj install-6-static.sh
183 gdal install-3-static.sh
184 gshhg install.sh
185 gmt install-6-mac-static.sh
186Index: ../trunk-jpl/jenkins/pine_island-mac-binaries-python
187===================================================================
188--- ../trunk-jpl/jenkins/pine_island-mac-binaries-python (revision 26751)
189+++ ../trunk-jpl/jenkins/pine_island-mac-binaries-python (revision 26752)
190@@ -49,7 +49,7 @@
191 dakota install-6.2-mac-static.sh
192 curl install-7-mac-static.sh
193 netcdf install-4.7-parallel-static.sh
194- proj install-8-static.sh
195+ proj install-6-static.sh
196 gdal install-3-python-static.sh
197 gshhg install.sh
198 gmt install-6-mac-static.sh
199Index: ../trunk-jpl/jenkins/pine_island-mac-full
200===================================================================
201--- ../trunk-jpl/jenkins/pine_island-mac-full (revision 26751)
202+++ ../trunk-jpl/jenkins/pine_island-mac-full (revision 26752)
203@@ -49,7 +49,7 @@
204 dakota install-6.2-mac.sh
205 curl install-7-mac.sh
206 netcdf install-4.7-parallel.sh
207- proj install-8.sh
208+ proj install-6.sh
209 gdal install-3-python.sh
210 gshhg install.sh
211 gmt install-6-mac.sh
212Index: ../trunk-jpl/jenkins/pine_island-mac-full-valgrind
213===================================================================
214--- ../trunk-jpl/jenkins/pine_island-mac-full-valgrind (revision 26751)
215+++ ../trunk-jpl/jenkins/pine_island-mac-full-valgrind (revision 26752)
216@@ -49,7 +49,7 @@
217 dakota install-6.2-mac.sh
218 curl install-7-mac.sh
219 netcdf install-4.7-parallel.sh
220- proj install-8.sh
221+ proj install-6.sh
222 gdal install-3-python.sh
223 gshhg install.sh
224 gmt install-6-mac.sh
225Index: ../trunk-jpl/jenkins/pine_island-mac-python
226===================================================================
227--- ../trunk-jpl/jenkins/pine_island-mac-python (revision 26751)
228+++ ../trunk-jpl/jenkins/pine_island-mac-python (revision 26752)
229@@ -44,7 +44,7 @@
230 dakota install-6.2-mac.sh
231 curl install-7-mac.sh
232 netcdf install-4.7-parallel.sh
233- proj install-8.sh
234+ proj install-6.sh
235 gdal install-3-python.sh
236 gshhg install.sh
237 gmt install-6-mac.sh
238Index: ../trunk-jpl/jenkins/pleiades-dakota
239===================================================================
240--- ../trunk-jpl/jenkins/pleiades-dakota (nonexistent)
241+++ ../trunk-jpl/jenkins/pleiades-dakota (revision 26752)
242@@ -0,0 +1,62 @@
243+#--------------------#
244+# ISSM Configuration #
245+#--------------------#
246+
247+ISSM_CONFIG='\
248+ --prefix=$ISSM_DIR \
249+ --enable-development \
250+ --enable-standalone-libraries \
251+ --with-wrappers=no \
252+ --with-vendor="intel-pleiades-mpi" \
253+ --with-petsc-dir="${ISSM_DIR}/externalpackages/petsc/install" \
254+ --with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" \
255+ --with-boost-dir=/nasa/pkgsrc/sles12/2018Q3 \
256+ --with-dakota-dir="${ISSM_DIR}/externalpackages/dakota/install" \
257+ --with-gsl-dir=/nasa/pkgsrc/sles12/2018Q3 \
258+ --with-mpi-include=" " \
259+ --with-mpi-libflags=" -lmpi" \
260+ --with-mkl-libflags="-L/nasa/intel/Compiler/2016.2.181/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -limf -lsvml -lirc" \
261+ --with-metis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
262+ --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \
263+ --with-mumps-dir="${ISSM_DIR}/externalpackages/petsc/install" \
264+ --with-scalapack-dir=/nasa/pkgsrc/sles12/2018Q3 \
265+ --with-graphics-lib="/usr/lib64/libX11.so" \
266+ --with-fortran-lib="-L/nasa/intel/Compiler/2016.2.181/compilers_and_libraries_2016.2.181/linux/compiler/lib/intel64/ -lifcore -lifport" \
267+'
268+
269+#-------------------#
270+# External Packages #
271+#-------------------#
272+
273+EXTERNALPACKAGES="
274+ petsc install-3.13-pleiades.sh
275+ dakota install-6.2-pleiades.sh
276+ m1qn3 install.sh
277+"
278+
279+#---------#
280+# Testing #
281+#---------#
282+
283+# Test suites
284+MATLAB_TEST=0
285+PYTHON_TEST=0
286+JAVASCRIPT_TEST=0
287+EXAMPLES_TEST=0
288+
289+# Number of CPUs used in ISSM compilation
290+#
291+# NOTE: One is usually safer as some packages are very sensitive to parallel
292+# compilation.
293+#
294+NUMCPUS_INSTALL=8
295+
296+# Number of CPUs used in the nightly runs
297+NUMCPUS_RUN=2
298+
299+# Nightly run options
300+#
301+# See documentation in test/NightlyRun/runme.* for more information.
302+#
303+MATLAB_NROPTIONS=""
304+PYTHON_NROPTIONS=""
305
306Property changes on: ../trunk-jpl/jenkins/pleiades-dakota
307___________________________________________________________________
308Added: svn:executable
309## -0,0 +1 ##
310+*
311\ No newline at end of property
312Index: ../trunk-jpl/jenkins/ross-debian_linux-binaries-matlab
313===================================================================
314--- ../trunk-jpl/jenkins/ross-debian_linux-binaries-matlab (revision 26751)
315+++ ../trunk-jpl/jenkins/ross-debian_linux-binaries-matlab (revision 26752)
316@@ -49,7 +49,7 @@
317 dakota install-6.2-linux-static.sh
318 curl install-7-linux-static.sh
319 netcdf install-4.7-parallel-static.sh
320- proj install-8-static.sh
321+ proj install-6-static.sh
322 gdal install-3-static.sh
323 gshhg install.sh
324 gmt install-6-linux-static.sh
325Index: ../trunk-jpl/jenkins/ross-debian_linux-binaries-python
326===================================================================
327--- ../trunk-jpl/jenkins/ross-debian_linux-binaries-python (revision 26751)
328+++ ../trunk-jpl/jenkins/ross-debian_linux-binaries-python (revision 26752)
329@@ -49,7 +49,7 @@
330 dakota install-6.2-linux-static.sh
331 curl install-7-linux-static.sh
332 netcdf install-4.7-parallel-static.sh
333- proj install-8-static.sh
334+ proj install-6-static.sh
335 gdal install-3-python-static.sh
336 gshhg install.sh
337 gmt install-6-linux-static.sh
338Index: ../trunk-jpl/jenkins/ross-debian_linux-dakota
339===================================================================
340--- ../trunk-jpl/jenkins/ross-debian_linux-dakota (revision 26751)
341+++ ../trunk-jpl/jenkins/ross-debian_linux-dakota (revision 26752)
342@@ -48,7 +48,7 @@
343 dakota install-6.2-linux.sh
344 curl install-7-linux.sh
345 netcdf install-4.7-parallel.sh
346- proj install-8.sh
347+ proj install-6.sh
348 gdal install-3-python.sh
349 gshhg install.sh
350 gmt install-6-linux.sh
351Index: ../trunk-jpl/jenkins/ross-debian_linux-full
352===================================================================
353--- ../trunk-jpl/jenkins/ross-debian_linux-full (revision 26751)
354+++ ../trunk-jpl/jenkins/ross-debian_linux-full (revision 26752)
355@@ -49,7 +49,7 @@
356 dakota install-6.2-linux.sh
357 curl install-7-linux.sh
358 netcdf install-4.7-parallel.sh
359- proj install-8.sh
360+ proj install-6.sh
361 gdal install-3-python.sh
362 gshhg install.sh
363 gmt install-6-linux.sh
364Index: ../trunk-jpl/jenkins/ross-debian_linux-full-valgrind
365===================================================================
366--- ../trunk-jpl/jenkins/ross-debian_linux-full-valgrind (revision 26751)
367+++ ../trunk-jpl/jenkins/ross-debian_linux-full-valgrind (revision 26752)
368@@ -49,7 +49,7 @@
369 dakota install-6.2-linux.sh
370 curl install-7-linux.sh
371 netcdf install-4.7-parallel.sh
372- proj install-8.sh
373+ proj install-6.sh
374 gdal install-3-python.sh
375 gshhg install.sh
376 gmt install-6-linux.sh
377Index: ../trunk-jpl/jenkins/ross-debian_linux-python
378===================================================================
379--- ../trunk-jpl/jenkins/ross-debian_linux-python (revision 26751)
380+++ ../trunk-jpl/jenkins/ross-debian_linux-python (revision 26752)
381@@ -43,7 +43,7 @@
382 dakota install-6.2-linux.sh
383 curl install-7-linux.sh
384 netcdf install-4.7-parallel.sh
385- proj install-8.sh
386+ proj install-6.sh
387 gdal install-3-python.sh
388 gshhg install.sh
389 gmt install-6-linux.sh
390Index: ../trunk-jpl/jenkins/ross-debian_linux-solid_earth
391===================================================================
392--- ../trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 26751)
393+++ ../trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 26752)
394@@ -46,7 +46,7 @@
395 dakota install-6.2-linux.sh
396 curl install-7-linux.sh
397 netcdf install-4.7-parallel.sh
398- proj install-8.sh
399+ proj install-6.sh
400 gdal install-3-python.sh
401 gshhg install.sh
402 gmt install-6-linux.sh
403Index: ../trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic
404===================================================================
405--- ../trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic (revision 26751)
406+++ ../trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic (revision 26752)
407@@ -6,7 +6,7 @@
408 --enable-debugging \
409 --with-numthreads=4 \
410 --with-vendor="win-msys2" \
411- --with-matlab-dir=${MATLAB_PATH} \
412+ --with-matlab-dir="${MATLAB_PATH}" \
413 --with-mpi-include="${MSMPI_ROOT}/include" \
414 --with-mpi-libdir="${MSMPI_ROOT}/lib" \
415 --with-mpi-libflags="-lmsmpi" \
416@@ -14,13 +14,13 @@
417 --with-metis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
418 --with-parmetis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
419 --with-blas-lapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
420- --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
421- --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
422+ --with-scalapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
423+ --with-mumps-dir="${ISSM_DIR}/externalpackages/petsc/install" \
424 --with-petsc-dir="${ISSM_DIR}/externalpackages/petsc/install" \
425 --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install" \
426- --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
427- --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
428- --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
429+ --with-chaco-dir="${ISSM_DIR}/externalpackages/chaco/install" \
430+ --with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" \
431+ --with-semic-dir="${ISSM_DIR}/externalpackages/semic/install" \
432 '
433
434 #-------------------#
Note: See TracBrowser for help on using the repository browser.