Skip to content

Commit 0f1f6ae

Browse files
hughcarshughcars
committed
Update dependencies
1 parent a8303f7 commit 0f1f6ae

13 files changed

+199
-156
lines changed

‎cmake/ExternalGitTags.cmake

+12-12
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ set(EXTERN_HYPRE_GIT_BRANCH
6262
"Git branch for external HYPRE build"
6363
)
6464
set(EXTERN_HYPRE_GIT_TAG
65-
"e5f4984ea0cceb897d3d29516988f38996d7d07d" CACHE STRING
65+
"19ecc97885938dabc20d049759aad0309fa5ff2e" CACHE STRING
6666
"Git tag for external HYPRE build"
6767
)
6868

@@ -76,7 +76,7 @@ set(EXTERN_LIBCEED_GIT_BRANCH
7676
"Git branch for external libCEED build"
7777
)
7878
set(EXTERN_LIBCEED_GIT_TAG
79-
"5a7f61ca9ae98f99006c9d3babed48bcc256dfea" CACHE STRING
79+
"6b50d2be0e7f583c08aab912c64a7bf4147ef2ad" CACHE STRING
8080
"Git tag for external libCEED build"
8181
)
8282

@@ -90,7 +90,7 @@ set(EXTERN_LIBXSMM_GIT_BRANCH
9090
"Git branch for external LIBXSMM build"
9191
)
9292
set(EXTERN_LIBXSMM_GIT_TAG
93-
"b4514e4c52b6c735c30700992b1966e7c9dcdcae" CACHE STRING
93+
"6ea2c101ee6774a240ae6b4fcd8728d4a608e3cc" CACHE STRING
9494
"Git tag for external LIBXSMM build"
9595
)
9696

@@ -104,7 +104,7 @@ set(EXTERN_MAGMA_GIT_BRANCH
104104
"Git branch for external MAGMA build"
105105
)
106106
set(EXTERN_MAGMA_GIT_TAG
107-
"95903129f839bb401d9d9c53bd3d8e1b5e14c238" CACHE STRING
107+
"48a32d79517cc6f1522aa190cdec4b1d1babcf53" CACHE STRING
108108
"Git tag for external MAGMA build"
109109
)
110110

@@ -132,7 +132,7 @@ set(EXTERN_MFEM_GIT_BRANCH
132132
"Git branch for external MFEM build"
133133
)
134134
set(EXTERN_MFEM_GIT_TAG
135-
"e2a20d381c3e180d77cd2ad32df30580f42c261b" CACHE STRING
135+
"c87ded944ff903f7ebcb0511c86883a989a18bb0" CACHE STRING
136136
"Git tag for external MFEM build"
137137
)
138138

@@ -146,7 +146,7 @@ set(EXTERN_MUMPS_GIT_BRANCH
146146
"Git branch for external MUMPS build"
147147
)
148148
set(EXTERN_MUMPS_GIT_TAG
149-
"0f50568b2fbd88413774d2ce1c88ab3851b24abe" CACHE STRING
149+
"87a9700ca0c55052fc90b58a0d05d2df3ef02b10" CACHE STRING
150150
"Git tag for external MUMPS build"
151151
)
152152

@@ -174,7 +174,7 @@ set(EXTERN_PETSC_GIT_BRANCH
174174
"Git branch for external PETSc build"
175175
)
176176
set(EXTERN_PETSC_GIT_TAG
177-
"ba43b2edcffc84c955e282b517bbd116334b0005" CACHE STRING
177+
"93392d187e13c9ce8919ac8e80e98f7168db66e1" CACHE STRING
178178
"Git tag for external PETSc build"
179179
)
180180

@@ -188,7 +188,7 @@ set(EXTERN_SCALAPACK_GIT_BRANCH
188188
"Git branch for external ScaLAPACK build"
189189
)
190190
set(EXTERN_SCALAPACK_GIT_TAG
191-
"25935e1a7e022ede9fd71bd86dcbaa7a3f1846b7" CACHE STRING
191+
"a23c2cdc6586c427686f6097ae66bb54ef693571" CACHE STRING
192192
"Git tag for external ScaLAPACK build"
193193
)
194194

@@ -202,7 +202,7 @@ set(EXTERN_SLEPC_GIT_BRANCH
202202
"Git branch for external SLEPc build"
203203
)
204204
set(EXTERN_SLEPC_GIT_TAG
205-
"616e8b6ac8dbb41a1dc314e5c099b8af246c688d" CACHE STRING
205+
"a4e1bb593f369cb8a2f4b846fda09e539b0547b5" CACHE STRING
206206
"Git tag for external SLEPc build"
207207
)
208208

@@ -230,7 +230,7 @@ set(EXTERN_SUPERLU_GIT_BRANCH
230230
"Git branch for external SuperLU_DIST build"
231231
)
232232
set(EXTERN_SUPERLU_GIT_TAG
233-
"fe0e4e8968c58309fd75b4d6999580c44fffc26d" CACHE STRING
233+
"d2f0f1e11a4b41c6bb8a1b80554e2339e76c9e8b" CACHE STRING
234234
"Git tag for external SuperLU_DIST build"
235235
)
236236

@@ -244,7 +244,7 @@ set(EXTERN_ZFP_GIT_BRANCH
244244
"Git branch for external ZFP build"
245245
)
246246
set(EXTERN_ZFP_GIT_TAG
247-
"71490d236e29af2968dc9e11f14cb46af37f1dd3" CACHE STRING
247+
"8fe0059a33e298081409a520c254ebe1836bc20a" CACHE STRING
248248
"Git tag for external ZFP build"
249249
)
250250

@@ -276,6 +276,6 @@ set(EXTERN_SUNDIALS_GIT_BRANCH
276276
"Git branch for external SUNDIALS build"
277277
)
278278
set(EXTERN_SUNDIALS_GIT_TAG
279-
"0eff39663606f2ff280c4059a947ed62ae38180a" CACHE STRING
279+
"5c53be85c88f63c5201c130b8cb2c686615cfb03" CACHE STRING
280280
"Git tag for external SUNDIALS build"
281281
)

‎cmake/ExternalMETIS.cmake

+15-14
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,8 @@ ExternalProject_Add(metis
7373
TEST_COMMAND ""
7474
)
7575

76-
# Save variables to cache
77-
if(BUILD_SHARED_LIBS)
78-
set(_METIS_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
79-
else()
80-
set(_METIS_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
81-
endif()
82-
set(METIS_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libmetis${_METIS_LIB_SUFFIX} CACHE STRING
83-
"List of library files for METIS"
84-
)
85-
8676
# Build ParMETIS (as needed)
87-
if(PALACE_WITH_SUPERLU OR PALACE_WITH_STRUMPACK OR PALACE_WITH_MUMPS)
77+
if(PALACE_WITH_SUPERLU OR PALACE_WITH_STRUMPACK)
8878
set(PARMETIS_OPTIONS ${PALACE_SUPERBUILD_DEFAULT_ARGS})
8979
list(APPEND PARMETIS_OPTIONS
9080
"-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
@@ -138,8 +128,19 @@ if(PALACE_WITH_SUPERLU OR PALACE_WITH_STRUMPACK OR PALACE_WITH_MUMPS)
138128
CONFIGURE_COMMAND ${CMAKE_COMMAND} <SOURCE_DIR> "${PARMETIS_OPTIONS}"
139129
TEST_COMMAND ""
140130
)
141-
set(PARMETIS_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libparmetis${_METIS_LIB_SUFFIX} CACHE STRING
142-
"List of library files for ParMETIS"
143-
)
144131
endif()
145132

133+
# Save variables to cache
134+
if(BUILD_SHARED_LIBS)
135+
set(_METIS_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
136+
else()
137+
set(_METIS_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
138+
endif()
139+
set(METIS_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libmetis${_METIS_LIB_SUFFIX} CACHE STRING
140+
"List of library files for METIS"
141+
)
142+
if(PALACE_WITH_SUPERLU OR PALACE_WITH_STRUMPACK)
143+
set(PARMETIS_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libparmetis${_METIS_LIB_SUFFIX} CACHE STRING
144+
"List of library files for ParMETIS"
145+
)
146+
endif()

‎cmake/ExternalMFEM.cmake

+2-3
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ if(PALACE_BUILD_EXTERNAL_DEPS)
161161
"-DHYPRE_DIR=${CMAKE_INSTALL_PREFIX}"
162162
"-DHYPRE_REQUIRED_PACKAGES=LAPACK$<SEMICOLON>BLAS"
163163
)
164-
if(PALACE_WITH_SUPERLU OR PALACE_WITH_STRUMPACK OR PALACE_WITH_MUMPS)
164+
if(PALACE_WITH_SUPERLU OR PALACE_WITH_STRUMPACK)
165165
list(APPEND MFEM_OPTIONS
166166
"-DParMETIS_LIBRARIES=${PARMETIS_LIBRARIES}$<SEMICOLON>${METIS_LIBRARIES}"
167167
"-DParMETIS_INCLUDE_DIRS=${CMAKE_INSTALL_PREFIX}/include"
@@ -290,7 +290,7 @@ Intel C++ compiler for MUMPS and STRUMPACK dependencies")
290290

291291
# Configure MUMPS
292292
if(PALACE_WITH_MUMPS)
293-
set(MUMPS_REQUIRED_PACKAGES "ParMETIS" "METIS" "LAPACK" "BLAS" "MPI" "MPI_Fortran" "Threads")
293+
set(MUMPS_REQUIRED_PACKAGES "METIS" "LAPACK" "BLAS" "MPI" "MPI_Fortran" "Threads")
294294
if(PALACE_WITH_OPENMP)
295295
list(APPEND MUMPS_REQUIRED_PACKAGES "OpenMP")
296296
endif()
@@ -388,7 +388,6 @@ set(MFEM_PATCH_FILES
388388
"${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mesh_prism_vtu_fix.diff"
389389
"${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_par_tet_mesh_fix_dev.diff"
390390
"${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_gmsh_parser_performance.diff"
391-
"${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_gmsh_reader_periodic_bugfix.diff"
392391
)
393392

394393
include(ExternalProject)

‎cmake/ExternalMUMPS.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77

88
# Force build order
9-
set(MUMPS_DEPENDENCIES scalapack parmetis metis)
9+
set(MUMPS_DEPENDENCIES scalapack parmetis)
1010

1111
set(MUMPS_OPTIONS ${PALACE_SUPERBUILD_DEFAULT_ARGS})
1212
list(APPEND MUMPS_OPTIONS
@@ -25,7 +25,6 @@ list(APPEND MUMPS_OPTIONS
2525
"-Dmetis=ON"
2626
"-Dparmetis=ON"
2727
"-Dscotch=OFF"
28-
"-Dscalapack=ON"
2928
"-DPARMETIS_LIBRARY=${PARMETIS_LIBRARIES}"
3029
"-DMETIS_LIBRARY=${METIS_LIBRARIES}"
3130
"-DMETIS_INCLUDE_DIR=${CMAKE_INSTALL_PREFIX}/include"

‎cmake/ExternalSuperLU_DIST.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ list(APPEND SUPERLU_OPTIONS
2020
"-Denable_double=ON"
2121
"-Denable_single=ON"
2222
"-Denable_complex16=ON"
23+
"-Denable_python=OFF"
2324
"-DTPL_ENABLE_PARMETISLIB=ON"
2425
"-DTPL_PARMETIS_LIBRARIES=${PARMETIS_LIBRARIES}$<SEMICOLON>${METIS_LIBRARIES}"
2526
"-DTPL_PARMETIS_INCLUDE_DIRS=${CMAKE_INSTALL_PREFIX}/include"

‎extern/patch/mfem/patch_gmsh_parser_performance.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/mesh/mesh_readers.cpp b/mesh/mesh_readers.cpp
2-
index d21bc481e..62bd0b8d8 100644
2+
index c553db2c6..20726d81a 100644
33
--- a/mesh/mesh_readers.cpp
44
+++ b/mesh/mesh_readers.cpp
55
@@ -1549,7 +1549,7 @@ void Mesh::ReadGmshMesh(std::istream &input, int &curved, int &read_gf)

‎extern/patch/mfem/patch_mesh_prism_vtu_fix.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/mesh/mesh.cpp b/mesh/mesh.cpp
2-
index c852cb52e..5270e8c71 100644
2+
index 61b7c75d3..f35b51504 100644
33
--- a/mesh/mesh.cpp
44
+++ b/mesh/mesh.cpp
5-
@@ -11908,7 +11908,7 @@ void Mesh::PrintVTU(std::ostream &os, int ref, VTKFormat format,
5+
@@ -12122,7 +12122,7 @@ void Mesh::PrintVTU(std::ostream &os, int ref, VTKFormat format,
66
const int *p = VTKGeometry::VertexPermutation[geom];
77
for (int k = 0; k < nv; k++, j++)
88
{

‎extern/patch/mfem/patch_mesh_vis_dev.diff

+8-8
Original file line numberDiff line numberDiff line change
@@ -470,10 +470,10 @@ index e4d41a1b6..5306c94f7 100644
470470
/// preserve timestep metadata for any solutions prior to the currently
471471
/// defined time.
472472
diff --git a/mesh/mesh.cpp b/mesh/mesh.cpp
473-
index 1a0e82e87..c852cb52e 100644
473+
index c06994ced..61b7c75d3 100644
474474
--- a/mesh/mesh.cpp
475475
+++ b/mesh/mesh.cpp
476-
@@ -11759,7 +11759,7 @@ void Mesh::PrintVTU(std::string fname,
476+
@@ -11973,7 +11973,7 @@ void Mesh::PrintVTU(std::string fname,
477477
VTKFormat format,
478478
bool high_order_output,
479479
int compression_level,
@@ -482,7 +482,7 @@ index 1a0e82e87..c852cb52e 100644
482482
{
483483
int ref = (high_order_output && Nodes)
484484
? Nodes->FESpace()->GetMaxElementOrder() : 1;
485-
@@ -11773,7 +11773,7 @@ void Mesh::PrintVTU(std::string fname,
485+
@@ -11987,7 +11987,7 @@ void Mesh::PrintVTU(std::string fname,
486486
}
487487
os << " byte_order=\"" << VTKByteOrder() << "\">\n";
488488
os << "<UnstructuredGrid>\n";
@@ -492,10 +492,10 @@ index 1a0e82e87..c852cb52e 100644
492492
os << "</UnstructuredGrid>\n";
493493
os << "</VTKFile>" << std::endl;
494494
diff --git a/mesh/mesh.hpp b/mesh/mesh.hpp
495-
index 7187fe11a..bcde8a6d9 100644
495+
index 3062a5a67..f302724b5 100644
496496
--- a/mesh/mesh.hpp
497497
+++ b/mesh/mesh.hpp
498-
@@ -2389,7 +2389,7 @@ public:
498+
@@ -2466,7 +2466,7 @@ public:
499499
VTKFormat format=VTKFormat::ASCII,
500500
bool high_order_output=false,
501501
int compression_level=0,
@@ -505,7 +505,7 @@ index 7187fe11a..bcde8a6d9 100644
505505
boundary attributes as a data array (useful for boundary conditions). */
506506
void PrintBdrVTU(std::string fname,
507507
diff --git a/mesh/pmesh.cpp b/mesh/pmesh.cpp
508-
index 5f5d9d38d..9556bcbd2 100644
508+
index 600ba485a..8770ed7c7 100644
509509
--- a/mesh/pmesh.cpp
510510
+++ b/mesh/pmesh.cpp
511511
@@ -6398,7 +6398,7 @@ void ParMesh::PrintVTU(std::string pathname,
@@ -528,10 +528,10 @@ index 5f5d9d38d..9556bcbd2 100644
528528

529529
int ParMesh::FindPoints(DenseMatrix& point_mat, Array<int>& elem_id,
530530
diff --git a/mesh/pmesh.hpp b/mesh/pmesh.hpp
531-
index 53f7c23a2..0d5643fd5 100644
531+
index 3f052fa84..bdca0d816 100644
532532
--- a/mesh/pmesh.hpp
533533
+++ b/mesh/pmesh.hpp
534-
@@ -756,7 +756,7 @@ public:
534+
@@ -786,7 +786,7 @@ public:
535535
VTKFormat format=VTKFormat::ASCII,
536536
bool high_order_output=false,
537537
int compression_level=0,

‎extern/patch/mfem/patch_mfem_device_fixes.diff

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/general/device.cpp b/general/device.cpp
2-
index 3ed11e916..2580f9308 100644
2+
index e8e822f76..75ceb7891 100644
33
--- a/general/device.cpp
44
+++ b/general/device.cpp
55
@@ -9,6 +9,7 @@
@@ -177,7 +177,7 @@ index 3ed11e916..2580f9308 100644
177177
{
178178
MFEM_VERIFY(ngpu == -1, "the mfem::Device is already configured!");
179179

180-
@@ -546,54 +539,41 @@ void Device::Setup(const int device_id)
180+
@@ -546,51 +539,38 @@ void Device::Setup(const int device_id)
181181
#ifndef MFEM_USE_CEED
182182
MFEM_VERIFY(!Allows(Backend::CEED_MASK),
183183
"the CEED backends require MFEM built with MFEM_USE_CEED=YES");
@@ -250,12 +250,14 @@ index 3ed11e916..2580f9308 100644
250250
}
251251
}
252252
if (Allows(Backend::DEBUG_DEVICE)) { ngpu = 1; }
253+
@@ -749,4 +729,4 @@ int Device::WarpSize()
254+
return WarpSize(dev);
253255
}
254256

255257
-} // mfem
256258
+} // namespace mfem
257259
diff --git a/general/device.hpp b/general/device.hpp
258-
index 43d1d49c8..463b1bb50 100644
260+
index c54ac2632..1b7509be8 100644
259261
--- a/general/device.hpp
260262
+++ b/general/device.hpp
261263
@@ -16,6 +16,8 @@
@@ -400,9 +402,9 @@ index 43d1d49c8..463b1bb50 100644
400402

401403
+ /// Get the status of GPU-aware MPI flag.
402404
static bool GetGPUAwareMPI() { return Get().mpi_gpu_aware; }
403-
};
404405

405-
@@ -299,7 +302,7 @@ public:
406+
/** Query the device driver for what memory type a given @a ptr is allocated
407+
@@ -320,7 +323,7 @@ public:
406408
and ReadWrite(), while setting the device use flag in @a mem, if @a on_dev
407409
is true. */
408410
template <typename T>
@@ -411,7 +413,7 @@ index 43d1d49c8..463b1bb50 100644
411413
{
412414
if (!on_dev)
413415
{
414-
@@ -363,6 +366,6 @@ inline T *HostReadWrite(Memory<T> &mem, int size)
416+
@@ -384,6 +387,6 @@ inline T *HostReadWrite(Memory<T> &mem, int size)
415417
return mfem::ReadWrite(mem, size, false);
416418
}
417419

0 commit comments

Comments
 (0)