Changeset 23724

Timestamp:

02/14/19 11:18:05 (6 years ago)

Author:

schlegel

Message:

CHG: force dakota to file pthread

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• configs/6.2/BuildDakotaCustom.cmake.stallo.patch (added)
• configs/6.2/CMakeLists.txt.stallo.patch (modified) (1 diff)
• install-6.2-stallo.sh (modified) (3 diffs)

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

@@ -1 @@
-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")

issm/trunk-jpl/externalpackages/dakota/install-6.2-stallo.sh

@@ -10 +10 @@
 
 #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 +22 @@
 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 +40 @@
 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 \