Changeset 25189


Ignore:
Timestamp:
06/30/20 12:39:07 (5 years ago)
Author:
jdquinn
Message:

CHG: Clean up of binaries packaging and testing scripts; clean up of Jenkins configuration files; suppressing aliased options to grep in interface system calls

Location:
issm/trunk-jpl
Files:
19 edited
1 copied

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/pine_island-mac

    r24676 r25189  
    2828'
    2929
    30 # Test suites
    31 MATLAB_TEST=1
    32 PYTHON_TEST=0
    33 JAVASCRIPT_TEST=0
    34 EXAMPLES_TEST=0
    35 
    3630#-------------------#
    3731# External Packages #
    … …  
    5448#---------#
    5549
     50# Test suites
     51MATLAB_TEST=1
     52PYTHON_TEST=0
     53JAVASCRIPT_TEST=0
     54EXAMPLES_TEST=0
     55
    5656# Number of CPUs used in ISSM compilation
    5757#
    … …  
    7171# - test701 is skipped because it uses full Stokes equations
    7272#
    73 MATLAB_NROPTIONS="'exclude',[435,701,702,703,IdFromString('Dakota')]"
     73MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]"
    7474PYTHON_NROPTIONS=""

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

    r25177 r25189  
    3333'
    3434
    35 # Test suites
    36 MATLAB_TEST=1
    37 PYTHON_TEST=1
    38 JAVASCRIPT_TEST=0
    39 EXAMPLES_TEST=0
    40 
    4135#-------------------#
    4236# External Packages #
    … …  
    6155# Testing #
    6256#---------#
     57
     58# Test suites
     59MATLAB_TEST=1
     60PYTHON_TEST=1
     61JAVASCRIPT_TEST=0
     62EXAMPLES_TEST=0
    6363
    6464# Number of CPUs used in ISSM compilation

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-solid_earth.sh

    r25188 r25189  
    99MATLAB_PATH="/usr/local/MATLAB/R2019b"
    1010PACKAGE="ISSM-Solid_Earth" # Name of directory to copy distributable files to
    11 PYTHON_NROPTIONS="--benchmark slr"
     11PYTHON_NROPTIONS="--benchmark 'slr'"
    1212TARBALL_NAME="issm-linux-solid_earth"
    1313TARBALL="${TARBALL_NAME}.tar.gz"

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh

    r25188 r25189  
    66LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    77LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    8 MATLAB_NROPTIONS="'id',[IdFromString('Dakota')]" # Exclude any tests with transient solutions that require a restart
     8MATLAB_NROPTIONS="'id',[IdFromString('Dakota')]"
    99MATLAB_PATH="/usr/local/MATLAB/R2019b"
    1010PACKAGE="ISSM" # Name of directory to copy distributable files to
    11 PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 418 420" # Exclude any tests with transient solutions that require a restart
     11PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 418 420"
    1212TARBALL_NAME="issm-linux-with_dakota"
    1313TARBALL="${TARBALL_NAME}.tar.gz"

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh

    r25188 r25189  
    66LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    77LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    8 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),125,126]" # Exclude Dakota tests and any tests with transient solutions that require a restart
     8MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
    99MATLAB_PATH="/usr/local/MATLAB/R2019b"
    1010PACKAGE="ISSM" # Name of directory to copy distributable files to

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh

    r25188 r25189  
    44## Constants
    55#
    6 MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,418,420,444,445]" # Exclude any tests with transient solutions that require a restart, and any tests that are excluded in the standard build
     6MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,418,420,444,445]"
    77MATLAB_PATH="/Applications/MATLAB_R2018a.app"
    88PACKAGE="ISSM" # Name of directory to copy distributable files to
    9 PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 417 418 420 444 445" # Exclude any tests with transient solutions that require a restart
     9PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 417 418 420 444 445"
    1010TARBALL_NAME="issm-mac-with_dakota"
    1111TARBALL="${TARBALL_NAME}.tar.gz"

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries.sh

    r25188 r25189  
    44## Constants
    55#
    6 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),125,126,435,701,702,703]" # Exclude Dakota tests, any tests with transient solutions that require a restart, and any tests that are excluded in the standard build
     6MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]"
    77MATLAB_PATH="/Applications/MATLAB_R2018a.app"
    88PACKAGE="ISSM" # Name of directory to copy distributable files to

  • issm/trunk-jpl/scripts/test-issm-linux-binaries-solid_earth.sh

    r25187 r25189  
    66#
    77
    8 MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,243,244,250,417,420,444,445,701,702,703]"  # Exclude any tests with transient solutions that require a restart
     8unset ISSM_DIR # Ensure that ISSM_DIR is not set in case we are running on a machine and user profile that sets it
     9
     10MATLAB_NROPTIONS="'benchmark','slr'"
    911MATLAB_PATH="/usr/local/MATLAB/R2019b"
    1012INSTALL_DIR=~/Downloads
    11 PACKAGE_NAME="ISSM"
    12 
    13 # Exclude any tests with transient solutions that require a restart
    14 #
    15 # NOTE:
    16 # - 418 fails with "malloc(): invalid next size (unsorted)""
    17 #
    18 PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 235 243 244 250 417 418 420 444 445 701 702 703"
    19 TARBALL_NAME="issm-linux-with_dakota"
     13PACKAGE_NAME="ISSM-Solid_Earth"
     14PYTHON_NROPTIONS="--benchmark 'slr'"
     15TARBALL_NAME="issm-linux-solid_earth"
    2016TARBALL="${TARBALL_NAME}.tar.gz"
    2117

  • issm/trunk-jpl/scripts/test-issm-linux-binaries-with_dakota.sh

    r24828 r25189  
    66#
    77
    8 MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,243,244,250,417,420,444,445,701,702,703]"  # Exclude any tests with transient solutions that require a restart
     8unset ISSM_DIR # Ensure that ISSM_DIR is not set in case we are running on a machine and user profile that sets it
     9
     10MATLAB_NROPTIONS="'id',[IdFromString('Dakota')]"
    911MATLAB_PATH="/usr/local/MATLAB/R2019b"
    1012INSTALL_DIR=~/Downloads
    1113PACKAGE_NAME="ISSM"
    12 
    13 # Exclude any tests with transient solutions that require a restart
    14 #
    15 # NOTE:
    16 # - 418 fails with "malloc(): invalid next size (unsorted)""
    17 #
    18 PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 235 243 244 250 417 418 420 444 445 701 702 703"
     14PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 418 420"
    1915TARBALL_NAME="issm-linux-with_dakota"
    2016TARBALL="${TARBALL_NAME}.tar.gz"

  • issm/trunk-jpl/scripts/test-issm-linux-binaries.sh

    r24707 r25189  
    66#
    77
    8 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),125,126]" # Exclude Dakota tests and any tests with transient solutions that require a restart
     8unset ISSM_DIR # Ensure that ISSM_DIR is not set in case we are running on a machine and user profile that sets it
     9
     10MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
    911MATLAB_PATH="/usr/local/MATLAB/R2019b"
    1012INSTALL_DIR=~/Downloads

  • issm/trunk-jpl/scripts/test-issm-mac-binaries-with_dakota.sh

    r24828 r25189  
    66#
    77
    8 MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,243,244,250,417,418,420,435,444,445,701,702,703]" # Regular test suite, plus any tests with transient solutions that require a restart
     8unset ISSM_DIR # Ensure that ISSM_DIR is not set in case we are running on a machine and user profile that sets it
     9
     10MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,418,420,444,445]"
    911MATLAB_PATH="/Applications/MATLAB_R2019b.app"
    1012INSTALL_DIR=~/Downloads
    1113PACKAGE_NAME="ISSM"
    12 
    13 # Exclude any tests with transient solutions that require a restart
    14 #
    15 # NOTE:
    16 # - 418 fails with "malloc(): invalid next size (unsorted)""
    17 #
    18 PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 235 243 244 250 417 418 420 435 444 445 701 702 703"
     14PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 417 418 420 444 445"
    1915TARBALL_NAME="issm-mac-with_dakota"
    2016TARBALL="${TARBALL_NAME}.tar.gz"

  • issm/trunk-jpl/scripts/test-issm-mac-binaries.sh

    r24707 r25189  
    66#
    77
    8 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),125,126]" # Exclude Dakota tests and any tests with transient solutions that require a restart
     8unset ISSM_DIR # Ensure that ISSM_DIR is not set in case we are running on a machine and user profile that sets it
     9
     10MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]"
    911MATLAB_PATH="/Applications/MATLAB_R2019b.app"
    1012INSTALL_DIR=~/Downloads

  • issm/trunk-jpl/src/m/coordsystems/epsg2proj.m

    r25064 r25189  
    1919        version_major=str2num(r);
    2020
    21         [s,r]=system(['gdalsrsinfo epsg:' num2str(epsg) ' | grep PROJ.4 | tr -d ''\n'' | sed ''s/PROJ.4 : //''']);
     21        [s,r]=system(['gdalsrsinfo epsg:' num2str(epsg) ' | command grep PROJ.4 | tr -d ''\n'' | sed ''s/PROJ.4 : //''']);
    2222
    2323        if s~=0,

  • issm/trunk-jpl/src/m/coordsystems/epsg2proj.py

    r25163 r25189  
    2929    version_major=int(outs)
    3030
    31     subproc_args = shlex.split("gdalsrsinfo epsg:{} | grep PROJ.4 | tr -d '\n' | sed 's/PROJ.4 : //'".format(epsg))
     31    subproc_args = shlex.split("gdalsrsinfo epsg:{} | command grep PROJ.4 | tr -d '\n' | sed 's/PROJ.4 : //'".format(epsg))
    3232    subproc = subprocess.Popen(subproc_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    3333    outs, errs = subproc.communicate()

  • issm/trunk-jpl/src/m/coordsystems/gdalinfo.m

    r24744 r25189  
    88
    99        %first, get pixel size:
    10         [s,r]=system(sprintf('gdalinfo %s | grep "Pixel Size"',imagename));
     10        [s,r]=system(sprintf('gdalinfo %s | command grep "Pixel Size"',imagename));
    1111        if s, error('gdalinfo error message: could not run system command gdalinfo to find pixel size'); end
    1212        d=sscanf(r,'Pixel Size = (%g,%g)');
    … …  
    1414
    1515        %get upper left:
    16         [s,r]=system(sprintf('gdalinfo %s | grep "Upper Left"',imagename));
     16        [s,r]=system(sprintf('gdalinfo %s | command grep "Upper Left"',imagename));
    1717        if s, error('gdalinfo error message: could not run system command gdalinfo to find upper left'); end
    1818        d=sscanf(r,'Upper Left ( %g,%g) %s');
    … …  
    2121       
    2222        %get lower right:
    23         [s,r]=system(sprintf('gdalinfo %s | grep "Lower Right"',imagename));
     23        [s,r]=system(sprintf('gdalinfo %s | command grep "Lower Right"',imagename));
    2424        if s, error('gdalinfo error message: could not run system command gdalinfo to find lower right'); end
    2525        d=sscanf(r,'Lower Right ( %g,%g) %s');
    … …  
    2828
    2929        %Size:
    30         [s,r]=system(sprintf('gdalinfo %s | grep "Size is"',imagename));
     30        [s,r]=system(sprintf('gdalinfo %s | command grep "Size is"',imagename));
    3131        if s, error('gdalinfo error message: could not run system command gdalinfo to find size'); end
    3232        d=sscanf(r,'Size is %g, %g');

  • issm/trunk-jpl/src/m/coordsystems/gmtmaskparallel.m

    r22933 r25189  
    5252
    5353        %concatenate:
    54         system('cat oce_vertices*.txt | grep -v Command | awk ''{printf("%s\n",$3);}''> vertices.txt');
     54        system('cat oce_vertices*.txt | command grep -v Command | awk ''{printf("%s\n",$3);}''> vertices.txt');
    5555
    5656        %read the vertices.txt file and flag our mesh vertices on the continent

  • issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m

    r25122 r25189  
    1616
    1717        % Get Gmsh version
    18         [s,r]=system(['gmsh -info | grep ''Version'' | sed -e ''s/Version[[:blank:]]*:[[:blank:]]//'' | cut -d ''.'' -f1']);
     18        [s,r]=system(['gmsh -info | command grep ''Version'' | sed -e ''s/Version[[:blank:]]*:[[:blank:]]//'' | cut -d ''.'' -f1']);
    1919        if s~=0,
    2020                error(r);

  • issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py

    r25122 r25189  
    2626
    2727    # Get Gmsh version
    28     subproc_args = "gmsh -info | grep 'Version' | sed -e 's/Version[[:blank:]]*:[[:blank:]]//' | cut -d '.' -f1"
     28    subproc_args = "gmsh -info | command grep 'Version' | sed -e 's/Version[[:blank:]]*:[[:blank:]]//' | cut -d '.' -f1"
    2929    subproc = subprocess.Popen(subproc_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    3030    outs, errs = subproc.communicate()

  • issm/trunk-jpl/src/m/miscellaneous/converttopowerof2.m

    r19950 r25189  
    1111
    1212        %figure out the size of the tiff
    13         [status,width]=system(['tiffinfo ' tiffname ' 2>/dev/null | grep "Image Width" | awk ''{printf("%s\n",$3);}''']);
    14         [status,length]=system(['tiffinfo ' tiffname ' 2>/dev/null | grep "Image Width" | awk ''{printf("%s\n",$6);}''']);
     13        [status,width]=system(['tiffinfo ' tiffname ' 2>/dev/null | command grep "Image Width" | awk ''{printf("%s\n",$3);}''']);
     14        [status,length]=system(['tiffinfo ' tiffname ' 2>/dev/null | command grep "Image Width" | awk ''{printf("%s\n",$6);}''']);
    1515        width=str2num(width); length=str2num(length);
    1616

  • issm/trunk-jpl/src/m/plot/googlemaps.m

    r23779 r25189  
    225225
    226226%Put everything in model
    227 [status output]=system('gdalinfo temp2.tiff | grep "Upper Left"');
     227[status output]=system('gdalinfo temp2.tiff | command grep "Upper Left"');
    228228ul = sscanf(output,'Upper Left  (%f, %f)');
    229 [status output]=system('gdalinfo temp2.tiff | grep "Lower Right"');
     229[status output]=system('gdalinfo temp2.tiff | command grep "Lower Right"');
    230230lr = sscanf(output,'Lower Right (%f, %f)');
    231 [status output]=system('gdalinfo temp2.tiff | grep "Size is"');
     231[status output]=system('gdalinfo temp2.tiff | command grep "Size is"');
    232232si = sscanf(output,'Size is %i, %i');
    233233x_m=linspace(ul(1),lr(1),si(1));
Note: See TracChangeset for help on using the changeset viewer.