From 41507d804c7a61e2c9a1d9008f41cf4a61e0794e Mon Sep 17 00:00:00 2001 From: Julien Fausty Date: Fri, 13 Jan 2023 18:31:35 +0100 Subject: [PATCH 01/13] Catalyst: add catalyst and adios --- CMakeLists.txt | 96 ++++++++++++++++++++- cmake/blt | 2 +- tplMirror/ADIOS2-2.9.0.zip | 3 + tplMirror/VTK-9.2.6.tar.gz | 3 - tplMirror/adioscatalyst-124a42d13c.tar.gz | 3 + tplMirror/adioscatalyst-cmake-version.patch | 10 +++ tplMirror/caliper-uint.patch | 12 +++ tplMirror/catalyst-74275110.tar.gz | 3 + tplMirror/chai-stdexcept.patch | 12 +++ tplMirror/vtkXMLReader-fpe.patch | 19 ---- 10 files changed, 139 insertions(+), 24 deletions(-) create mode 100644 tplMirror/ADIOS2-2.9.0.zip delete mode 100644 tplMirror/VTK-9.2.6.tar.gz create mode 100644 tplMirror/adioscatalyst-124a42d13c.tar.gz create mode 100644 tplMirror/adioscatalyst-cmake-version.patch create mode 100644 tplMirror/caliper-uint.patch create mode 100644 tplMirror/catalyst-74275110.tar.gz create mode 100644 tplMirror/chai-stdexcept.patch delete mode 100644 tplMirror/vtkXMLReader-fpe.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index ae4d15f6..49376b82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ option( ENABLE_SCOTCH "" ON ) option( ENABLE_SUITESPARSE "" ON ) option( ENABLE_VTK "" ON ) option( ENABLE_VTK_WRAP_PYTHON "" OFF ) +option( ENABLE_CATALYST "Enable building catalyst2" ON) option( ENABLE_FESAPI "" ON ) option( ENABLE_NINJA "" OFF ) @@ -359,6 +360,9 @@ ExternalProject_Add( chai DEPENDS raja BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND ${TPL_INSTALL_COMMAND} + PATCH_COMMAND patch + src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp + < ${TPL_MIRROR_DIR}/chai-stdexcept.patch CMAKE_GENERATOR ${TPL_GENERATOR} CMAKE_ARGS -D CMAKE_C_COMPILER=${CMAKE_C_COMPILER} -D CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} @@ -438,6 +442,7 @@ if (ENABLE_CALIPER) INSTALL_DIR ${CALIPER_DIR} BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND ${TPL_INSTALL_COMMAND} + PATCH_COMMAND patch src/mpi/mpi_machine.cpp < ${TPL_MIRROR_DIR}/caliper-uint.patch CMAKE_GENERATOR ${TPL_GENERATOR} DEPENDS adiak CMAKE_ARGS -D CMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER} @@ -1078,7 +1083,7 @@ endif() ################################ if( ENABLE_VTK ) set( VTK_DIR "${CMAKE_INSTALL_PREFIX}/vtk" ) - set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.2.6.tar.gz" ) + set( VTK_URL "${TPL_MIRROR_DIR}/VTK-59d89108f4.tar.gz" ) message( STATUS "Building VTK found at ${VTK_URL}" ) @@ -1109,6 +1114,7 @@ endif( ENABLE_MPI ) PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/vtkXMLReader-fpe.patch BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND "${TPL_INSTALL_COMMAND}" + PATCH_COMMAND patch -p1 < ${TPL_MIRROR_DIR}/VTK-ABI.patch CMAKE_GENERATOR ${TPL_GENERATOR} CMAKE_ARGS -D CMAKE_C_COMPILER=${VTK_C_COMPILER} -D CMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} @@ -1139,6 +1145,94 @@ endif( ENABLE_MPI ) list( APPEND build_list vtk ) endif( ENABLE_VTK ) +################################ +# Catalyst +################################ + +if (ENABLE_CATALYST) + + # Catalyst supports different implementations of its interface + set( CATALYST_IMPLEMENTATION_NAME "ADIOS2" CACHE STRING "The name of the catalyst implementation you would like to use") + + # Set the type of implementations that GEOSX-TPL provides as options here + set_property(CACHE CATALYST_IMPLEMENTATION_NAME PROPERTY STRINGS ADIOS2) + + + message(STATUS "Catalyst implementation: " ${CATALYST_IMPLEMENTATION_NAME}) + if (NOT CATALYST_IMPLEMENTATION_NAME STREQUAL "ADIOS2") + message(FATAL_ERROR "TPL only provides catalyst-adios2 implementation for now") + endif () + + if (NOT ENABLE_MPI) + message (FATAL_ERROR "ADIOS2 requires MPI in its build") + endif () + + set(ADIOS_DIR "${CMAKE_INSTALL_PREFIX}/adios") + set(ADIOS_URL "${TPL_MIRROR_DIR}/ADIOS2-2.9.0.zip") + + ExternalProject_Add( adios + URL ${ADIOS_URL} + PREFIX ${PROJECT_BINARY_DIR}/adios + INSTALL_DIR ${ADIOS_DIR} + BUILD_COMMAND ${TPL_BUILD_COMMAND} + INSTALL_COMMAND ${TPL_INSTALL_COMMAND} + CMAKE_GENERATOR ${TPL_GENERATOR} + CMAKE_ARGS -DCMAKE_C_COMPILER=${MPI_C_COMPILER} + -DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER} + -DCMAKE_INSTALL_PREFIX= + -DCMAKE_CXX_STANDARD=11 + -DNoGitVersionString:BOOL=ON + ) + + set(CATALYST_DIR "${CMAKE_INSTALL_PREFIX}/catalyst") + set(CATALYST_URL "${TPL_MIRROR_DIR}/catalyst-74275110.tar.gz") + + ExternalProject_Add( catalyst + URL ${CATALYST_URL} + PREFIX ${PROJECT_BINARY_DIR}/catalyst + INSTALL_DIR ${CATALYST_DIR} + BUILD_COMMAND ${TPL_BUILD_COMMAND} + INSTALL_COMMAND ${TPL_INSTALL_COMMAND} + CMAKE_GENERATOR ${TPL_GENERATOR} + CMAKE_ARGS -DCMAKE_C_COMPILER=${MPI_C_COMPILER} + -DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER} + -DCMAKE_INSTALL_PREFIX= + -DCMAKE_CXX_STANDARD=11 + -DNoGitVersionString:BOOL=ON + ) + + + set(CATALYST_IMPLEMENTATION_DIR "${CMAKE_INSTALL_PREFIX}/catalyst_implementation") + set(CATALYST_IMPLEMENTATION_URL "${TPL_MIRROR_DIR}/adioscatalyst-124a42d13c.tar.gz") + + set(ADIOS_CMAKE_PREFIX ${ADIOS_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/adios2/) + + set(CATALYST_CMAKE_PREFIX ${CATALYST_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/catalyst-2.0/) + + ExternalProject_Add( catalyst_implementation + URL ${CATALYST_IMPLEMENTATION_URL} + PREFIX ${PROJECT_BINARY_DIR}/catalyst_implementation + INSTALL_DIR ${CATALYST_IMPLEMENTATION_DIR} + PATCH_COMMAND patch CMakeLists.txt < ${TPL_MIRROR_DIR}/adioscatalyst-cmake-version.patch + BUILD_COMMAND ${TPL_BUILD_COMMAND} + INSTALL_COMMAND ${TPL_INSTALL_COMMAND} + DEPENDS adios catalyst + CMAKE_GENERATOR ${TPL_GENERATOR} + CMAKE_ARGS -DCMAKE_C_COMPILER=${MPI_C_COMPILER} + -DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER} + -DCMAKE_INSTALL_PREFIX= + -DCMAKE_CXX_STANDARD=11 + -DADIOS2_DIR=${ADIOS_CMAKE_PREFIX} + -Dcatalyst_DIR=${CATALYST_CMAKE_PREFIX} + -DNoGitVersionString:BOOL=ON + ) + + + + list(APPEND build_list adios catalyst catalyst_implementation) + +endif (ENABLE_CATALYST) + ################################ # FMT ################################ diff --git a/cmake/blt b/cmake/blt index 6a73c2cc..c253509a 160000 --- a/cmake/blt +++ b/cmake/blt @@ -1 +1 @@ -Subproject commit 6a73c2cc3ad8147d2686c4eaa79beb43e77e1724 +Subproject commit c253509ab2daf759eb857958597f6f34ab8c1713 diff --git a/tplMirror/ADIOS2-2.9.0.zip b/tplMirror/ADIOS2-2.9.0.zip new file mode 100644 index 00000000..3515075c --- /dev/null +++ b/tplMirror/ADIOS2-2.9.0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71b85bdc3d98b38d2bc0d5cf73d0a964979eb61df9b1255782fe5b4d33be7510 +size 8047119 diff --git a/tplMirror/VTK-9.2.6.tar.gz b/tplMirror/VTK-9.2.6.tar.gz deleted file mode 100644 index 429e5d3c..00000000 --- a/tplMirror/VTK-9.2.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12 -size 53810904 diff --git a/tplMirror/adioscatalyst-124a42d13c.tar.gz b/tplMirror/adioscatalyst-124a42d13c.tar.gz new file mode 100644 index 00000000..1651eac6 --- /dev/null +++ b/tplMirror/adioscatalyst-124a42d13c.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37a0e6480ee0364c64798fca87cde5c1b1370be1a305aed79de20e67e3e5712e +size 28508 diff --git a/tplMirror/adioscatalyst-cmake-version.patch b/tplMirror/adioscatalyst-cmake-version.patch new file mode 100644 index 00000000..f7f2854f --- /dev/null +++ b/tplMirror/adioscatalyst-cmake-version.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b2691e..58d0f82 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.20) ++cmake_minimum_required(VERSION 3.15) + + project(AdiosCatalyst LANGUAGES C CXX) + diff --git a/tplMirror/caliper-uint.patch b/tplMirror/caliper-uint.patch new file mode 100644 index 00000000..40c0ad28 --- /dev/null +++ b/tplMirror/caliper-uint.patch @@ -0,0 +1,12 @@ +diff --git a/mpi_machine.cpp b/mpi_machine_good.cpp +index c394500..38cd5fb 100644 +--- a/mpi_machine.cpp ++++ b/mpi_machine_good.cpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + + using namespace cali; + using namespace cali::mpi; diff --git a/tplMirror/catalyst-74275110.tar.gz b/tplMirror/catalyst-74275110.tar.gz new file mode 100644 index 00000000..49c4450b --- /dev/null +++ b/tplMirror/catalyst-74275110.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6a155d7285bb201fa3bfc73e6355388c4f89e2451010d7ba3cb282360e7b316 +size 825155 diff --git a/tplMirror/chai-stdexcept.patch b/tplMirror/chai-stdexcept.patch new file mode 100644 index 00000000..04ebcab7 --- /dev/null +++ b/tplMirror/chai-stdexcept.patch @@ -0,0 +1,12 @@ +diff --git a/src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp b/src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp +index 58df206..05c6031 100644 +--- a/src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp ++++ b/src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp +@@ -15,6 +15,7 @@ http://github.com/llnl/camp + #include + #include + #include ++#include + + #include "camp/helpers.hpp" + #include "camp/resource/event.hpp" diff --git a/tplMirror/vtkXMLReader-fpe.patch b/tplMirror/vtkXMLReader-fpe.patch deleted file mode 100644 index c7621502..00000000 --- a/tplMirror/vtkXMLReader-fpe.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- IO/XML/vtkXMLReader.cxx 2023-02-14 20:03:53.000000000 -0800 -+++ IO/XML/vtkXMLReader.cxx.patch 2023-05-12 08:52:36.017274000 -0700 -@@ -53,6 +53,7 @@ - #include - #include - #include -+#include - #include - #include // C++ locale - #include -@@ -1958,7 +1959,7 @@ - if (!this->AbortExecute) - { - // Round progress to nearest 100th. -- float rounded = static_cast(int((progress * 100) + 0.5f)) / 100.f; -+ float const rounded = std::round(progress * 100) * 0.01; - if (this->GetProgress() != rounded) - { - this->UpdateProgress(rounded); From da5e837315136f901c02eab889573af03ce7c94f Mon Sep 17 00:00:00 2001 From: Julien Fausty Date: Thu, 19 Jan 2023 18:57:12 +0100 Subject: [PATCH 02/13] conduit: update version 0.8.2 -> 0.8.6 --- CMakeLists.txt | 2 +- tplMirror/conduit-0.8.2.tar.gz | 3 --- tplMirror/conduit-0.8.6.zip | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 tplMirror/conduit-0.8.2.tar.gz create mode 100644 tplMirror/conduit-0.8.6.zip diff --git a/CMakeLists.txt b/CMakeLists.txt index 49376b82..1f6881a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,7 +220,7 @@ list(APPEND build_list hdf5 ) # Conduit ################################ set(CONDUIT_DIR "${CMAKE_INSTALL_PREFIX}/conduit") -set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-0.8.2.tar.gz") +set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-0.8.6.zip") message(STATUS "Building Conduit found at ${CONDUIT_URL}") if( ${ENABLE_MPI} ) diff --git a/tplMirror/conduit-0.8.2.tar.gz b/tplMirror/conduit-0.8.2.tar.gz deleted file mode 100644 index 4d6a6613..00000000 --- a/tplMirror/conduit-0.8.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f2445040f62c8249fb4e0fa236b27bc59353df623a838cf396fc906dcf80dfb -size 14702531 diff --git a/tplMirror/conduit-0.8.6.zip b/tplMirror/conduit-0.8.6.zip new file mode 100644 index 00000000..2769ef70 --- /dev/null +++ b/tplMirror/conduit-0.8.6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bec464b6b7a399fcd61c1507b151c732acfc90a33e3ad4a60b4023cc40e240c4 +size 15760628 From ff57a33dc5d5635b515ce54632e10cdd141aaf1e Mon Sep 17 00:00:00 2001 From: Charles Gueunet Date: Fri, 17 Feb 2023 13:40:50 +0100 Subject: [PATCH 03/13] VTK: update to master and add mangling Mangling VTK uses an inline namespace to change the VTK symbols in the binary so as to allow multiple VTK binaries to coexist --- CMakeLists.txt | 11 +++++- tplMirror/VTK-59d89108f4.tar.gz | 3 ++ tplMirror/VTK-ABI.patch | 65 +++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 tplMirror/VTK-59d89108f4.tar.gz create mode 100644 tplMirror/VTK-ABI.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f6881a4..d49ce4db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1085,6 +1085,7 @@ if( ENABLE_VTK ) set( VTK_DIR "${CMAKE_INSTALL_PREFIX}/vtk" ) set( VTK_URL "${TPL_MIRROR_DIR}/VTK-59d89108f4.tar.gz" ) + message( STATUS "Building VTK found at ${VTK_URL}" ) # Depending on the platfor, the install directory could be 'lib' or 'lib64'. @@ -1093,6 +1094,12 @@ if( ENABLE_VTK ) # I'm no cmake expert and I do not know if there was a better way to deal with it. set( VTK_CMAKE_INSTALL_LIBDIR "lib" ) + # This compile option will enclose all of the VTK library within a vtk_geosx namespace. + # This mangling is needed in order to ensure that the VTK included with geosx does + # not interfere with another VTK version that may be linked dynamically at runtime + # (when using ParaView's Catalyst implementation for example). + set( VTK_ABI_NAMESPACE_NAME "vtk_geosx" ) + if( ENABLE_MPI ) set( VTK_C_COMPILER ${MPI_C_COMPILER} ) set( VTK_CXX_COMPILER ${MPI_CXX_COMPILER} ) @@ -1111,7 +1118,6 @@ endif( ENABLE_MPI ) PREFIX ${PROJECT_BINARY_DIR}/vtk URL ${VTK_URL} INSTALL_DIR ${VTK_DIR} - PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/vtkXMLReader-fpe.patch BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND "${TPL_INSTALL_COMMAND}" PATCH_COMMAND patch -p1 < ${TPL_MIRROR_DIR}/VTK-ABI.patch @@ -1140,7 +1146,8 @@ endif( ENABLE_MPI ) -D VTK_MODULE_ENABLE_VTK_IOXML=YES -D VTK_MODULE_ENABLE_VTK_IOLegacy=YES -D VTK_BUILD_TESTING=OFF - -D VTK_LEGACY_REMOVE=ON ) + -D VTK_LEGACY_REMOVE=ON + -D VTK_ABI_NAMESPACE_NAME=${VTK_ABI_NAMESPACE_NAME} ) list( APPEND build_list vtk ) endif( ENABLE_VTK ) diff --git a/tplMirror/VTK-59d89108f4.tar.gz b/tplMirror/VTK-59d89108f4.tar.gz new file mode 100644 index 00000000..a8295dfe --- /dev/null +++ b/tplMirror/VTK-59d89108f4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f922d7e9f917ec9da5ce0a4dda60d8eb89f91c157658269e0f8be532bf958c2a +size 42559503 diff --git a/tplMirror/VTK-ABI.patch b/tplMirror/VTK-ABI.patch new file mode 100644 index 00000000..f8f1fd8a --- /dev/null +++ b/tplMirror/VTK-ABI.patch @@ -0,0 +1,65 @@ +diff --git a/Common/Core/vtkValueFromString.cxx b/Common/Core/vtkValueFromString.cxx +index 9e619a87a5..93ca79486d 100644 +--- a/Common/Core/vtkValueFromString.cxx ++++ b/Common/Core/vtkValueFromString.cxx +@@ -203,6 +203,8 @@ const char* ParseInt(const char* it, const char* end, bool minus_sign, int base, + } + } + ++VTK_ABI_NAMESPACE_BEGIN ++ + // Overload for integers + template ::value && !std::is_same::value, bool>::type = +diff --git a/Filters/Core/vtkFieldDataToDataSetAttribute.cxx b/Filters/Core/vtkFieldDataToDataSetAttribute.cxx +index 9a8b23c67b..d8a451eca8 100644 +--- a/Filters/Core/vtkFieldDataToDataSetAttribute.cxx ++++ b/Filters/Core/vtkFieldDataToDataSetAttribute.cxx +@@ -28,6 +28,7 @@ + + #include + ++VTK_ABI_NAMESPACE_BEGIN + vtkStandardNewMacro(vtkFieldDataToDataSetAttribute); + + //------------------------------------------------------------------------------ +diff --git a/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.cxx b/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.cxx +index 6b00e7ff0f..b8d879ac9b 100644 +--- a/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.cxx ++++ b/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.cxx +@@ -54,6 +54,8 @@ + + #include "vtkSurfaceLICInterface.h" + ++VTK_ABI_NAMESPACE_BEGIN ++ + vtkStandardNewMacro(vtkCompositeSurfaceLICMapper); + //------------------------------------------------------------------------------ + vtkCompositeSurfaceLICMapper::vtkCompositeSurfaceLICMapper() = default; +diff --git a/Rendering/OpenGL2/vtkOpenGLBatchedPolyDataMapper.cxx b/Rendering/OpenGL2/vtkOpenGLBatchedPolyDataMapper.cxx +index d46b537d33..1ea50351bf 100644 +--- a/Rendering/OpenGL2/vtkOpenGLBatchedPolyDataMapper.cxx ++++ b/Rendering/OpenGL2/vtkOpenGLBatchedPolyDataMapper.cxx +@@ -42,7 +42,6 @@ + #include "vtkUnsignedIntArray.h" + #include + +-VTK_ABI_NAMESPACE_BEGIN + namespace + { + template +@@ -64,6 +63,8 @@ private: + + } // end anonymous namespace + ++VTK_ABI_NAMESPACE_BEGIN ++ + //------------------------------------------------------------------------------ + vtkStandardNewMacro(vtkOpenGLBatchedPolyDataMapper); + +@@ -1643,3 +1644,5 @@ int vtkOpenGLBatchedPolyDataMapper::CanUseTextureMapForColoring(vtkDataObject*) + + return 1; + } ++ ++VTK_ABI_NAMESPACE_END From 05e21925486e3926c38b2712a32a9c447fc1a4fe Mon Sep 17 00:00:00 2001 From: Julien Fausty Date: Thu, 20 Jul 2023 16:56:31 +0200 Subject: [PATCH 04/13] GCC13: patch and fix errors and warnings * downgrade fmt 10.0.0 -> 9.1.0 * patch raja for stdexcept and cstdlib --- CMakeLists.txt | 4 +++- tplMirror/fmt-10.0.0.tar.gz | 3 --- tplMirror/fmt-9.1.0.zip | 3 +++ tplMirror/raja-cstdlib.patch | 31 +++++++++++++++++++++++++++++++ tplMirror/raja-stdexcept.patch | 12 ++++++++++++ 5 files changed, 49 insertions(+), 4 deletions(-) delete mode 100755 tplMirror/fmt-10.0.0.tar.gz create mode 100644 tplMirror/fmt-9.1.0.zip create mode 100644 tplMirror/raja-cstdlib.patch create mode 100644 tplMirror/raja-stdexcept.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index d49ce4db..2c892dcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -324,6 +324,8 @@ ExternalProject_Add( raja DEPENDS ${RAJA_DEPENDS} BUILD_COMMAND ${TPL_BUILD_COMMAND} VERBOSE=1 INSTALL_COMMAND ${TPL_INSTALL_COMMAND} + PATCH_COMMAND patch -p1 < ${TPL_MIRROR_DIR}/raja-stdexcept.patch + COMMAND patch -p1 < ${TPL_MIRROR_DIR}/raja-cstdlib.patch CMAKE_GENERATOR ${TPL_GENERATOR} CMAKE_ARGS -D CMAKE_C_COMPILER=${CMAKE_C_COMPILER} -D CMAKE_CXX_COMPILER:PATH=${CMAKE_CXX_COMPILER} @@ -1244,7 +1246,7 @@ endif (ENABLE_CATALYST) # FMT ################################ set(FMT_DIR "${CMAKE_INSTALL_PREFIX}/fmt") -set(FMT_URL "${TPL_MIRROR_DIR}/fmt-10.0.0.tar.gz") +set(FMT_URL "${TPL_MIRROR_DIR}/fmt-9.1.0.zip") message(STATUS "Building FMT found at ${FMT_URL}") diff --git a/tplMirror/fmt-10.0.0.tar.gz b/tplMirror/fmt-10.0.0.tar.gz deleted file mode 100755 index 2684a8c8..00000000 --- a/tplMirror/fmt-10.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ede1b6b42188163a3f2e0f25ad5c0637eca564bd8df74d02e31a311dd6b37ad8 -size 851582 diff --git a/tplMirror/fmt-9.1.0.zip b/tplMirror/fmt-9.1.0.zip new file mode 100644 index 00000000..2b22cd8f --- /dev/null +++ b/tplMirror/fmt-9.1.0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdc885473510ae0ea909b5589367f8da784df8b00325c55c7cbbab3058424120 +size 906172 diff --git a/tplMirror/raja-cstdlib.patch b/tplMirror/raja-cstdlib.patch new file mode 100644 index 00000000..a6dd8ea0 --- /dev/null +++ b/tplMirror/raja-cstdlib.patch @@ -0,0 +1,31 @@ +diff --git a/tpl/camp/include/camp/resource/host.hpp b/tpl/camp/include/camp/resource/host.hpp +index c765175..4c12f98 100644 +--- a/tpl/camp/include/camp/resource/host.hpp ++++ b/tpl/camp/include/camp/resource/host.hpp +@@ -11,6 +11,8 @@ http://github.com/llnl/camp + #ifndef __CAMP_HOST_HPP + #define __CAMP_HOST_HPP + ++#include ++ + #include "camp/resource/event.hpp" + #include "camp/resource/platform.hpp" + +@@ -54,7 +56,7 @@ namespace resources + template + T *allocate(size_t n, MemoryAccess = MemoryAccess::Device) + { +- return (T *)malloc(sizeof(T) * n); ++ return (T *)std::malloc(sizeof(T) * n); + } + void *calloc(size_t size, MemoryAccess = MemoryAccess::Device) + { +@@ -62,7 +64,7 @@ namespace resources + this->memset(p, 0, size); + return p; + } +- void deallocate(void *p, MemoryAccess = MemoryAccess::Device) { free(p); } ++ void deallocate(void *p, MemoryAccess = MemoryAccess::Device) { std::free(p); } + void memcpy(void *dst, const void *src, size_t size) { std::memcpy(dst, src, size); } + void memset(void *p, int val, size_t size) { std::memset(p, val, size); } + }; diff --git a/tplMirror/raja-stdexcept.patch b/tplMirror/raja-stdexcept.patch new file mode 100644 index 00000000..3563ef77 --- /dev/null +++ b/tplMirror/raja-stdexcept.patch @@ -0,0 +1,12 @@ +diff --git a/tpl/camp/include/camp/resource.hpp b/tpl/camp/include/camp/resource.hpp +index 58df206..05c6031 100644 +--- a/tpl/camp/include/camp/resource.hpp ++++ b/tpl/camp/include/camp/resource.hpp +@@ -15,6 +15,7 @@ http://github.com/llnl/camp + #include + #include + #include ++#include + + #include "camp/helpers.hpp" + #include "camp/resource/event.hpp" From b1d57d6903a67cc71116ba2637f2e882703de350 Mon Sep 17 00:00:00 2001 From: Julien Fausty Date: Wed, 9 Aug 2023 19:54:50 +0200 Subject: [PATCH 05/13] ADIOSCatalyst: update version for M x N and multimesh fixes --- CMakeLists.txt | 4 +++- tplMirror/adioscatalyst-124a42d13c.tar.gz | 3 --- tplMirror/adioscatalyst-db414c63.tar.gz | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 tplMirror/adioscatalyst-124a42d13c.tar.gz create mode 100644 tplMirror/adioscatalyst-db414c63.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c892dcc..7d630d71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1190,6 +1190,8 @@ if (ENABLE_CATALYST) -DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER} -DCMAKE_INSTALL_PREFIX= -DCMAKE_CXX_STANDARD=11 + -DADIOS2_USE_Fortran=OFF + -DADIOS2_USE_MPI=ON -DNoGitVersionString:BOOL=ON ) @@ -1212,7 +1214,7 @@ if (ENABLE_CATALYST) set(CATALYST_IMPLEMENTATION_DIR "${CMAKE_INSTALL_PREFIX}/catalyst_implementation") - set(CATALYST_IMPLEMENTATION_URL "${TPL_MIRROR_DIR}/adioscatalyst-124a42d13c.tar.gz") + set(CATALYST_IMPLEMENTATION_URL "${TPL_MIRROR_DIR}/adioscatalyst-db414c63.tar.gz") set(ADIOS_CMAKE_PREFIX ${ADIOS_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/adios2/) diff --git a/tplMirror/adioscatalyst-124a42d13c.tar.gz b/tplMirror/adioscatalyst-124a42d13c.tar.gz deleted file mode 100644 index 1651eac6..00000000 --- a/tplMirror/adioscatalyst-124a42d13c.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37a0e6480ee0364c64798fca87cde5c1b1370be1a305aed79de20e67e3e5712e -size 28508 diff --git a/tplMirror/adioscatalyst-db414c63.tar.gz b/tplMirror/adioscatalyst-db414c63.tar.gz new file mode 100644 index 00000000..8371e244 --- /dev/null +++ b/tplMirror/adioscatalyst-db414c63.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32ee568538a3dee888b608843febadd66db3a2c040f579a4c3e3ea5700609ec4 +size 29481 From fcac0f126856c061c0feb39a7073961bb0a141c0 Mon Sep 17 00:00:00 2001 From: Julien Fausty Date: Fri, 15 Sep 2023 16:35:30 +0200 Subject: [PATCH 06/13] ABI: quick naming geosx -> geos fix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d630d71..0008d394 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1100,7 +1100,7 @@ if( ENABLE_VTK ) # This mangling is needed in order to ensure that the VTK included with geosx does # not interfere with another VTK version that may be linked dynamically at runtime # (when using ParaView's Catalyst implementation for example). - set( VTK_ABI_NAMESPACE_NAME "vtk_geosx" ) + set( VTK_ABI_NAMESPACE_NAME "vtk_geos" ) if( ENABLE_MPI ) set( VTK_C_COMPILER ${MPI_C_COMPILER} ) From 3b0d65b438796262e60af2d90cb116c4cc46ff6a Mon Sep 17 00:00:00 2001 From: Charles Gueunet Date: Wed, 13 Dec 2023 16:32:56 +0100 Subject: [PATCH 07/13] Update adioscatalyst to multiple-writer branch --- CMakeLists.txt | 4 ++-- tplMirror/adioscatalyst-db414c63.tar.gz | 3 --- tplMirror/adioscatalyst-mw-f889ce38.tar.gz | 3 +++ tplMirror/catalyst-74275110.tar.gz | 3 --- tplMirror/catalyst-afa7ec79.tar.gz | 3 +++ 5 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 tplMirror/adioscatalyst-db414c63.tar.gz create mode 100644 tplMirror/adioscatalyst-mw-f889ce38.tar.gz delete mode 100644 tplMirror/catalyst-74275110.tar.gz create mode 100644 tplMirror/catalyst-afa7ec79.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index 0008d394..233a80c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1196,7 +1196,7 @@ if (ENABLE_CATALYST) ) set(CATALYST_DIR "${CMAKE_INSTALL_PREFIX}/catalyst") - set(CATALYST_URL "${TPL_MIRROR_DIR}/catalyst-74275110.tar.gz") + set(CATALYST_URL "${TPL_MIRROR_DIR}/catalyst-afa7ec79.tar.gz") ExternalProject_Add( catalyst URL ${CATALYST_URL} @@ -1214,7 +1214,7 @@ if (ENABLE_CATALYST) set(CATALYST_IMPLEMENTATION_DIR "${CMAKE_INSTALL_PREFIX}/catalyst_implementation") - set(CATALYST_IMPLEMENTATION_URL "${TPL_MIRROR_DIR}/adioscatalyst-db414c63.tar.gz") + set(CATALYST_IMPLEMENTATION_URL "${TPL_MIRROR_DIR}/adioscatalyst-mw-f889ce38.tar.gz") set(ADIOS_CMAKE_PREFIX ${ADIOS_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/adios2/) diff --git a/tplMirror/adioscatalyst-db414c63.tar.gz b/tplMirror/adioscatalyst-db414c63.tar.gz deleted file mode 100644 index 8371e244..00000000 --- a/tplMirror/adioscatalyst-db414c63.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32ee568538a3dee888b608843febadd66db3a2c040f579a4c3e3ea5700609ec4 -size 29481 diff --git a/tplMirror/adioscatalyst-mw-f889ce38.tar.gz b/tplMirror/adioscatalyst-mw-f889ce38.tar.gz new file mode 100644 index 00000000..b9ff6433 --- /dev/null +++ b/tplMirror/adioscatalyst-mw-f889ce38.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44bf2cf6a2b42e8ffe0ef7ef8ab3b69d1450bd303a31a246cad572b91da71a87 +size 33436 diff --git a/tplMirror/catalyst-74275110.tar.gz b/tplMirror/catalyst-74275110.tar.gz deleted file mode 100644 index 49c4450b..00000000 --- a/tplMirror/catalyst-74275110.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6a155d7285bb201fa3bfc73e6355388c4f89e2451010d7ba3cb282360e7b316 -size 825155 diff --git a/tplMirror/catalyst-afa7ec79.tar.gz b/tplMirror/catalyst-afa7ec79.tar.gz new file mode 100644 index 00000000..97c5ee6a --- /dev/null +++ b/tplMirror/catalyst-afa7ec79.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9fc68a5f8e8bef5af10570231fc3e79577d6c0dbfe0a4a4d8fafde9bdb9b801 +size 837854 From ccfcc31fbec2fb3d9ab02620c77b91700bf99258 Mon Sep 17 00:00:00 2001 From: Charles Gueunet Date: Tue, 23 Jan 2024 10:17:41 +0100 Subject: [PATCH 08/13] AdiosCatalyst master with multiple writer --- CMakeLists.txt | 2 +- tplMirror/adioscatalyst-8a4ee7ca.tar.gz | 3 +++ tplMirror/adioscatalyst-mw-f889ce38.tar.gz | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 tplMirror/adioscatalyst-8a4ee7ca.tar.gz delete mode 100644 tplMirror/adioscatalyst-mw-f889ce38.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c1f01c0..c5625c99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1242,7 +1242,7 @@ if (ENABLE_CATALYST) set(CATALYST_IMPLEMENTATION_DIR "${CMAKE_INSTALL_PREFIX}/catalyst_implementation") - set(CATALYST_IMPLEMENTATION_URL "${TPL_MIRROR_DIR}/adioscatalyst-mw-f889ce38.tar.gz") + set(CATALYST_IMPLEMENTATION_URL "${TPL_MIRROR_DIR}/adioscatalyst-8a4ee7ca.tar.gz") set(ADIOS_CMAKE_PREFIX ${ADIOS_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/adios2/) diff --git a/tplMirror/adioscatalyst-8a4ee7ca.tar.gz b/tplMirror/adioscatalyst-8a4ee7ca.tar.gz new file mode 100644 index 00000000..bd95d519 --- /dev/null +++ b/tplMirror/adioscatalyst-8a4ee7ca.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab8483f7f3f25f7b01f47602edb274ff9efe5dafed59b5896afa338fcab32052 +size 124444 diff --git a/tplMirror/adioscatalyst-mw-f889ce38.tar.gz b/tplMirror/adioscatalyst-mw-f889ce38.tar.gz deleted file mode 100644 index b9ff6433..00000000 --- a/tplMirror/adioscatalyst-mw-f889ce38.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44bf2cf6a2b42e8ffe0ef7ef8ab3b69d1450bd303a31a246cad572b91da71a87 -size 33436 From 0385675550673006f95c37e2793e76fbd25b8e22 Mon Sep 17 00:00:00 2001 From: Charles Gueunet Date: Thu, 25 Jan 2024 15:39:19 +0100 Subject: [PATCH 09/13] Remote unnedded raja patches --- CMakeLists.txt | 2 -- tplMirror/raja-cstdlib.patch | 31 ------------------------------- tplMirror/raja-stdexcept.patch | 12 ------------ 3 files changed, 45 deletions(-) delete mode 100644 tplMirror/raja-cstdlib.patch delete mode 100644 tplMirror/raja-stdexcept.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index c5625c99..221f0511 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -353,8 +353,6 @@ ExternalProject_Add( raja DEPENDS ${RAJA_DEPENDS} BUILD_COMMAND ${TPL_BUILD_COMMAND} VERBOSE=1 INSTALL_COMMAND ${TPL_INSTALL_COMMAND} - PATCH_COMMAND patch -p1 < ${TPL_MIRROR_DIR}/raja-stdexcept.patch - COMMAND patch -p1 < ${TPL_MIRROR_DIR}/raja-cstdlib.patch CMAKE_GENERATOR ${TPL_GENERATOR} CMAKE_ARGS -D CMAKE_C_COMPILER=${CMAKE_C_COMPILER} -D CMAKE_CXX_COMPILER:PATH=${CMAKE_CXX_COMPILER} diff --git a/tplMirror/raja-cstdlib.patch b/tplMirror/raja-cstdlib.patch deleted file mode 100644 index a6dd8ea0..00000000 --- a/tplMirror/raja-cstdlib.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tpl/camp/include/camp/resource/host.hpp b/tpl/camp/include/camp/resource/host.hpp -index c765175..4c12f98 100644 ---- a/tpl/camp/include/camp/resource/host.hpp -+++ b/tpl/camp/include/camp/resource/host.hpp -@@ -11,6 +11,8 @@ http://github.com/llnl/camp - #ifndef __CAMP_HOST_HPP - #define __CAMP_HOST_HPP - -+#include -+ - #include "camp/resource/event.hpp" - #include "camp/resource/platform.hpp" - -@@ -54,7 +56,7 @@ namespace resources - template - T *allocate(size_t n, MemoryAccess = MemoryAccess::Device) - { -- return (T *)malloc(sizeof(T) * n); -+ return (T *)std::malloc(sizeof(T) * n); - } - void *calloc(size_t size, MemoryAccess = MemoryAccess::Device) - { -@@ -62,7 +64,7 @@ namespace resources - this->memset(p, 0, size); - return p; - } -- void deallocate(void *p, MemoryAccess = MemoryAccess::Device) { free(p); } -+ void deallocate(void *p, MemoryAccess = MemoryAccess::Device) { std::free(p); } - void memcpy(void *dst, const void *src, size_t size) { std::memcpy(dst, src, size); } - void memset(void *p, int val, size_t size) { std::memset(p, val, size); } - }; diff --git a/tplMirror/raja-stdexcept.patch b/tplMirror/raja-stdexcept.patch deleted file mode 100644 index 3563ef77..00000000 --- a/tplMirror/raja-stdexcept.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tpl/camp/include/camp/resource.hpp b/tpl/camp/include/camp/resource.hpp -index 58df206..05c6031 100644 ---- a/tpl/camp/include/camp/resource.hpp -+++ b/tpl/camp/include/camp/resource.hpp -@@ -15,6 +15,7 @@ http://github.com/llnl/camp - #include - #include - #include -+#include - - #include "camp/helpers.hpp" - #include "camp/resource/event.hpp" From 537a527fc205786b0f509a0eab6f21c4abadce10 Mon Sep 17 00:00:00 2001 From: Charles Gueunet Date: Thu, 25 Jan 2024 15:43:27 +0100 Subject: [PATCH 10/13] Keep fmt version --- CMakeLists.txt | 2 +- tplMirror/fmt-10.0.0.tar.gz | 3 +++ tplMirror/fmt-9.1.0.zip | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 tplMirror/fmt-10.0.0.tar.gz delete mode 100644 tplMirror/fmt-9.1.0.zip diff --git a/CMakeLists.txt b/CMakeLists.txt index 221f0511..f362fc78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1274,7 +1274,7 @@ endif (ENABLE_CATALYST) # FMT ################################ set(FMT_DIR "${CMAKE_INSTALL_PREFIX}/fmt") -set(FMT_URL "${TPL_MIRROR_DIR}/fmt-9.1.0.zip") +set(FMT_URL "${TPL_MIRROR_DIR}/fmt-10.0.0.zip") message(STATUS "Building FMT found at ${FMT_URL}") diff --git a/tplMirror/fmt-10.0.0.tar.gz b/tplMirror/fmt-10.0.0.tar.gz new file mode 100755 index 00000000..2684a8c8 --- /dev/null +++ b/tplMirror/fmt-10.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede1b6b42188163a3f2e0f25ad5c0637eca564bd8df74d02e31a311dd6b37ad8 +size 851582 diff --git a/tplMirror/fmt-9.1.0.zip b/tplMirror/fmt-9.1.0.zip deleted file mode 100644 index 2b22cd8f..00000000 --- a/tplMirror/fmt-9.1.0.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdc885473510ae0ea909b5589367f8da784df8b00325c55c7cbbab3058424120 -size 906172 From 2bb56eea11eea481edea0aa529e63a74a639352b Mon Sep 17 00:00:00 2001 From: Charles Gueunet Date: Thu, 25 Jan 2024 16:09:59 +0100 Subject: [PATCH 11/13] Remove useless patches --- CMakeLists.txt | 4 ---- tplMirror/caliper-uint.patch | 12 ------------ tplMirror/chai-stdexcept.patch | 12 ------------ 3 files changed, 28 deletions(-) delete mode 100644 tplMirror/caliper-uint.patch delete mode 100644 tplMirror/chai-stdexcept.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index f362fc78..23b434fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -389,9 +389,6 @@ ExternalProject_Add( chai DEPENDS raja BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND ${TPL_INSTALL_COMMAND} - PATCH_COMMAND patch - src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp - < ${TPL_MIRROR_DIR}/chai-stdexcept.patch CMAKE_GENERATOR ${TPL_GENERATOR} CMAKE_ARGS -D CMAKE_C_COMPILER=${CMAKE_C_COMPILER} -D CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} @@ -471,7 +468,6 @@ if (ENABLE_CALIPER) INSTALL_DIR ${CALIPER_DIR} BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND ${TPL_INSTALL_COMMAND} - PATCH_COMMAND patch src/mpi/mpi_machine.cpp < ${TPL_MIRROR_DIR}/caliper-uint.patch CMAKE_GENERATOR ${TPL_GENERATOR} DEPENDS adiak CMAKE_ARGS -D CMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER} diff --git a/tplMirror/caliper-uint.patch b/tplMirror/caliper-uint.patch deleted file mode 100644 index 40c0ad28..00000000 --- a/tplMirror/caliper-uint.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/mpi_machine.cpp b/mpi_machine_good.cpp -index c394500..38cd5fb 100644 ---- a/mpi_machine.cpp -+++ b/mpi_machine_good.cpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - - using namespace cali; - using namespace cali::mpi; diff --git a/tplMirror/chai-stdexcept.patch b/tplMirror/chai-stdexcept.patch deleted file mode 100644 index 04ebcab7..00000000 --- a/tplMirror/chai-stdexcept.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp b/src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp -index 58df206..05c6031 100644 ---- a/src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp -+++ b/src/tpl/umpire/src/tpl/umpire/camp/include/camp/resource.hpp -@@ -15,6 +15,7 @@ http://github.com/llnl/camp - #include - #include - #include -+#include - - #include "camp/helpers.hpp" - #include "camp/resource/event.hpp" From 436518e501ec0b866dcf936fe6b80eab6f8e4fec Mon Sep 17 00:00:00 2001 From: Charles Gueunet Date: Fri, 26 Jan 2024 10:26:28 +0100 Subject: [PATCH 12/13] Update adios catalyst to avid mpi issue --- CMakeLists.txt | 2 +- tplMirror/adioscatalyst-72a75a88.tar.gz | 3 +++ tplMirror/adioscatalyst-8a4ee7ca.tar.gz | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 tplMirror/adioscatalyst-72a75a88.tar.gz delete mode 100644 tplMirror/adioscatalyst-8a4ee7ca.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index 23b434fe..b6888b40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1236,7 +1236,7 @@ if (ENABLE_CATALYST) set(CATALYST_IMPLEMENTATION_DIR "${CMAKE_INSTALL_PREFIX}/catalyst_implementation") - set(CATALYST_IMPLEMENTATION_URL "${TPL_MIRROR_DIR}/adioscatalyst-8a4ee7ca.tar.gz") + set(CATALYST_IMPLEMENTATION_URL "${TPL_MIRROR_DIR}/adioscatalyst-72a75a88.tar.gz") set(ADIOS_CMAKE_PREFIX ${ADIOS_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/adios2/) diff --git a/tplMirror/adioscatalyst-72a75a88.tar.gz b/tplMirror/adioscatalyst-72a75a88.tar.gz new file mode 100644 index 00000000..c9ba59cc --- /dev/null +++ b/tplMirror/adioscatalyst-72a75a88.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:837cdda1f9886cd8b395be6fe62ee948f8fa314bd56e102cb44c75d579de27bc +size 124480 diff --git a/tplMirror/adioscatalyst-8a4ee7ca.tar.gz b/tplMirror/adioscatalyst-8a4ee7ca.tar.gz deleted file mode 100644 index bd95d519..00000000 --- a/tplMirror/adioscatalyst-8a4ee7ca.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab8483f7f3f25f7b01f47602edb274ff9efe5dafed59b5896afa338fcab32052 -size 124444 From bed4502deff9f1c4bc81c52552085c2b8c45f9e7 Mon Sep 17 00:00:00 2001 From: Stefano Frambati Date: Fri, 26 Jan 2024 15:01:17 +0100 Subject: [PATCH 13/13] restored filename of fmt library archive --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61418fea..52fbed8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1272,7 +1272,7 @@ endif (ENABLE_CATALYST) # FMT ################################ set(FMT_DIR "${CMAKE_INSTALL_PREFIX}/fmt") -set(FMT_URL "${TPL_MIRROR_DIR}/fmt-10.0.0.zip") +set(FMT_URL "${TPL_MIRROR_DIR}/fmt-10.0.0.tar.gz") message(STATUS "Building FMT found at ${FMT_URL}")