Changeset 24372


Ignore:
Timestamp:
11/20/19 14:56:05 (5 years ago)
Author:
jdquinn
Message:

BUG: BLAS/LAPACK lib config for Jenkins build (quick fix: will clean up these installation scripts later)

Location:
issm/trunk-jpl/externalpackages/dakota
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch

    r22616 r24372  
    33---
    44> # TODO: Can't this be integrated into the following logic?
    5 > set(BLAS_LIBS "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran")
    6 > set(LAPACK_LIBS "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran")
     5> set(BLAS_LIBS $ENV{BLAS_LIBS})
     6> set(LAPACK_LIBS $ENV{LAPACK_LIBS})

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

    r24311 r24372  
    22set -eu
    33
     4
    45# Constants
    5 DAK_VER="6.2"
     6#
     7VER="6.2"
    68
    7 #Some cleanup
     9# Cleanup
    810rm -rf Dakota
    911rm -rf src
    … …  
    1315
    1416#Download from ISSM server
    15 $ISSM_DIR/scripts/DownloadExternalPackage.sh https://issm.ess.uci.edu/files/externalpackages/dakota-${DAK_VER}-public.src.tar.gz dakota-${DAK_VER}-public-src.tar.gz
     17$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/dakota-${VER}-public.src.tar.gz" "dakota-${VER}-public-src.tar.gz"
    1618
    1719#Untar
    18 tar -zxvf dakota-${DAK_VER}-public-src.tar.gz
     20tar -zxvf dakota-${VER}-public-src.tar.gz
    1921
    2022#Move Dakota to src directory
    21 mv dakota-${DAK_VER}.0.src/* src
    22 rm -rf dakota-${DAK_VER}.0.src
     23mv dakota-${VER}.0.src/* src
     24rm -rf dakota-${VER}.0.src
    2325
    2426#Set up Dakota cmake variables and config
    … …  
    3032export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
    3133export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install
     34export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure that external packages also find it
     35export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure thatss is as an option to CMake to ensure that external packages also find it
     36
    3237
    3338cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
    34 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/${DAK_VER}/BuildDakotaCustom.cmake.patch
    35 patch $DAK_SRC/cmake/DakotaDev.cmake configs/${DAK_VER}/DakotaDev.cmake.patch
    36 patch $DAK_SRC/CMakeLists.txt configs/${DAK_VER}/CMakeLists.txt.petsclibs.patch
     39patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/${VER}/BuildDakotaCustom.cmake.patch
     40patch $DAK_SRC/cmake/DakotaDev.cmake configs/${VER}/DakotaDev.cmake.patch
     41patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.petsclibs.patch
    3742
    3843#Apply patches
    39 patch src/src/NonDSampling.cpp configs/${DAK_VER}/NonDSampling.cpp.patch
    40 patch src/src/NonDLocalReliability.cpp configs/${DAK_VER}/NonDLocalReliability.cpp.patch
    41 patch src/packages/pecos/src/pecos_global_defs.hpp configs/${DAK_VER}/pecos_global_defs.hpp.patch
     44patch src/src/NonDSampling.cpp configs/${VER}/NonDSampling.cpp.patch
     45patch src/src/NonDLocalReliability.cpp configs/${VER}/NonDLocalReliability.cpp.patch
     46patch src/packages/pecos/src/pecos_global_defs.hpp configs/${VER}/pecos_global_defs.hpp.patch
    4247
    4348#Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost
    … …  
    4752cd $DAK_BUILD
    4853
    49 cmake -C$DAK_SRC/cmake/BuildDakotaCustom.cmake \
    50                 -C$DAK_SRC/cmake/DakotaDev.cmake \
    51                 -DBUILD_STATIC_LIBS=ON \
    52                 -DBUILD_SHARED_LIBS=OFF \
    53                 -DBOOST_ROOT=$BOOST_ROOT \
    54                 -DBoost_LIBRARY_DIRS=$BOOST_ROOT/lib \
    55                 -DBoost_NO_BOOST_CMAKE=TRUE \
    56                 -DBoost_NO_SYSTEM_PATHS=TRUE \
    57                 -DBoost_INSTALL_PREFIX=$DAK_INSTALL \
    58                 -DCMAKE_C_FLAGS="-O2 -g -fPIC" \
    59                 -DCMAKE_CXX_FLAGS="-O2 -g -fPIC" \
    60                 -DCMAKE_Fortran_FLAGS="-O2 -g -fPIC" \
    61                 -DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
    62                 -DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
    63                 -DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
    64                 -DHAVE_ACRO=off \
    65                 -DHAVE_JEGA=off \
    66                 $DAK_SRC
     54cmake \
     55        -DBUILD_STATIC_LIBS=ON \
     56        -DBUILD_SHARED_LIBS=OFF \
     57        -DBoost_INSTALL_PREFIX=$DAK_INSTALL \
     58        -DBOOST_ROOT=$BOOST_ROOT \
     59        -DBoost_NO_BOOST_CMAKE=TRUE \
     60        -DBoost_LIBRARY_DIRS=$BOOST_ROOT/lib \
     61        -DBoost_NO_SYSTEM_PATHS=TRUE \
     62        -DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
     63        -DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
     64        -DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
     65        -DCMAKE_C_FLAGS="-O2 -g -fPIC" \
     66        -DCMAKE_CXX_FLAGS="-O2 -g -fPIC" \
     67        -DCMAKE_Fortran_FLAGS="-O2 -g -fPIC" \
     68        -DHAVE_ACRO=off \
     69        -DHAVE_JEGA=off \
     70        -C$DAK_SRC/cmake/BuildDakotaCustom.cmake \
     71        -C$DAK_SRC/cmake/DakotaDev.cmake \
     72        $DAK_SRC
     73
    6774cd ..
    6875

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh

    r23435 r24372  
    44#Some cleanup
    55rm -rf Dakota
    6 rm -rf src 
    7 rm -rf build 
    8 rm -rf install 
    9 mkdir src build install 
     6rm -rf src
     7rm -rf build
     8rm -rf install
     9mkdir src build install
    1010
    1111#Download from ISSM server
    1212$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz'
    1313
    14 #Untar 
     14#Untar
    1515tar -zxvf dakota-6.2-public-src.tar.gz
    1616
    … …  
    2323export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
    2424export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
     25export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure that external packages also find it
     26export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure that
    2527cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
    2628patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch
Note: See TracChangeset for help on using the changeset viewer.