Changeset 28053


Ignore:
Timestamp:
01/19/24 00:57:03 (14 months ago)
Author:
jdquinn
Message:

CHG: Updated JRE, MATLAB, OS, build configs

Location:
issm/trunk-jpl/jenkins
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/mac-intel-basic

    r28038 r28053  
    1 MATLAB_PATH="/Applications/MATLAB_R2022b.app"
     1MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    22
    33#--------------------#

  • issm/trunk-jpl/jenkins/mac-intel-binaries-matlab

    r28038 r28053  
    1 MATLAB_PATH="/Applications/MATLAB_R2022b.app"
     1MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    22
    33#--------------------#

  • issm/trunk-jpl/jenkins/mac-intel-dakota

    r28038 r28053  
    44#
    55
    6 MATLAB_PATH="/Applications/MATLAB_R2022b.app"
     6MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    77
    88#--------------------#

  • issm/trunk-jpl/jenkins/mac-intel-examples

    r28038 r28053  
    77#
    88
    9 MATLAB_PATH="/Applications/MATLAB_R2022b.app"
     9MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    1010
    1111#--------------------#

  • issm/trunk-jpl/jenkins/mac-intel-full

    r28038 r28053  
    88#
    99
    10 MATLAB_PATH="/Applications/MATLAB_R2022b.app"
     10MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    1111
    1212#--------------------#

  • issm/trunk-jpl/jenkins/mac-intel-solid_earth

    r28038 r28053  
    77#
    88
    9 MATLAB_PATH="/Applications/MATLAB_R2022b.app"
     9MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    1010
    1111#--------------------#

  • issm/trunk-jpl/jenkins/mac-silicon-basic

    r28038 r28053  
    1 # NOTE:
    2 # - Currently, this configuration does not compile the MATLAB API. After
    3 #       compiling, you will need to download the ISSM pre-compiled binaries from
    4 #       https://issm.jpl.nasa.gov/download/binaries, copy the contents of lib/ to
    5 #       $ISSM_DIR/lib-precompiled, then add $ISSM_DIR/lib-precompiled to the path
    6 #       in MATLAB.
    7 #
    8 # TODO:
    9 # - Change PROJ installation script to latest version once Jenkins macOS build
    10 #       node has been upgraded.
    11 #
    12 
    13 MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing
     1MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    142
    153#--------------------#
    … …  
    2210        --enable-development \
    2311        --enable-debugging \
    24         --without-wrappers \
    2512        --with-numthreads=8 \
     13        --with-matlab-dir=${MATLAB_PATH} \
    2614        --with-fortran-lib="-L/opt/homebrew/lib/gcc/current -lgfortran" \
    2715        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    … …  
    6856#               compilation
    6957#
    70 NUMCPUS_INSTALL=4
     58NUMCPUS_INSTALL=8
    7159
    7260# Number of CPUs used in the nightly runs
    … …  
    7765# See documentation in test/NightlyRun/runme.* for more information
    7866#
    79 # NOTE:
    80 # - Tests 430, 441:442, 470:476 excluded because of large errors.
    81 # - Tests 462-464, 517 excluded because of "Arrays have incompatible sizes for
    82 #       this operation."
    83 # - Test 701:703 excluded because they use full Stokes equations
    84 #
    85 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),430,435,441:442,462:464,470:476,517,701:703]"
     67MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
    8668PYTHON_NROPTIONS=""

  • issm/trunk-jpl/jenkins/mac-silicon-dakota

    r28038 r28053  
    1 # NOTE:
    2 # - Currently, this configuration does not compile the MATLAB API. After
    3 #       compiling, you will need to download the ISSM pre-compiled binaries from
    4 #       https://issm.jpl.nasa.gov/download/binaries, copy the contents of lib/ to
    5 #       $ISSM_DIR/lib-precompiled, then add $ISSM_DIR/lib-precompiled to the path
    6 #       in MATLAB.
    7 #
    8 # TODO:
    9 # - Change PROJ installation script to latest version once Jenkins macOS build
    10 #       node has been upgraded.
    11 #
    12 
    13 MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing
     1MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    142
    153#--------------------#
    … …  
    2311        --enable-debugging \
    2412        --with-numthreads=8 \
     13        --with-matlab-dir=${MATLAB_PATH} \
    2514        --with-python-version=3.9 \
    2615        --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \

  • issm/trunk-jpl/jenkins/mac-silicon-examples

    r28038 r28053  
    1 # NOTE:
    2 # - Same configuration as mac-silicon-full
    3 # - Currently, this configuration does not compile the MATLAB API. After
    4 #       compiling, you will need to download the ISSM pre-compiled binaries from
    5 #       https://issm.jpl.nasa.gov/download/binaries, copy the contents of lib/ to
    6 #       $ISSM_DIR/lib-precompiled, then add $ISSM_DIR/lib-precompiled to the path
    7 #       in MATLAB.
    8 #
    9 # TODO:
    10 # - Change PROJ installation script to latest version once Jenkins macOS build
    11 #       node has been upgraded.
    12 #
    13 
    14 MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing
     1MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    152
    163#--------------------#
    … …  
    2411        --enable-debugging \
    2512        --with-numthreads=8 \
     13        --with-matlab-dir=${MATLAB_PATH} \
    2614        --with-fortran-lib="-L/opt/homebrew/lib/gcc/current -lgfortran" \
    2715        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \

  • issm/trunk-jpl/jenkins/mac-silicon-full

    r28038 r28053  
    1 # NOTE:
    2 # - This configuration adds solid earth and Dakota capabilities to the basic
    3 #       build.
    4 # - Currently, this configuration does not compile the MATLAB API. After
    5 #       compiling, you will need to download the ISSM pre-compiled binaries from
    6 #       https://issm.jpl.nasa.gov/download/binaries, copy the contents of lib/ to
    7 #       $ISSM_DIR/lib-precompiled, then add $ISSM_DIR/lib-precompiled to the path
    8 #       in MATLAB.
    9 #
    10 # TODO:
    11 # - Change PROJ installation script to latest version once Jenkins macOS build
    12 #       node has been upgraded.
    13 #
    14 
    15 MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing
     1MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    162
    173#--------------------#
    … …  
    2511        --enable-debugging \
    2612        --with-numthreads=8 \
     13        --with-matlab-dir=${MATLAB_PATH} \
    2714        --with-python-version=3.9 \
    2815        --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \

  • issm/trunk-jpl/jenkins/mac-silicon-solid_earth

    r28038 r28053  
    1 # NOTE:
    2 # - Currently, this configuration does not compile the MATLAB API. After
    3 #       compiling, you will need to download the ISSM pre-compiled binaries from
    4 #       https://issm.jpl.nasa.gov/download/binaries, copy the contents of lib/ to
    5 #       $ISSM_DIR/lib-precompiled, then add $ISSM_DIR/lib-precompiled to the path
    6 #       in MATLAB.
    7 #
    8 # TODO:
    9 # - Change PROJ installation script to latest version once Jenkins macOS build
    10 #       node has been upgraded.
    11 #
    12 
    13 MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing
     1MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    142
    153#--------------------#
    … …  
    2210        --enable-development \
    2311        --enable-debugging \
    24         --with-numthreads=4 \
     12        --with-numthreads=8 \
     13        --with-matlab-dir=${MATLAB_PATH} \
    2514        --with-python-version=3.9 \
    2615        --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
    … …  
    10089# - Excluding 2012 until it can be looked at by Eric ("FindParam error message: Parameter HydrologyModel not set")
    10190# - Excluding 2091 until it can be debugged (resource starvation)
    102 # - Excluding 2110:2113 until we can compile MEX modules natively for Silicon and then can debug differences in mesh generation between different platforms
    10391#
    10492MATLAB_NROPTIONS="'benchmark','slc','exclude',[2004 2006 2012 2051 2052 2053 2085 2424 2425]"
    105 PYTHON_NROPTIONS="--benchmark slc --exclude 2004 2006 2012 2051 2052 2053 2085 2110:2113 2424 2425"
     93PYTHON_NROPTIONS="--benchmark slc --exclude 2004 2006 2012 2051 2052 2053 2085 2424 2425"
     94
Note: See TracChangeset for help on using the changeset viewer.