diff --git a/CMakeLists.txt b/CMakeLists.txt index ddae729c..f7db0b78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ option( ENABLE_NINJA "" OFF ) include(ProcessorCount) ProcessorCount(NUM_CORES) - + set(NUM_PROC ${NUM_CORES} CACHE STRING "") message( "Running with NUM_PROC = ${NUM_PROC}") @@ -771,7 +771,7 @@ endif() if( ENABLE_HYPRE ) set( HYPRE_DIR "${CMAKE_INSTALL_PREFIX}/hypre" ) - set( HYPRE_URL "${TPL_MIRROR_DIR}/hypre-2.29.0.tar.gz") + set( HYPRE_URL "${TPL_MIRROR_DIR}/hypre-v2.30.0-8-g61fa167d7.tar.gz" ) set( HYPRE_DEPENDS "" ) @@ -1141,7 +1141,7 @@ endif( ENABLE_MPI ) CMAKE_ARGS -D CMAKE_C_COMPILER=${VTK_C_COMPILER} -D CMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -D CMAKE_CXX_COMPILER=${VTK_CXX_COMPILER} - -D CMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} + -D CMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} -D VTK_USE_MPI=${VTK_USE_MPI} -D VTK_MODULE_ENABLE_VTK_IOParallelXML=${VTK_MODULE_ENABLE_VTK_IOParallelXML} -D VTK_MODULE_ENABLE_VTK_FiltersParallelDIY2=${VTK_MODULE_ENABLE_VTK_FiltersParallelDIY2} diff --git a/scripts/setupLC-TPL.bash b/scripts/setupLC-TPL.bash index 52c11973..fb060a58 100755 --- a/scripts/setupLC-TPL.bash +++ b/scripts/setupLC-TPL.bash @@ -27,8 +27,8 @@ rm -rf toBeDeleted & echo "Building all LC TPLs from $GEOSX_DIR to be installed at $INSTALL_DIR" chmod -R g+rx $INSTALL_DIR chgrp -R GEOS $INSTALL_DIR -./scripts/setupLC-TPL-helper.bash $GEOSX_DIR $INSTALL_DIR quartz clang-14 "srun -N 1 -t 90 -n 1 -A geosecp" $@ & -./scripts/setupLC-TPL-helper.bash $GEOSX_DIR $INSTALL_DIR quartz gcc-12 "srun -N 1 -t 90 -n 1 -A geosecp" $@ & +./scripts/setupLC-TPL-helper.bash $GEOSX_DIR $INSTALL_DIR quartz clang-14 "srun -N 1 -t 90 -n 1 -A cbronze" $@ & +./scripts/setupLC-TPL-helper.bash $GEOSX_DIR $INSTALL_DIR quartz gcc-12 "srun -N 1 -t 90 -n 1 -A cbronze" $@ & ./scripts/setupLC-TPL-helper.bash $GEOSX_DIR $INSTALL_DIR lassen gcc-8-cuda-11 "lalloc 1 -qpdebug" $@ & ./scripts/setupLC-TPL-helper.bash $GEOSX_DIR $INSTALL_DIR lassen clang-13-cuda-11 "lalloc 1 -qpdebug" $@ & ./scripts/setupLC-TPL-helper.bash $GEOSX_DIR $INSTALL_DIR lassen clang-10-cuda-11 "lalloc 1 -qpdebug" $@ & diff --git a/scripts/updateHypre.sh b/scripts/updateHypre.sh new file mode 100755 index 00000000..b6935890 --- /dev/null +++ b/scripts/updateHypre.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +# Input argument: hypre branch +VERSION=${1:-"master"} + +# Local variables +GEOSTPL_DIR=$(dirname $(dirname $(realpath $0))) +TPL_MIRROR_DIR=${GEOSTPL_DIR}/tplMirror +HYPRE_DIR=${GEOSTPL_DIR}/hypre-${VERSION} +HYPRE_SRC_DIR=${HYPRE_DIR}/src + +# Fetch hypre repository +cd ${GEOSTPL_DIR} +rm -rf ${HYPRE_DIR} +git clone https://github.com/hypre-space/hypre.git ${HYPRE_DIR} + +# Assign git variables +cd ${HYPRE_DIR} +git checkout ${VERSION} +HYPRE_DEVELOP_STRING=$(git -C ${HYPRE_SRC_DIR} describe --match 'v*' --long --abbrev=9) +HYPRE_DEVELOP_LASTAG=$(git -C ${HYPRE_SRC_DIR} describe --match 'v*' --abbrev=0) +HYPRE_DEVELOP_NUMBER=$(git -C ${HYPRE_SRC_DIR} rev-list --count $HYPRE_DEVELOP_LASTAG..HEAD) +HYPRE_DEVELOP_BRANCH=$(git -C ${HYPRE_SRC_DIR} rev-parse --abbrev-ref HEAD) + +# Replace placeholders in the "configure" file +sed -i "s/\$develop_string/$HYPRE_DEVELOP_STRING/g" ${HYPRE_SRC_DIR}/configure +sed -i "s/\$develop_lasttag/$HYPRE_DEVELOP_LASTAG/g" ${HYPRE_SRC_DIR}/configure +sed -i "s/\$develop_number/$HYPRE_DEVELOP_NUMBER/g" ${HYPRE_SRC_DIR}/configure +sed -i "s/\$develop_branch/$HYPRE_DEVELOP_BRANCH/g" ${HYPRE_SRC_DIR}/configure +sed -i "s/\$HYPRE_SRCDIR\/..\/.git/\$HYPRE_SRCDIR/g" ${HYPRE_SRC_DIR}/configure + +# Remove git machinery from configure +sed -i '/^[[:space:]]*develop_lastag=\$/d' ${HYPRE_SRC_DIR}/configure +sed -i '/^[[:space:]]*develop_number=\$/d' ${HYPRE_SRC_DIR}/configure +sed -i '/^[[:space:]]*develop_branch=\$/d' ${HYPRE_SRC_DIR}/configure +sed -i '/^[[:space:]]*develop_string=\$/d' ${HYPRE_SRC_DIR}/configure + +# Remove hypre test data +rm -rf ${HYPRE_DIR}/AUTOTEST +rm -rf ${HYPRE_DIR}/src/test/TEST_* + +# Remove git folder +rm -rf ${HYPRE_DIR}/.git + +# Create tarball and move it to tplMirror +HYPRE_DIR=${GEOSTPL_DIR}/hypre-${HYPRE_DEVELOP_STRING} +cd ${GEOSTPL_DIR} +mv hypre-${VERSION} ${HYPRE_DIR} +tar czvf hypre-${HYPRE_DEVELOP_STRING}.tar.gz hypre-${HYPRE_DEVELOP_STRING} +mv hypre-${HYPRE_DEVELOP_STRING}.tar.gz ${TPL_MIRROR_DIR} + +# Remove temporary directory +rm -rf ${HYPRE_DIR} + +# Update CMakeLists +echo -e "Updating CMakeLists..." +sed -i "s|set( HYPRE_URL \"\${TPL_MIRROR_DIR}/hypre-.*\.tar\.gz\" )|set( HYPRE_URL \"\${TPL_MIRROR_DIR}/hypre-${HYPRE_DEVELOP_STRING}.tar.gz\" )|" CMakeLists.txt diff --git a/tplMirror/hypre-2.29.0.tar.gz b/tplMirror/hypre-2.29.0.tar.gz deleted file mode 100644 index d2359d72..00000000 --- a/tplMirror/hypre-2.29.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98b72115407a0e24dbaac70eccae0da3465f8f999318b2c9241631133f42d511 -size 6832767 diff --git a/tplMirror/hypre-v2.30.0-8-g61fa167d7.tar.gz b/tplMirror/hypre-v2.30.0-8-g61fa167d7.tar.gz new file mode 100644 index 00000000..2c9bada8 --- /dev/null +++ b/tplMirror/hypre-v2.30.0-8-g61fa167d7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b24b9e68e43670e92b3e461d7787899d57335fe905a9f40e14b4b3b5f65241e +size 4360421