Changeset 24317

Timestamp:

11/05/19 09:11:39 (5 years ago)

Author:

jdquinn

Message:

CHG: Disabling Fortran (for now) for JavaScript build.

Location:

issm/trunk-jpl

Files:

• externalpackages/emscripten/install.sh (modified) (1 diff)
• externalpackages/gsl/install-javascript.sh (modified) (3 diffs)
• externalpackages/triangle/install-javascript.sh (modified) (2 diffs)
• jenkins/jenkins.sh (modified) (1 diff)
• jenkins/linux64_ross_javascript (modified) (3 diffs)

issm/trunk-jpl/externalpackages/emscripten/install.sh ¶

@@ -2 +2 @@
 set -eu
 
+
+# TODO:
+# - Introduce build step to $ISSM_DIR/jenkins/jenkins.sh to compile Fortran code in $ISSM_DIR/src/c/modules/GiaDefelectionCorex/ to C with f2c
+#       - Then, revert $ISSM_DIR/externalpackages/emscripten/install.sh to r24306 and test clean build
+#       - When builtin support for Fortran is available, remove build step
+#
 
 # Get Emscripten SDK (emsdk) driver if we have not previously installed

issm/trunk-jpl/externalpackages/gsl/install-javascript.sh ¶

@@ -2 +2 @@
 set -eu
 
-#Source emscripten to ensure emcc/em++ compiler are in env
-source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
+
+# TODO:
+# - Revisit enviroment variables (especially EMCC_CFLAGS) once support for
+#       Fortran has been accomplished.
+#
+
+# Environment
 export CC=emcc
 export CXX=em++
+export AR=emar
+export RANLIB=emranlib
+#export EMCC_DEBUG=1 # Uncomment to enable debugging
+export EMCC_CFLAGS="-s ERROR_ON_UNDEFINED_SYMBOLS=0" # Required after v1.38.14 to avoid undefined symbol warnings from our Fortran object files being treated as errors
+
+# Source Emscripten environment
+source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
 
 # Issue with variadic function signatures.
-export CFLAGS=-DSTDC_HEADERS
+#export CFLAGS=-DSTDC_HEADERS
 
-#Some cleanup
+# Cleanup from previous installation
 rm -rf src-javascript install-javascript gsl-1.15
 mkdir src-javascript install-javascript
 
-#Download from ISSM server
+# Download source
 $ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz'
 
-#Untar 
+#Untar
 tar -zxvf  gsl-1.15.tar.gz
 
@@ -27 +39 @@
 cd src-javascript
 
-./configure --prefix="$ISSM_DIR/externalpackages/gsl/install-javascript" \
+./configure \
+        --prefix="$ISSM_DIR/externalpackages/gsl/install-javascript" \
         --disable-shared
 
@@ -36 +49 @@
         make -j $1
 fi
-make install 
+make install

issm/trunk-jpl/externalpackages/triangle/install-javascript.sh ¶

@@ -2 +2 @@
 set -eu
 
-#Source emscripten to ensure emcc/em++ compiler are in env
-source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
+
+# TODO:
+# - Revisit enviroment variables (especially EMCC_CFLAGS) once support for
+#       Fortran has been accomplished.
+#
+
+# Environment
 export CC=emcc
 export CXX=em++
+export AR=emar
+export RANLIB=emranlib
+#export EMCC_DEBUG=1 # Uncomment to enable debugging
+export EMCC_CFLAGS="-s ERROR_ON_UNDEFINED_SYMBOLS=0" # Required after v1.38.14 to avoid undefined symbol warnings from our Fortran object files being treated as errors
 
-#Some cleanup 
+# Source Emscripten environment
+source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
+
+#Some cleanup
 rm -rf install-javascript triangle
 mkdir install-javascript
@@ -14 +26 @@
 $ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/triangle.zip' 'triangle.zip'
 
-#Untar 
+#Untar
 cd install-javascript
 cp ../triangle.zip ./

issm/trunk-jpl/jenkins/jenkins.sh ¶

@@ -219 +219 @@
 fi
 
-#Set CXX/CC flags for JS runs after exnteralpackages to avoid conflicts during their compilation
+# Set CXX/CC flags for JS runs after exnteralpackages to avoid conflicts during their compilation
+#
+# TODO:
+# - Check a different boolean variable as compiling for JavaScript should be
+#       independent from running JavaScript tests (one should be able to do the
+#       former without having to do the latter).
+# - Revisit enviroment variables (especially EMCC_CFLAGS) once support for
+#       Fortran has been accomplished.
 CXX_PREVIOUS=$CXX
 CC_PREVIOUS=$CC
 if [ $JAVASCRIPT_TEST -eq 1 ]; then
+        export CC=emcc
         export CXX=em++
-        export CC=emcc
+        export AR=emar
+        export RANLIB=emranlib
+        #export EMCC_DEBUG=1 # Uncomment to enable debugging
+        export EMCC_CFLAGS="-s ERROR_ON_UNDEFINED_SYMBOLS=0" # Required after v1.38.14 to avoid undefined symbol warnings from our Fortran object files being treated as errors
         source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
 fi

issm/trunk-jpl/jenkins/linux64_ross_javascript ¶

@@ -9 +9 @@
     --disable-shared \
     --with-javascript \
+    --without-fortran \
+    --without-GiaIvins \
     --without-Love \
     --without-kml \
     --without-kriging \
+    --with-gsl-dir="$ISSM_DIR/externalpackages/gsl/install-javascript" \
     --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install-javascript" \
-    --with-gsl-dir="$ISSM_DIR/externalpackages/gsl/install-javascript"\
 '
 
@@ -20 +22 @@
 PYTHON_TEST=0
 JAVASCRIPT_TEST=1
-
-# Environment
-#export EMCC_DEBUG=1 # Uncomment to enable debugging
-export EMCC_CFLAGS="-s ERROR_ON_UNDEFINED_SYMBOLS=0" # Required after v1.38.14
 
 #-----------------------------------#
@@ -41 +39 @@
 #-----------------#
 
-#number of cpus used in ISSM installation and compilation (one is usually
-#safer as some packages are very sensitive to parallel compilation)
+# Number of CPUs used in ISSM compilation
+#
+# NOTE: One is usually safer as some packages are very sensitive to parallel
+#       compilation.
+#
 NUMCPUS_INSTALL=10
-
-#number of cpus used in the nightly runs.
-NUMCPUS_RUN=5
-
-#Nightly run options. The matlab routine runme.m will be called
-#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
-#by Matlab and runme.m
-#ex: "'id',[101 102 103]"
-#PYTHON_NROPTIONS="--exclude 119 243 514 701 702 703 435 --exclude_name 'Dakota'"
-#MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,435,IdFromString('Dakota')]"