add workaround for FPE in vtkXMLWriter (#279)

* add workaround for FPE in vtkXMLWriter * add raja and chai update --------- Co-authored-by: Matteo Cusini <[email protected]>
GEOS-DEV · Aug 27, 2024 · 3a84c87 · 3a84c87
1 parent 696a3ea
commit 3a84c87
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 9 deletions.
diff --git 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
diff --git a/tplMirror/RAJA-v2024.07.0.tar.gz b/tplMirror/RAJA-v2024.07.0.tar.gz
diff --git a/tplMirror/chai-2024.02.2.tar.gz b/tplMirror/chai-2024.02.2.tar.gz
diff --git a/tplMirror/chai-2024.07.0.tar.gz b/tplMirror/chai-2024.07.0.tar.gz
diff --git a/tplMirror/vtkXML-fpe.patch 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 <algorithm>
+ #include <cassert>
+ #include <cctype>
++#include <cmath>
+ #include <functional>
+ #include <locale> // C++ locale
+ #include <numeric>
+@@ -1958,7 +1959,7 @@
+   if (!this->AbortExecute)
+   {
+     // Round progress to nearest 100th.
+-    float rounded = static_cast<float>(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 <memory>
+
+ #include <cassert>
++#include <cmath>
+ #include <sstream>
+ #include <string>
+
+@@ -3052,7 +3053,7 @@
+   if (!this->AbortExecute)
+   {
+     // Round progress to nearest 100th.
+-    float rounded = static_cast<float>(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);
diff --git a/tplMirror/vtkXMLWriter-fpe.patch 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 <memory>
+
+ #include <cassert>
++#include <cmath>
+ #include <sstream>
+ #include <string>
+
+@@ -3052,7 +3053,7 @@
+   if (!this->AbortExecute)
+   {
+     // Round progress to nearest 100th.
+-    float rounded = static_cast<float>(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);