Skip to content

Commit

Permalink
Update hypre (#254)
Browse files Browse the repository at this point in the history
  • Loading branch information
victorapm authored Feb 2, 2024
1 parent fca7120 commit 270036f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ endif()

if( ENABLE_HYPRE )
set( HYPRE_DIR "${CMAKE_INSTALL_PREFIX}/hypre" )
set( HYPRE_URL "${TPL_MIRROR_DIR}/hypre-v2.30.0-8-g61fa167d7.tar.gz" )
set( HYPRE_URL "${TPL_MIRROR_DIR}/hypre-v2.30.0-44-geab5f9f7f.tar.gz" )
set( HYPRE_DEPENDS "" )


Expand Down Expand Up @@ -844,6 +844,7 @@ if( ENABLE_HYPRE )
FC=${HYPRE_Fortran_COMPILER} \
FCFLAGS=\"${HYPRE_Fortran_FLAGS}\" \
--prefix=${HYPRE_DIR} \
--with-print-errors \
${HYPRE_DEBUG_FLAG} \
${HYPRE_INT_FLAG} \
--with-blas-lib=\"${BLAS_LINK_LINE}\" \
Expand Down
11 changes: 11 additions & 0 deletions scripts/updateHypre.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ HYPRE_SRC_DIR=${HYPRE_DIR}/src
cd ${GEOSTPL_DIR}
rm -rf ${HYPRE_DIR}
git clone https://github.com/hypre-space/hypre.git ${HYPRE_DIR}
if [[ $? != "0" ]]; then
echo -e "git clone failed! Exiting..."
exit 1
fi

# Assign git variables
cd ${HYPRE_DIR}
Expand Down Expand Up @@ -42,6 +46,9 @@ rm -rf ${HYPRE_DIR}/src/test/TEST_*
# Remove git folder
rm -rf ${HYPRE_DIR}/.git

# Remove old hypre dir
git rm ${TPL_MIRROR_DIR}/hypre*.tar.gz

# Create tarball and move it to tplMirror
HYPRE_DIR=${GEOSTPL_DIR}/hypre-${HYPRE_DEVELOP_STRING}
cd ${GEOSTPL_DIR}
Expand All @@ -55,3 +62,7 @@ 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

# Stage changes
git add ${GEOSTPL_DIR}/CMakeLists.txt
git add ${TPL_MIRROR_DIR}/hypre*.tar.gz
3 changes: 3 additions & 0 deletions tplMirror/hypre-v2.30.0-44-geab5f9f7f.tar.gz
Git LFS file not shown
3 changes: 0 additions & 3 deletions tplMirror/hypre-v2.30.0-8-g61fa167d7.tar.gz

This file was deleted.

0 comments on commit 270036f

Please sign in to comment.