Changeset 28117

Timestamp:

02/29/24 15:53:35 (13 months ago)

Author:

jdquinn

Message:

CHG: Missing Python 3 packager

File:

• issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (copied) (copied from issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh ) (8 diffs)

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

@@ -2 +2 @@
 
 ################################################################################
-# Packages and tests ISSM distributable package with MATLAB API for macOS.
+# Packages and tests ISSM distributable package for macOS with Python 3 API.
 #
 # Options:
@@ -8 +8 @@
 #                                               for some reason but build is valid.
 #
-# NOTE: The following variables *must* be defined in order for this script to 
-# work properly,
+# NOTE:
+# - Assumes that the following constants are defined,
 #
 #               COMPRESSED_PKG
@@ -34 +34 @@
 ## Override certain other aliases
 #
-alias cp=$(which cp)
 alias grep=$(which grep)
 
 ## Constants
 #
-MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,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
-MATLAB_PATH="/Applications/MATLAB_R2023b.app"
+PYTHON_NROPTIONS="--benchmark all --exclude 125 126 129 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2012 2013 2020 2021 2051 2052 2053 2084 2085 2090 2091 2092 2101 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
 
 ## Environment
 #
-export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'; used when running tests
+export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
 
 ## Parse options
@@ -62 +60 @@
 fi
 
-# Check if MATLAB exists
-if ! [ -d ${MATLAB_PATH} ]; then
-        echo "${MATLAB_PATH} does not point to a MATLAB installation! Please modify MATLAB_PATH variable in $(basename $0) and try again."
-        exit 1
-fi
-
 # Clean up from previous packaging
 echo "Cleaning up existing assets"
@@ -78 +70 @@
 
 echo "Modify generic"
-cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
+cat generic_static.py | sed -e "s/generic_static/generic/g" > generic.py
 
 echo "Moving MPICH binaries to bin/"
@@ -140 +132 @@
         echo "Running tests"
         cd ${ISSM_DIR}/test/NightlyRun
-        rm matlab.log 2> /dev/null
+        rm python.log 2> /dev/null
+
+        # Set Python environment
+        export PYTHONPATH="${ISSM_DIR}/src/m/dev"
+        export PYTHONSTARTUP="${PYTHONPATH}/devpath.py"
+        export PYTHONUNBUFFERED=1 # We don't want Python to buffer output, otherwise issm.exe output is not captured
 
         # Run tests, redirecting output to logfile and suppressing output to console
-        ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib ${ISSM_DIR}/share; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
+        ./runme.py ${PYTHON_NROPTIONS} &> python.log 2>&1
 
-        # Check that MATLAB did not exit in error
-        matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
+        # Check that Python did not exit in error
+        pythonExitCode=`echo $?`
+        pythonExitedInError=`grep -c -E "Error|No such file or directory|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
 
-        if [ ${matlabExitedInError} -ne 0 ]; then
-                echo "----------MATLAB exited in error!----------"
-                cat matlab.log
-                echo "-----------End of matlab.log-----------"
+        if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
+                echo "----------Python exited in error!----------"
+                cat python.log
+                echo "-----------End of python.log-----------"
 
                 # Clean up execution directory
@@ -160 +158 @@
 
         # Check that all tests passed
-        sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
-        numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
+        sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
+        numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
 
         if [ ${numTestsFailed} -ne 0 ]; then
                 echo "One or more tests FAILED"
-                cat matlab.log
+                cat python.log
                 exit 1
         else
@@ -181 +179 @@
 mkdir ${PKG}/execution
 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
+# ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
 echo "Cleaning up unneeded/unwanted files"
+# rm -f ${PKG}/bin/*.py # Remove all Python scripts
 rm -f ${PKG}/bin/generic_static.* # Remove static versions of generic cluster classes
 rm -f ${PKG}/lib/*.a # Remove static libraries from package