Skip to content

Commit

Permalink
minor
Browse files Browse the repository at this point in the history
  • Loading branch information
shahmoradi committed Sep 23, 2020
1 parent 816f923 commit 913b280
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
15 changes: 14 additions & 1 deletion buildParaMonte.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ unset INTERFACE_LANGUAGE
unset Fortran_COMPILER_PATH
FRESH_INSTALL_ENABLED=false
YES_TO_ALL_DISABLED=true
DRYRUN_ENABLED=false
CLEAN=false

while [ "$1" != "" ]; do
Expand Down Expand Up @@ -257,6 +258,8 @@ while [ "$1" != "" ]; do
;;
-F | --fresh ) FRESH_INSTALL_ENABLED=true; export FRESH_INSTALL_ENABLED
;;
-d | --dryrun ) DRYRUN_ENABLED=true; export DRYRUN_ENABLED
;;
-y | --yes-to-all ) YES_TO_ALL_DISABLED=false; export YES_TO_ALL_DISABLED
;;
-B | --bootstrap ) GCC_BOOTSTRAP="--bootstrap"; export GCC_BOOTSTRAP
Expand Down Expand Up @@ -1692,6 +1695,12 @@ else
fi
if [ "${isMacOS}" = "true" ]; then ParaMonte_CAF_SETUP_PATH_CMD=""; fi

####################################################################################################################################
#### call cmake
####################################################################################################################################

if [ "${DRYRUN_ENABLED}" != "true" ]; then

(cd ${ParaMonte_BLD_DIR} && \
${ParaMonte_CAF_SETUP_PATH_CMD} && \
cmake \
Expand Down Expand Up @@ -1722,6 +1731,10 @@ make install \
)
verify $? "installation"

fi

####################################################################################################################################

LD_LIBRARY_PATH=${ParaMonte_BLD_DIR}/lib:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
if [ "${ParaMonteTest_RUN_ENABLED}" = "true" ]; then
Expand Down Expand Up @@ -1948,7 +1961,7 @@ if [ "${INTERFACE_LANGUAGE}" = "matlab" ] && [ "${LTYPE}" = "dynamic" ] && [ "${
echo >&2

ParaMonteMATLAB_BLD_LIB_DIR="${ParaMonte_BLD_DIR}/lib"
if [ -d "${MATLAB_BIN_DIR}" ]; then
if [ -d "${MATLAB_BIN_DIR}" ] && [ "${DRYRUN_ENABLED}" != "true" ]; then
# cd "${ParaMonteMATLAB_BLD_LIB_DIR}" && fname=$(find -type f -name 'libparamonte_*');
# PMLIB_NAME_EXT=${fname:2} # removing first two characters './'
# PMLIB_NAME=$(basename -- "$PMLIB_NAME_EXT")
Expand Down
10 changes: 8 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ yes_to_all_flag=""
gcc_bootstrap_flag=""
FOR_COARRAY_NUM_IMAGES=3
MatDRAM_ENABLED="false"
dryrun_flag=""

while [ "$1" != "" ]; do
case $1 in
Expand Down Expand Up @@ -129,10 +130,11 @@ while [ "$1" != "" ]; do
;;
-F | --fresh ) fresh_flag="--fresh"
;;
-d | --dryrun ) dryrun_flag="--dryrun"
;;
-y | --yes-to-all ) yes_to_all_flag="--yes-to-all"
;;
-B | --bootstrap ) shift
gcc_bootstrap_flag="--bootstrap"
-B | --bootstrap ) gcc_bootstrap_flag="--bootstrap"
;;
# -a | --matdram ) shift
# MatDRAM_ENABLED="true"
Expand Down Expand Up @@ -583,6 +585,9 @@ for PMCS in $PMCS_LIST; do
if ! [ "${fresh_flag}" = "" ]; then
echo >&2 " ${fresh_flag} \ "
fi
if ! [ "${dryrun_flag}" = "" ]; then
echo >&2 " ${dryrun_flag} \ "
fi
if ! [ "${gcc_bootstrap_flag}" = "" ]; then
echo >&2 " ${gcc_bootstrap_flag} \ "
fi
Expand Down Expand Up @@ -615,6 +620,7 @@ for PMCS in $PMCS_LIST; do
${exam_enabled_flag} \
${yes_to_all_flag} \
${fresh_flag} \
${dryrun_flag} \
${gcc_bootstrap_flag} \
${fortran_flag} \
${mpiexec_flag} \
Expand Down

0 comments on commit 913b280

Please sign in to comment.