Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.stallo.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.stallo.patch (revision 23724) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.stallo.patch (revision 23724) @@ -0,0 +1,42 @@ +52,55c52,55 +< #set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} " +< # CACHE STRING "C Flags my platform" ) +< #set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} " +< # CACHE STRING "CXX Flags for my platform" ) +--- +> set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -L/lib64/libc.so.6 -L/lib64/ -lpthread -ldl -lm" +> CACHE STRING "C Flags my platform" ) +> set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -L/lib64/libc.so.6 -L/lib64/ -lpthread -ldl -lm" +> CACHE STRING "CXX Flags for my platform" ) +67a68,78 +> set( DAKOTA_HAVE_MPI ON +> CACHE BOOL "Always build with MPI enabled" FORCE) +> set( MPI_INCLUDE_PATH +> "/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/include64/" +> CACHE FILEPATH "Use installed MPI headers" FORCE) +> set( MPI_LIBRARY +> "/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/lib64/libmpich.so" +> CACHE FILEPATH "Use installed MPI library" FORCE) +> set( MPI_EXTRA_LIBRARY +> "/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/lib64/libmpich.so" +> CACHE FILEPATH "Use MPI extra libraries" FORCE) +73,77c84,88 +< #set(BOOST_ROOT +< # "path/to/custom/Boost/install/directory" +< # CACHE PATH "Use non-standard Boost install" FORCE) +< #set( Boost_NO_SYSTEM_PATHS TRUE +< # CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +--- +> set(BOOST_ROOT +> "$ENV{ISSM_DIR}/externalpackages/boost/install" +> CACHE PATH "Use non-standard Boost install" FORCE) +> set( Boost_NO_SYSTEM_PATHS TRUE +> CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +91,93c102,104 +< #set( CMAKE_INSTALL_PREFIX +< # "/path/to/Dakota/installation" +< # CACHE PATH "Path to Dakota installation" ) +--- +> set( CMAKE_INSTALL_PREFIX +> "$ENV{ISSM_DIR}/externalpackages/dakota/install" +> CACHE PATH "Path to Dakota installation" ) Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.stallo.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.stallo.patch (revision 23723) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.stallo.patch (revision 23724) @@ -1,7 +1,9 @@ -229c229 +229c229,231 < option(BUILD_SHARED_LIBS "Build shared libraries?" ON) --- -> option(BUILD_SHARED_LIBS "Build shared libraries?" OFF) -237a238,239 -> set(BLAS_LIBS "-L$/global/hds/software/cpu/eb3/imkl/2017.1.132-iimpi-2017a/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm") -> set(LAPACK_LIBS "-L$/global/hds/software/cpu/eb3/imkl/2017.1.132-iimpi-2017a/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm") +> option(BUILD_SHARED_LIBS "Build shared libraries?" ON) +> find_package(Threads) +> +237a240,241 +> set(BLAS_LIBS "-Wl,--no-as-needed -L/global/hds/software/cpu/eb3/imkl/2017.1.132-iimpi-2017a/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/lib64/libc.so.6 -L/lib64/ -lpthread -lm -ldl") +> set(LAPACK_LIBS "-Wl,--no-as-needed -L/global/hds/software/cpu/eb3/imkl/2017.1.132-iimpi-2017a/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/lib64/libc.so.6 -L/lib64/ -lpthread -lm -ldl") Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-stallo.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-6.2-stallo.sh (revision 23723) +++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-stallo.sh (revision 23724) @@ -10,5 +10,5 @@ #Download from ISSM server -$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' +#$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' #Untar @@ -22,7 +22,8 @@ export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build +export MPIHOME=/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/ cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake -patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch +patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.stallo.patch patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.stallo.patch @@ -39,6 +40,6 @@ cd $DAK_BUILD -cmake -D CMAKE_C_COMPILER=mpicc \ - -D CMAKE_CXX_COMPILER=mpicxx \ +cmake -D CMAKE_C_COMPILER=/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/intel64/bin/mpicc \ + -D CMAKE_CXX_COMPILER=/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/intel64/bin/mpicxx \ -D CMAKE_Fortran_COMPILER=gfortran \ -DHAVE_ACRO=off \