Merge pull request #247 from awslabs/sjg/dependency-updates

Update dependency versions for superbuild
awslabs · May 14, 2024 · acd0f09 · acd0f09
2 parents 1825583 + 418ed66
commit acd0f09
Show file tree

Hide file tree

Showing 22 changed files with 1,680 additions and 5,699 deletions.
diff --git a/cmake/ExternalGitTags.cmake b/cmake/ExternalGitTags.cmake
@@ -20,7 +20,7 @@ set(EXTERN_ARPACK_GIT_BRANCH
   "Git branch for external ARPACK-NG build"
 )
 set(EXTERN_ARPACK_GIT_TAG
-  "51ce061ff7066ce712638bb058c805c40a326582" CACHE STRING
+  "217e25ac7c48b5d05d31120475c8e1eeaf543bbd" CACHE STRING
   "Git tag for external ARPACK-NG build"
 )
 
@@ -34,7 +34,7 @@ set(EXTERN_BUTTERFLYPACK_GIT_BRANCH
   "Git branch for external ButterflyPACK build"
 )
 set(EXTERN_BUTTERFLYPACK_GIT_TAG
-  "e1ad6091e8dc2cb906ec426222f4acedb4eeeff2" CACHE STRING
+  "6bb36d00ad8deab43d74aa4fce0715e9400d994a" CACHE STRING
   "Git tag for external ButterflyPACK build"
 )
 
@@ -48,7 +48,7 @@ set(EXTERN_GSLIB_GIT_BRANCH
   "Git branch for external GSLIB build"
 )
 set(EXTERN_GSLIB_GIT_TAG
-  "39d1baae8f4bfebe3ebca6a234dcc8ba1ee5edc7" CACHE STRING
+  "dbab7c6f14ec4b3f9a6f93b25fd72a6be0651f34" CACHE STRING
   "Git tag for external GSLIB build"
 )
 
@@ -62,7 +62,7 @@ set(EXTERN_HYPRE_GIT_BRANCH
   "Git branch for external HYPRE build"
 )
 set(EXTERN_HYPRE_GIT_TAG
-  "7e7fc8ce09153c60ae538a52a5f870f93b9608ca" CACHE STRING
+  "0dcae3ec7c069785ea25d25aa0bc0c7aa8b0be8d" CACHE STRING
   "Git tag for external HYPRE build"
 )
 
@@ -76,7 +76,7 @@ set(EXTERN_LIBCEED_GIT_BRANCH
   "Git branch for external libCEED build"
 )
 set(EXTERN_LIBCEED_GIT_TAG
-  "6369695485491921548f67f12c0964be42533636" CACHE STRING  # main @ 03/21/2024
+  "1809c5f74680557a641e900d791842bafdfb4e8b" CACHE STRING
   "Git tag for external libCEED build"
 )
 
@@ -90,7 +90,7 @@ set(EXTERN_LIBXSMM_GIT_BRANCH
   "Git branch for external LIBXSMM build"
 )
 set(EXTERN_LIBXSMM_GIT_TAG
-  "13df674c4b73a1b84f6456de8595903ebfbb43e0" CACHE STRING
+  "feacc5e2112af47a0f4669e4ba20f0d01c08f944" CACHE STRING
   "Git tag for external LIBXSMM build"
 )
 
@@ -104,7 +104,7 @@ set(EXTERN_MAGMA_GIT_BRANCH
   "Git branch for external MAGMA build"
 )
 set(EXTERN_MAGMA_GIT_TAG
-  "1628609ab4a8421bd50bafb33cabf49001c1c97b" CACHE STRING
+  "e20a6748d9e7067c0946036b9c6d5caa022051db" CACHE STRING
   "Git tag for external MAGMA build"
 )
 
@@ -118,7 +118,7 @@ set(EXTERN_METIS_GIT_BRANCH
   "Git branch for external METIS build"
 )
 set(EXTERN_METIS_GIT_TAG
-  "8b194fdf09661ac41b36fa16db0474d38f46f1ac" CACHE STRING
+  "69fb26dd042836aa16f26fb939b540c5ca71133d" CACHE STRING
   "Git tag for external METIS build"
 )
 
@@ -132,7 +132,7 @@ set(EXTERN_MFEM_GIT_BRANCH
   "Git branch for external MFEM build"
 )
 set(EXTERN_MFEM_GIT_TAG
-  "db77249ac0f22e277081d43a5db6c3601e9e2830" CACHE STRING  # master @ 02/13/2024
+  "7c296d00d8a770e9f569e4db9d7e6d415902a886" CACHE STRING  # master @ 05/09/2024
   "Git tag for external MFEM build"
 )
 
@@ -146,7 +146,7 @@ set(EXTERN_MUMPS_GIT_BRANCH
   "Git branch for external MUMPS build"
 )
 set(EXTERN_MUMPS_GIT_TAG
-  "888feec5482665dc7f334e9d08cc45e98128340c" CACHE STRING
+  "cbdf7fc5d5bd5471a55459e92fc8b5fd1f16f651" CACHE STRING
   "Git tag for external MUMPS build"
 )
 
@@ -174,7 +174,7 @@ set(EXTERN_PETSC_GIT_BRANCH
   "Git branch for external PETSc build"
 )
 set(EXTERN_PETSC_GIT_TAG
-  "d1841210cfd64925ca30ed94c24c0bbb5cdc9142" CACHE STRING
+  "3d77ad52841f320b3f6ad02ce14f35e73e722480" CACHE STRING
   "Git tag for external PETSc build"
 )
 
@@ -188,7 +188,7 @@ set(EXTERN_SCALAPACK_GIT_BRANCH
   "Git branch for external ScaLAPACK build"
 )
 set(EXTERN_SCALAPACK_GIT_TAG
-  "8435bf3bc435d9611d096abab46ebf6beb1d35ea" CACHE STRING
+  "0234af94c6578c53ac4c19f2925eb6e5c4ad6f0f" CACHE STRING
   "Git tag for external ScaLAPACK build"
 )
 
@@ -202,7 +202,7 @@ set(EXTERN_SLEPC_GIT_BRANCH
   "Git branch for external SLEPc build"
 )
 set(EXTERN_SLEPC_GIT_TAG
-  "7980363cc28f3ee28098ac846022f6cc6d867aa6" CACHE STRING
+  "1b1a6e4c08bfc150112594b09cc439adf16f4899" CACHE STRING
   "Git tag for external SLEPc build"
 )
 
@@ -216,7 +216,7 @@ set(EXTERN_STRUMPACK_GIT_BRANCH
   "Git branch for external STRUMPACK build"
 )
 set(EXTERN_STRUMPACK_GIT_TAG
-  "3462e8cbc6e57d0c3934492abbcc69ee7edb9457" CACHE STRING
+  "c318456692bf25ff2781c48fc89297a7c7ff6c3d" CACHE STRING
   "Git tag for external STRUMPACK build"
 )
 
@@ -230,7 +230,7 @@ set(EXTERN_SUPERLU_GIT_BRANCH
   "Git branch for external SuperLU_DIST build"
 )
 set(EXTERN_SUPERLU_GIT_TAG
-  "67575a491de06e81a98c804929c8f0de40ee5990" CACHE STRING
+  "c6896d85b22384880db409ba042a03966530678e" CACHE STRING
   "Git tag for external SuperLU_DIST build"
 )
 
@@ -244,7 +244,7 @@ set(EXTERN_ZFP_GIT_BRANCH
   "Git branch for external ZFP build"
 )
 set(EXTERN_ZFP_GIT_TAG
-  "6d2b93cf0fda729903fa4b95d4b8580f8f86950f" CACHE STRING
+  "6814a4ebbbee6002f1d7f39a0acc9e8429545bce" CACHE STRING
   "Git tag for external ZFP build"
 )
 
@@ -256,7 +256,7 @@ set(EXTERN_JSON_URL
 
 # fmt
 set(EXTERN_FMT_URL
-  "https://github.com/fmtlib/fmt/releases/download/10.2.0/fmt-10.2.0.zip" CACHE STRING
+  "https://github.com/fmtlib/fmt/releases/download/10.2.1/fmt-10.2.1.zip" CACHE STRING
   "URL for external fmt build"
 )
 

diff --git a/cmake/ExternalLibCEED.cmake b/cmake/ExternalLibCEED.cmake
@@ -121,11 +121,6 @@ endif()
 string(REPLACE ";" "; " LIBCEED_OPTIONS_PRINT "${LIBCEED_OPTIONS}")
 message(STATUS "LIBCEED_OPTIONS: ${LIBCEED_OPTIONS_PRINT}")
 
-# Patch for LIBXSMM pre-v2
-set(LIBCEED_PATCH_FILES
-  "${CMAKE_SOURCE_DIR}/extern/patch/libCEED/patch_xsmm.diff"
-)
-
 include(ExternalProject)
 ExternalProject_Add(libCEED
   DEPENDS           ${LIBCEED_DEPENDENCIES}
@@ -136,7 +131,6 @@ ExternalProject_Add(libCEED
   PREFIX            ${CMAKE_BINARY_DIR}/extern/libCEED-cmake
   BUILD_IN_SOURCE   TRUE
   UPDATE_COMMAND    ""
-  PATCH_COMMAND     git apply "${LIBCEED_PATCH_FILES}"
   CONFIGURE_COMMAND ""
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} ${LIBCEED_OPTIONS} install

diff --git a/cmake/ExternalMFEM.cmake b/cmake/ExternalMFEM.cmake
@@ -360,12 +360,11 @@ message(STATUS "MFEM_OPTIONS: ${MFEM_OPTIONS_PRINT}")
 set(MFEM_PATCH_FILES
   "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mfem_device_fixes.diff"
   "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mesh_vis_dev.diff"
-  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mesh_partitioner_dev.diff"
-  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_par_tet_mesh_fix.diff"
   "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mesh_prism_vtu_fix.diff"
-  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_workspace_vectors.diff"
-  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_hypre_runtime_compute_policy.diff"
-  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_nc_internal_project.diff"
+  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mesh_part_const.diff"
+  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_par_tet_mesh_fix_dev.diff"
+  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_gmsh_parser_performance.diff"
+  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_nc_internal_bdr_project_fix.diff"
 )
 
 include(ExternalProject)

diff --git a/cmake/ExternalMUMPS.cmake b/cmake/ExternalMUMPS.cmake
@@ -21,6 +21,7 @@ list(APPEND MUMPS_OPTIONS
   "-DBUILD_DOUBLE=ON"
   "-DBUILD_COMPLEX=OFF"
   "-DBUILD_COMPLEX16=OFF"
+  "-DMUMPS_BUILD_TESTING=OFF"
   "-Dmetis=ON"
   "-Dparmetis=ON"
   "-Dscotch=OFF"

diff --git a/cmake/ExternalSTRUMPACK.cmake b/cmake/ExternalSTRUMPACK.cmake
@@ -145,7 +145,6 @@ list(APPEND STRUMPACK_OPTIONS
   "-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}"
   "-DCMAKE_Fortran_FLAGS=${CMAKE_Fortran_FLAGS}"
   "-DSTRUMPACK_USE_MPI=ON"
-  "-DSTRUMPACK_USE_OPENMP=${PALACE_WITH_OPENMP}"
   "-DTPL_ENABLE_PARMETIS=ON"
   "-DTPL_METIS_LIBRARIES=${METIS_LIBRARIES}"
   "-DTPL_METIS_INCLUDE_DIRS=${CMAKE_INSTALL_PREFIX}/include"
@@ -178,6 +177,17 @@ else()
   )
 endif()
 
+# Always disable OpenMP (seems slower in all cases, just link to threaded BLAS/LAPACK)
+# if(PALACE_WITH_OPENMP)
+#   list(APPEND STRUMPACK_OPTIONS
+#     "-DSTRUMPACK_USE_OPENMP=ON"
+#   )
+# else()
+  list(APPEND STRUMPACK_OPTIONS
+    "-DSTRUMPACK_USE_OPENMP=OFF"
+  )
+# endif()
+
 # Configure BLAS/LAPACK
 if(NOT "${BLAS_LAPACK_LIBRARIES}" STREQUAL "")
   list(APPEND STRUMPACK_OPTIONS

diff --git a/cmake/ExternalSuperLU_DIST.cmake b/cmake/ExternalSuperLU_DIST.cmake
@@ -20,13 +20,23 @@ list(APPEND SUPERLU_OPTIONS
   "-Denable_double=ON"
   "-Denable_single=ON"
   "-Denable_complex16=ON"
-  "-Denable_openmp=${PALACE_WITH_OPENMP}"
   "-DTPL_ENABLE_PARMETISLIB=ON"
   "-DTPL_PARMETIS_LIBRARIES=${PARMETIS_LIBRARIES}$<SEMICOLON>${METIS_LIBRARIES}"
   "-DTPL_PARMETIS_INCLUDE_DIRS=${CMAKE_INSTALL_PREFIX}/include"
   "-DTPL_ENABLE_COMBBLASLIB=OFF"
 )
 
+# Always disable OpenMP (seems slower in all cases, just link to threaded BLAS/LAPACK)
+# if(PALACE_WITH_OPENMP)
+#   list(APPEND SUPERLU_OPTIONS
+#     "-Denable_openmp=ON"
+#   )
+# else()
+  list(APPEND SUPERLU_OPTIONS
+    "-Denable_openmp=OFF"
+  )
+# endif()
+
 # SuperLU_DIST has a BUILD_STATIC_LIBS option which defaults to ON
 if(BUILD_SHARED_LIBS)
   list(APPEND SUPERLU_OPTIONS
@@ -95,7 +105,6 @@ message(STATUS "SUPERLU_OPTIONS: ${SUPERLU_OPTIONS_PRINT}")
 
 # Fix column permutations
 set(SUPERLU_PATCH_FILES
-  "${CMAKE_SOURCE_DIR}/extern/patch/superlu_dist/patch_metis.diff"
   "${CMAKE_SOURCE_DIR}/extern/patch/superlu_dist/patch_parmetis.diff"
 )