[issm-svn] r23454 - in issm/trunk/externalpackages/dakota: . configs/6.2

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-11-05 10:17:51 -0800 (Mon, 05 Nov 2018)
New Revision: 23454

Added:
   issm/trunk/externalpackages/dakota/configs/6.2/InstallDarwinDylibs.cmake.patch
Modified:
   issm/trunk/externalpackages/dakota/install-6.2-macosx64.sh
Log:
CHG: Corrected config for Mac Dakota Binaries build

Added: issm/trunk/externalpackages/dakota/configs/6.2/InstallDarwinDylibs.cmake.patch
===================================================================
--- issm/trunk/externalpackages/dakota/configs/6.2/InstallDarwinDylibs.cmake.patch	                        (rev 0)
+++ issm/trunk/externalpackages/dakota/configs/6.2/InstallDarwinDylibs.cmake.patch	2018-11-05 18:17:51 UTC (rev 23454)
@@ -0,0 +1,7 @@
+22,23c22,24
+< 
+< if ( DAKOTA_JENKINS_BUILD OR DEFINED ENV{WORKSPACE} )
+---
+> if ( DEFINED ENV{DAK_BUILD} )
+>   set ( CMAKE_CURRENT_BINARY_DIR $ENV{DAK_BUILD} )
+> elseif ( DAKOTA_JENKINS_BUILD OR DEFINED ENV{WORKSPACE} )

Modified: issm/trunk/externalpackages/dakota/install-6.2-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/dakota/install-6.2-macosx64.sh	2018-11-03 22:29:57 UTC (rev 23453)
+++ issm/trunk/externalpackages/dakota/install-6.2-macosx64.sh	2018-11-05 18:17:51 UTC (rev 23454)
@@ -1,63 +1,63 @@
 #!/bin/bash
 set -eu
 
-#Some cleanup
-rm -rf Dakota
-rm -rf src 
-rm -rf build 
-rm -rf install 
-mkdir src build install 
+# Constants
+DAK_VER="6.2"
 
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz'
+# Some cleanup
+rm -rf build
+rm -rf install
+rm -rf tests
+rm -rf src
+mkdir build install src
 
-#Untar 
-tar -zxvf dakota-6.2-public-src.tar.gz
+# Download from ISSM server
+$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"
 
-#Move Dakota to src directory
-mv dakota-6.2.0.src/* src
-rm -rf dakota-6.2.0.src
+# Untar
+tar -zxvf dakota-${DAK_VER}-public-src.tar.gz
 
-#Set up Dakota cmake variables and config
-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.2/BuildDakotaCustom.cmake.mac.patch
-patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
-patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.patch
+# Move Dakota to src directory
+mv dakota-${DAK_VER}.0.src/* src
+rm -rf dakota-${DAK_VER}.0.src
 
-#Apply patches
-patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch
-patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch
-patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch
+# Set up Dakota and CMake variables
+DAK_PATH=$ISSM_DIR/externalpackages/dakota
 
+export DAK_BUILD=$DAK_PATH/build
+export DAK_INSTALL=$DAK_PATH/install
+export DAK_SRC=$DAK_PATH/src
+export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
 export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install
 
-#Configure dakota
-# Set your local gcc compiler here
+# Apply patches
+cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/$DAK_VER/BuildDakotaCustom.cmake.mac.patch
+patch $DAK_SRC/cmake/DakotaDev.cmake configs/$DAK_VER/DakotaDev.cmake.patch
+patch $DAK_SRC/cmake/InstallDarwinDylibs.cmake configs/$DAK_VER/InstallDarwinDylibs.cmake.patch
+patch $DAK_SRC/CMakeLists.txt configs/$DAK_VER/CMakeLists.txt.patch
+patch src/src/NonDSampling.cpp configs/$DAK_VER/NonDSampling.cpp.patch
+patch src/src/NonDLocalReliability.cpp configs/$DAK_VER/NonDLocalReliability.cpp.patch
+patch src/packages/pecos/src/pecos_global_defs.hpp configs/$DAK_VER/pecos_global_defs.hpp.patch
+
+# Configure and build Dakota
 cd $DAK_BUILD
-cmake -DBoost_NO_BOOST_CMAKE=TRUE \
+cmake \
+	-C$DAK_SRC/cmake/BuildDakotaCustom.cmake \
+	-C$DAK_SRC/cmake/DakotaDev.cmake \
+	-DBOOST_ROOT:PATHNAME=$BOOST_ROOT \
+	-DBoost_NO_BOOST_CMAKE=TRUE \
 	-DBoost_NO_SYSTEM_PATHS=TRUE \
-	-DBOOST_ROOT:PATHNAME=$BOOST_ROOT \
-	-DBoost_LIBRARY_DIRS:FILEPATH=${BOOST_ROOT}/lib \
-	-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 CMAKE_CXX_FLAGS=-fdelayed-template-parsing \
+	-DBoost_LIBRARY_DIRS:FILEPATH=$BOOST_ROOT/lib \
+	-DCMAKE_INSTALL_PREFIX=$DAK_INSTALL \
+	-DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
+	-DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
+	-DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
+	-DCMAKE_CXX_FLAGS=-fdelayed-template-parsing \
 	-DHAVE_ACRO=off \
 	-DHAVE_JEGA=off \
-	-C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
-	-C $DAK_SRC/cmake/DakotaDev.cmake \
 	$DAK_SRC
-cd ..
 
-# Snowleopard: Mpi should be made with these compilers
-#-DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_CC_COMPILER=/usr/bin/gcc \
-#-DCMAKE_Fortran_COMPILER=/usr/local/gfortran/bin/x86_64-apple-darwin10-gfortran \
-
-#Compile and install dakota
-cd $DAK_BUILD
 if [ $# -eq 0 ];
 then
 	make
@@ -66,4 +66,13 @@
 	make -j $1
 	make -j $1 install
 fi
-cd ..
+
+# Set paths and library paths
+export PATH=$DAK_INSTALL/bin:$DAK_INSTALL/test:$PATH
+
+if [ -z $DYLD_LIBRARY_PATH ]
+then
+	export DYLD_LIBRARY_PATH=$DAK_INSTALL/lib:$DAK_INSTALL/bin
+else
+	export DYLD_LIBRARY_PATH=$DAK_INSTALL/lib:$DAK_INSTALL/bin:$DYLD_LIBRARY_PATH
+fi