diff --git a/CMakeLists.txt b/CMakeLists.txt index 6495b0b4..d963d7e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -332,7 +332,7 @@ list(APPEND build_list silo ) set(RAJA_DIR "${CMAKE_INSTALL_PREFIX}/raja") -set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2024.02.2.tar.gz") +set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2024.07.0.tar.gz") message(STATUS "Building RAJA found at ${RAJA_URL}") @@ -370,7 +370,7 @@ list(APPEND build_list raja ) # CHAI ################################ set(CHAI_DIR "${CMAKE_INSTALL_PREFIX}/chai") -set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2024.02.2.tar.gz") +set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2024.07.0.tar.gz") message(STATUS "Building CHAI found at ${CHAI_URL}") ExternalProject_Add( chai @@ -1133,7 +1133,7 @@ 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 + PATCH_COMMAND patch -p0 -t < ${TPL_MIRROR_DIR}/vtkXML-fpe.patch BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND "${TPL_INSTALL_COMMAND}" CMAKE_GENERATOR ${TPL_GENERATOR} diff --git a/tplMirror/RAJA-v2024.02.2.tar.gz b/tplMirror/RAJA-v2024.02.2.tar.gz deleted file mode 100644 index f44d5afc..00000000 --- a/tplMirror/RAJA-v2024.02.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ccf4492231c7aceb8399adc2ee3e56f8fd2ecfe622d92b31a4f1aa51fd3cec9 -size 10865568 diff --git a/tplMirror/RAJA-v2024.07.0.tar.gz b/tplMirror/RAJA-v2024.07.0.tar.gz new file mode 100644 index 00000000..4588e813 --- /dev/null +++ b/tplMirror/RAJA-v2024.07.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf5f4b07abfe20076cecc030d227f6dd4b499ef2275ce8465da2c0e6da4b0b56 +size 10927064 diff --git a/tplMirror/chai-2024.02.2.tar.gz b/tplMirror/chai-2024.02.2.tar.gz deleted file mode 100644 index 826bc5be..00000000 --- a/tplMirror/chai-2024.02.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df34eeed409970f71810482c06c2150faf170456fa9f03e22dbd2114d5159b5b -size 23158035 diff --git a/tplMirror/chai-2024.07.0.tar.gz b/tplMirror/chai-2024.07.0.tar.gz new file mode 100644 index 00000000..3e544748 --- /dev/null +++ b/tplMirror/chai-2024.07.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05919e45f449290b67c63801cce3ca65589f83c02f58058b49f4ca36fbe66160 +size 23249235 diff --git a/tplMirror/vtkXML-fpe.patch b/tplMirror/vtkXML-fpe.patch new file mode 100644 index 00000000..b1502f1c --- /dev/null +++ b/tplMirror/vtkXML-fpe.patch @@ -0,0 +1,41 @@ +unchanged: +--- 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); +only in patch2: +unchanged: +--- IO/XML/vtkXMLWriter.cxx 2023-02-14 20:03:53.000000000 -0800 ++++ IO/XML/vtkXMLWriter-patch.cxx 2024-08-26 10:11:05.373719000 -0700 +@@ -64,6 +64,7 @@ + #include + + #include ++#include + #include + #include + +@@ -3052,7 +3053,7 @@ + if (!this->AbortExecute) + { + // Round progress to nearest 100th. +- float rounded = static_cast(static_cast((progress * 100) + 0.5f)) / 100.f; ++ float const rounded = std::round(progress * 100) * 0.01; + if (this->GetProgress() != rounded) + { + this->UpdateProgress(rounded); diff --git a/tplMirror/vtkXMLWriter-fpe.patch b/tplMirror/vtkXMLWriter-fpe.patch new file mode 100644 index 00000000..2dc12f49 --- /dev/null +++ b/tplMirror/vtkXMLWriter-fpe.patch @@ -0,0 +1,19 @@ +--- vtkXMLWriter.cxx 2023-02-14 20:03:53.000000000 -0800 ++++ vtkXMLWriter-patch.cxx 2024-08-26 10:11:05.373719000 -0700 +@@ -64,6 +64,7 @@ + #include + + #include ++#include + #include + #include + +@@ -3052,7 +3053,7 @@ + if (!this->AbortExecute) + { + // Round progress to nearest 100th. +- float rounded = static_cast(static_cast((progress * 100) + 0.5f)) / 100.f; ++ float const rounded = std::round(progress * 100) * 0.01; + if (this->GetProgress() != rounded) + { + this->UpdateProgress(rounded);