Changeset 23927


Ignore:
Timestamp:
05/23/19 11:34:41 (6 years ago)
Author:
jdquinn
Message:

CHG: Added configuration for Ubuntu with Dakota binaries; clean up of other packaging scripts

Location:
issm/trunk
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/externalpackages/dakota/install-6.2-macosx64-static.sh

    r23915 r23927  
    2929export DAK_SRC=$DAK_PATH/src
    3030export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
    31 export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install
     31
    3232
    3333# Apply patches

  • issm/trunk/jenkins/linux64_ross_static

    r23225 r23927  
    2323        --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
    2424        --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
    25         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
    26         --with-pic \
    27         --with-numthreads=4'
     25        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu -lgfortran" \
     26        --with-numthreads=4 \
     27        --with-pic'
    2828
    2929#PYTHON and MATLAB testing
    … …  
    5252#number of cpus used in ISSM installation and compilation (one is usually
    5353#safer as some packages are very sensitive to parallel compilation)
    54 NUMCPUS_INSTALL=10
     54NUMCPUS_INSTALL=4
    5555
    5656#number of cpus used in the nightly runs.
    57 NUMCPUS_RUN=10
     57NUMCPUS_RUN=4
    5858
    5959#Nightly run options. The matlab routine runme.m will be called
    … …  
    6262#ex: "'id',[101 102 103]"
    6363##                           FS
    64 #PYTHON_NROPTIONS="--exclude_name 'Dakota'"
    65 #MATLAB_NROPTIONS="'exclude',[243,701,702,703,435,IdFromString('Dakota')]"
     64#PYTHON_NROPTIONS=""
     65#MATLAB_NROPTIONS=""

  • issm/trunk/m4/issm_options.m4

    r23915 r23927  
    391391                                ;;
    392392                                *linux*)
    393                                 TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
    394393                                if test "x$HAVE_JAVASCRIPT" = "xyes"; then
    395394                                        dnl go to the bit code, not the library.
    … …  
    503502                                else if test x$DAKOTA_VERSION = x6.1 || test x$DAKOTA_VERSION = x6.2; then
    504503                                   DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
    505                                         DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
     504                                        if test "x$enable_standalone_executables" = "xyes"; then
     505                                                DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid $BOOST_ROOT/lib/libboost_serialization.a $BOOST_ROOT/lib/libboost_signals.a $BOOST_ROOT/lib/libboost_regex.a $BOOST_ROOT/lib/libboost_filesystem.a $BOOST_ROOT/lib/libboost_system.a"
     506                                        else
     507                                                DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
     508                                        fi
    506509                                        AC_DEFINE([DISABLE_DAKOTA_CONFIG_H],[1],[disabling DAKOTA_CONFIG_H])
    507510                                        AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])

  • issm/trunk/packagers/macosx-dakota/package.sh

    r23918 r23927  
    33MATLAB_PATH="/Applications/MATLAB_R2015b.app"
    44PACKAGE="ISSM" # Name of directory to copy distributable files to
    5 TARBALL_NAME="issm-mac-dakota-static_build"
     5TARBALL_NAME="issm-mac-dakota"
    66TARBALL=$TARBALL_NAME.tar.gz
    77
    … …  
    4242rm -f $TARBALL
    4343cp -rf bin lib test examples scripts $PACKAGE/
    44 
    45 cd $ISSM_DIR
    4644tar -czf $TARBALL $PACKAGE
    4745ls -lah $TARBALL

  • issm/trunk/packagers/macosx/package.sh

    r23404 r23927  
    33MATLAB_PATH="/Applications/MATLAB_R2015b.app"
    44PACKAGE="ISSM" # Name of directory to copy distributable files to
    5 TARBALL_NAME="issm-mac-static_build"
     5TARBALL_NAME="issm-mac"
    66TARBALL=$TARBALL_NAME.tar.gz
    77

  • issm/trunk/packagers/ubuntu/package.sh

    r22788 r23927  
    11#!/bin/bash
    22
    3 echo "modify generic"
     3MATLAB_PATH="/usr/local/MATLAB/R2015a"
     4PACKAGE="ISSM" # Name of directory to copy distributable files to
     5TARBALL_NAME="issm-ubuntu"
     6TARBALL=$TARBALL_NAME.tar.gz
     7
     8# Clean up from previous packaging
     9echo "Cleaning up existing assets"
     10cd $ISSM_DIR
     11rm -rf $PACKAGE
     12mkdir $PACKAGE
     13
     14# Add/modify required binaries
    415cd $ISSM_DIR/bin
     16
     17echo "Modify generic"
    518cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
    6 echo "move mpiexec to bin"
    7 cp ../externalpackages/mpich/install/bin/mpiexec .
    8 cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
    9 echo "move gmsh to bin"
     19
     20echo "Moving mpiexec to bin"
     21if [ -f ../externalpackages/mpich/install/bin/mpiexec ]; then
     22        cp ../externalpackages/mpich/install/bin/mpiexec .
     23        cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
     24else
     25        echo "mpich not found"
     26fi
     27
     28echo "Moving gmsh to bin"
    1029if [ -f ../externalpackages/gmsh/install/gmsh ]; then
    1130        cp ../externalpackages/gmsh/install/gmsh .
    … …  
    1433fi
    1534
    16 #Check that test101 runs
     35# Check that test101 runs
    1736cd $ISSM_DIR/test/NightlyRun
    1837rm matlab.log
    19 /usr/local/MATLAB/R2015a/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
     38$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
    2039
    2140if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
    … …  
    2342        exit 1;
    2443else
    25         echo "test101 passed"
     44        echo "test101 PASSED"
    2645fi
    2746
    28 tarball_name='issm-ubuntu-static_build.tar.gz'
    29 
    30 echo "Cleanup first"
     47echo "Creating tarball: ${TARBALL_NAME}"
    3148cd $ISSM_DIR
    32 rm $tarball_name
    33 
    34 echo "Creating tarball: ${tarball_name}"
    35 cd $ISSM_DIR
    36 rm -rf trunk
    37 mkdir trunk
    38 cp -rf bin lib test examples scripts trunk/
    39 tar -czf $tarball_name trunk
    40 ls -lah $tarball_name
     49rm -f $TARBALL
     50cp -rf bin lib test examples scripts $PACKAGE/
     51tar -czf $TARBALL $PACKAGE
     52ls -lah $TARBALL
    4153
    4254echo "Shipping binaries to website"
    … …  
    5668ssh-add ~/.ssh/ubuntu-bins_jenkins-to-ross
    5769
    58 scp $tarball_name ross.ics.uci.edu:/var/www/html/$tarball_name
     70scp $TARBALL ross.ics.uci.edu:/var/www/html/$TARBALL
    5971
    6072if [ $? -ne 0 ]; then
Note: See TracChangeset for help on using the changeset viewer.