Changeset 20008

Timestamp:

01/27/16 17:16:36 (9 years ago)

Author:

schlegel

Message:

CHG: use correct mpi

Location:

issm/trunk-jpl/externalpackages

Files:

• dakota/configs/5.3.1/CMakeLists.txt.lonestar.patch (modified) (1 diff)
• dakota/install-6.2-lonestar.sh (modified) (2 diffs)
• petsc/install-3.6-lonestar.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/dakota/configs/5.3.1/CMakeLists.txt.lonestar.patch

@@ -3 +3 @@
 ---
 > # TODO: Can't this be integrated into the following logic?
-> set(BLAS_LIBS "-L/opt/apps/intel/11.1/mkl/lib/em64t/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")
-> set(LAPACK_LIBS "-L/opt/apps/intel/11.1/mkl/lib/em64t/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")
+> set(BLAS_LIBS "-L/opt/apps/intel/16.0.1.150/compilers_and_libraries_2016.1.150/linux/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")
+> set(LAPACK_LIBS "-L/opt/apps/intel/16.0.1.150/compilers_and_libraries_2016.1.150/linux/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")

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

@@ -22 +22 @@
 export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
 export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
-export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
+export MPIHOME=/opt/cray/mpt/default/gni/mpich-intel/14.0/
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch
@@ -36 +36 @@
 cd $DAK_BUILD
 
-cmake -D CMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
-           -D CMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
-           -D CMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
+cmake -D CMAKE_C_COMPILER=/opt/apps/intel16/cray_mpich/7.3.0/bin/mpicc \
+           -D CMAKE_CXX_COMPILER=/opt/apps/intel16/cray_mpich/7.3.0/bin/mpicxx \
+           -D CMAKE_Fortran_COMPILER=/opt/apps/intel16/cray_mpich/7.3.0/bin/mpif77 \
                 -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
                 -C $DAK_SRC/cmake/DakotaDev.cmake \

issm/trunk-jpl/externalpackages/petsc/install-3.6-lonestar.sh

@@ -20 +20 @@
         --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
         --with-blas-lapack-dir="$TACC_MKL_LIB" \
-        --with-mpi-lib="/opt/cray/mpt/default/gni/mpich-cray64/8.3/lib/libmpich.so" \
-        --with-mpi-include="/opt/cray/mpt/default/gni/mpich-cray64/8.3/include" \
+        --with-mpi-lib="/opt/cray/mpt/default/gni/mpich-intel/14.0/lib/libmpich.so" \
+        --with-mpi-include="/opt/cray/mpt/default/gni/mpich-intel/14.0/include" \
         --known-mpi-shared-libraries=1 \
         --with-debugging=0 \