Changeset 23915


Ignore:
Timestamp:
05/10/19 20:45:57 (6 years ago)
Author:
jdquinn
Message:

BUG: Corrected linking of boost archives to Dakota for Mac Dakota Binaries.

Location:
issm/trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/jenkins/macosx_pine-island_dakota_static

    r23452 r23915  
    1313        --with-matlab-dir=$MATLAB_PATH \
    1414        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
    15         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
     15        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
    1616        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lpmpi -lmpifort -lmpicxx" \
    1717        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
    1818        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    19         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    2019        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
    2120        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
    … …  
    4342                                                petsc        install-3.7-macosx64-static.sh
    4443                                                triangle     install-macosx64.sh
    45                                                 boost        install-1.55-macosx-el_capitan.sh
    46                                                 dakota       install-6.2-macosx64.sh
     44                                                boost        install-1.55-macosx-el_capitan-static.sh
     45                                                dakota       install-6.2-macosx64-static.sh
    4746                                                shell2junit  install.sh"
    4847
    … …  
    6261#by Matlab and runme.m
    6362#ex: "'id',[101 102 103]"
    64 ##                           bamg mesh   FS
    65 #PYTHON_NROPTIONS="--exclude_name 'Dakota'"
    66 #MATLAB_NROPTIONS="'exclude',[243,701,702,703,435,IdFromString('Dakota')]"
     63#PYTHON_NROPTIONS=""
     64#MATLAB_NROPTIONS=""

  • issm/trunk/m4/issm_options.m4

    r23394 r23915  
    478478
    479479                DAKOTAFLAGS=""
     480                dnl TODO: Should we also be checking if HAVE_BOOST before adding boost libs?
    480481                case "${host_os}" in
    481482                        *cygwin*)
    … …  
    521522                                        AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])
    522523                                else if test x$DAKOTA_VERSION = x6.1 || test x$DAKOTA_VERSION = x6.2; then
    523                                    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"
    524                                         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"
     524                                        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"
     525                                        if test "x$enable_standalone_executables" = "xyes"; then
     526                                                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"
     527                                        else
     528                                                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"
     529                                        fi
    525530                                        AC_DEFINE([DISABLE_DAKOTA_CONFIG_H],[1],[disabling DAKOTA_CONFIG_H])
    526531                                        AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])

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

    r22208 r23915  
    11#!/bin/bash
    22
    3 echo "modify generic"
     3MATLAB_PATH="/Applications/MATLAB_R2015b.app"
     4PACKAGE="ISSM" # Name of directory to copy distributable files to
     5TARBALL_NAME="issm-mac-static_build"
     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 "Modifying 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 .
    919
    10 #Check that test101 runs
     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
     28# Check that test218 (first Dakota test) runs
    1129cd $ISSM_DIR/test/NightlyRun
    1230rm matlab.log
    13 /Applications/MATLAB_R2015b.app/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
     31$MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',218); exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
    1432
    1533if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
    16         echo "test101 FAILED"
     34        echo "test218 FAILED"
    1735        exit 1;
    1836else
    19         echo "test101 passed"
     37        echo "test218 PASSED"
    2038fi
    2139
    22 #Package using the Package Maker from OSX, driven by command line.
    23 tarball_name='issm-mac-dakota-static_build.tar.gz'
     40echo "Creating tarball: ${TARBALL_NAME}"
     41cd $ISSM_DIR
     42rm -f $TARBALL
     43cp -rf bin lib test examples scripts $PACKAGE/
    2444
    25 echo "Cleanup first"
    2645cd $ISSM_DIR
    27 rm $tarball_name
    28 
    29 echo "Creating tarball: ${tarball_name}"
    30 cd $ISSM_DIR
    31 rm -rf trunk
    32 mkdir trunk
    33 cp -rf bin lib test examples trunk/
    34 tar -czf $tarball_name trunk
    35 ls -lah $tarball_name
     46tar -czf $TARBALL $PACKAGE
     47ls -lah $TARBALL
    3648
    3749echo "Shipping binaries to website"
    … …  
    5163ssh-add ~/.ssh/macosx-bins_richese-to-ross
    5264
    53 scp $tarball_name ross.ics.uci.edu:/var/www/html/$tarball_name
     65scp $TARBALL ross.ics.uci.edu:/var/www/html/$TARBALL
    5466
    5567if [ $? -ne 0 ]; then
Note: See TracChangeset for help on using the changeset viewer.