Context Navigation

← Previous Changeset
Next Changeset →

Changeset 28214

Timestamp:

04/06/24 01:07:18 (12 months ago)

Author:

jdquinn

Message:

CHG: Adjusting test suites; link flags for libgfortran

Location:

issm/trunk-jpl

Files:

: 7 edited

externalpackages/gmt/install-6-linux-static.sh (modified) (2 diffs)
packagers/linux/complete-issm-linux-binaries-matlab.sh (modified) (1 diff)
packagers/linux/complete-issm-linux-binaries-python-3.sh (modified) (1 diff)
packagers/mac/complete-issm-mac-intel-binaries-matlab.sh (modified) (1 diff)
packagers/mac/complete-issm-mac-intel-binaries-python-3.sh (modified) (1 diff)
packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh (modified) (1 diff)
packagers/mac/complete-issm-mac-silicon-binaries-python-3.sh (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh

-              r28213
+              r28214
 LIBGFORTRAN=$(find /usr -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-echo "Finding libgcc..."
-LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc.* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
 GDAL_EXTRA_LIBS="-lm ${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a ${ZLIB_ROOT}/lib/libz.a -ldl -lsqlite3 ${PROJ_ROOT}/lib/libproj.a ${MPI_ROOT}/lib/libmpicxx.a -lstdc++" # See also patch for configuration file ./configs/${VER%.*}/static/cmake/modules/FindGDAL.cmake; for some reason, needed to run `sudo ln -s /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/libstdc++.so` after recent upgrades to make it so libstc++ is found
 …
 cmake \
         -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
         -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
+        -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;$-L${LIBGFORTRAN_ROOT};-lgfortran" \
         -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
         -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \
         -DGDAL_EXTRA_LIBS="${GDAL_EXTRA_LIBS}" \
         -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
+        -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;-L${LIBGFORTRAN_ROOT};-lgfortran" \
         -DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \
         ..

issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh

r28203	r28214
34	34	## Constants
35	35	#
36		MATLAB_NROPTIONS="'benchmark','all','exclude',[125:126,129,234:235,417:418,420,435,444:445,456,701:703,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2052:2053,2085,2090:2092,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
	36	MATLAB_NROPTIONS="'benchmark','all','exclude',[125:126,129,234:235,417:418,420,435,444:445,456,701:703,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2052:2053,2085,2090:2092,2110:2113,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
37	37	MATLAB_PATH="/usr/local/MATLAB/R2023b"
38	38

issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python-3.sh

r28203	r28214
35	35	#
36	36	PKG="ISSM-Linux-Python-3" # Name of directory to copy distributable files to
37		PYTHON_NROPTIONS="--benchmark all --exclude 125:126 129 234:235 417:418 420 435 444:445 456 701:703 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2006 2010:2013 2020:2021 2052:2053 2085 2090:2092 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
	37	PYTHON_NROPTIONS="--benchmark all --exclude 125:126 129 234:235 417:418 420 435 444:445 456 701:703 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2006 2010:2013 2020:2021 2052:2053 2085 2090:2092 2110:2113 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
38	38
39	39	COMPRESSED_PKG="${PKG}.tar.gz"

issm/trunk-jpl/packagers/mac/complete-issm-mac-intel-binaries-matlab.sh

r28203	r28214
64	64	## Constants
65	65	#
66		MATLAB_NROPTIONS="'benchmark','all','exclude',[124:126,129,234:235,417:418,420,435,444:445,456,701:703,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2052:2053,2085,2090:2092,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
	66	MATLAB_NROPTIONS="'benchmark','all','exclude',[124:126,129,234:235,417:418,420,435,444:445,456,701:703,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2052:2053,2085,2090:2092,2110:2113,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
67	67	MATLAB_PATH="/Applications/MATLAB_R2023b.app"
68	68	PKG="ISSM-macOS-Intel-MATLAB" # Name of directory to copy distributable files to

issm/trunk-jpl/packagers/mac/complete-issm-mac-intel-binaries-python-3.sh

r28203	r28214
65	65	#
66	66	PKG="ISSM-macOS-Intel-Python-3" # Name of directory to copy distributable files to
67		PYTHON_NROPTIONS="--benchmark all --exclude 124:126 129 234:235 417:418 420 435 444:445 456 701:703 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2006 2010:2013 2020:2021 2052:2053 2085 2090:2092 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
	67	PYTHON_NROPTIONS="--benchmark all --exclude 124:126 129 234:235 417:418 420 435 444:445 456 701:703 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2006 2010:2013 2020:2021 2052:2053 2085 2090:2092 2110:2113 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
68	68	REPO_BASE_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/intel/python/3"
69	69	SIGNED_REPO_COPY="./signed"

issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh

r28203	r28214
64	64	## Constants
65	65	#
66		MATLAB_NROPTIONS="'benchmark','all','exclude',[119,124:126,129,216,234:235,274,417:418,420,423,430,433,435,441:442,444:445,448,456,462:464,470:476,508,517,544,546,701:703,808,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2052:2053,2085,2090:2092,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
	66	MATLAB_NROPTIONS="'benchmark','all','exclude',[119,124:126,129,216,234:235,274,417:418,420,423,430,433,435,441:442,444:445,448,456,462:464,470:476,508,517,544,546,701:703,808,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2052:2053,2085,2090:2092,2110:2113,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
67	67	MATLAB_PATH="/Applications/MATLAB_R2023b.app"
68	68	PKG="ISSM-macOS-Silicon-MATLAB" # Name of directory to copy distributable files to

issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-python-3.sh

r28203	r28214
65	65	#
66	66	PKG="ISSM-macOS-Silicon-Python-3" # Name of directory to copy distributable files to
67		PYTHON_NROPTIONS="--benchmark all --exclude 119 124:126 129 216 234:235 274 417:418 420 423 430 433 435 441:442 444:445 448 456 462:464 470:476 508 517 544 546 701:703 808 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2006 2010:2013 2020:2021 2052:2053 2085 2090:2092 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
	67	PYTHON_NROPTIONS="--benchmark all --exclude 119 124:126 129 216 234:235 274 417:418 420 423 430 433 435 441:442 444:445 448 456 462:464 470:476 508 517 544 546 701:703 808 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2006 2010:2013 2020:2021 2052:2053 2085 2090:2092 2110:2113 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
68	68	REPO_BASE_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/silicon/python/3"
69	69	SIGNED_REPO_COPY="./signed"

Note: See TracChangeset for help on using the changeset viewer.