Changeset 19550

Timestamp:

09/15/15 17:05:34 (10 years ago)

Author:

schlegel

Message:

CHG: some dakota mpi patches

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• configs/6.1-mpi/BuildDakotaCustom.cmake.mac.patch (modified) (1 diff)
• configs/6.1-mpi/BuildDakotaCustom.cmake.patch (modified) (1 diff)
• install-6.1-mpi-linux64.sh (added)
• install-6.1-mpi-macosx64-yosemite.sh (modified) (3 diffs)

issm/trunk-jpl/externalpackages/dakota/configs/6.1-mpi/BuildDakotaCustom.cmake.mac.patch

@@ -1 @@
-64,65c64,65
-< #set( DAKOTA_HAVE_MPI ON
-< #     CACHE BOOL "Build with MPI enabled" FORCE)
----
-> set( DAKOTA_HAVE_MPI OFF
->      CACHE BOOL "Build with MPI disabled" FORCE)
 91,93c91,93
 < #set( CMAKE_INSTALL_PREFIX

issm/trunk-jpl/externalpackages/dakota/configs/6.1-mpi/BuildDakotaCustom.cmake.patch

@@ +1 @@
+67a68,75
+> set( DAKOTA_HAVE_MPI ON
+>  CACHE BOOL "Always build with MPI enabled" FORCE)
+> set( MPI_INCLUDE_PATH
+>  "$ENV{ISSM_DIR}/externalpackages/mpich/install/include"
+>  CACHE FILEPATH "Use installed MPI headers" FORCE)
+> set( MPI_LIBRARY
+>  "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.a"
+>  CACHE FILEPATH "Use installed MPI library" FORCE)
 73,77c73,77
 < #set(BOOST_ROOT

issm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-macosx64-yosemite.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
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1-mpi/BuildDakotaCustom.cmake.patch
@@ -28 +29 @@
 
 #Apply patches
-#patch src/src/ParallelLibrary.cpp configs/6.1/ParallelLibrary.cpp.patch
-#patch src/src/ParallelLibrary.hpp configs/6.1/ParallelLibrary.hpp.patch
-#patch src/src/NonDSampling.cpp configs/6.1/NonDSampling.cpp.patch
-#patch src/src/NonDLocalReliability.cpp configs/6.1/NonDLocalReliability.cpp.patch
+patch src/src/ParallelLibrary.cpp configs/6.1/ParallelLibrary.cpp.patch
+patch src/src/ParallelLibrary.hpp configs/6.1/ParallelLibrary.hpp.patch
+patch src/src/NonDSampling.cpp configs/6.1/NonDSampling.cpp.patch
+patch src/src/NonDLocalReliability.cpp configs/6.1/NonDLocalReliability.cpp.patch
 #patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.1/pecos_global_defs.hpp.patch
 
@@ -38 +39 @@
 
 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 \
-        -D LDFLAGS="-std=gnu++0x" \
-        -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
-        -C $DAK_SRC/cmake/DakotaDev.cmake \
-        $DAK_SRC
+           -D CMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
+           -D CMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
+           -D LDFLAGS="-std=gnu++0x" \
+                -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
+                -C $DAK_SRC/cmake/DakotaDev.cmake \
+                $DAK_SRC
 cd ..