From a535c568c599c096f5fe6b593cef5f442b5ab552 Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Mon, 26 Aug 2024 23:07:04 -0700 Subject: [PATCH 1/2] fix vtk patch error --- CMakeLists.txt | 2 +- scripts/setupLC-TPL.bash | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d963d7e8..40a9f469 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1133,7 +1133,7 @@ endif( ENABLE_MPI ) PREFIX ${PROJECT_BINARY_DIR}/vtk URL ${VTK_URL} INSTALL_DIR ${VTK_DIR} - PATCH_COMMAND patch -p0 -t < ${TPL_MIRROR_DIR}/vtkXML-fpe.patch + PATCH_COMMAND patch -p0 -f < ${TPL_MIRROR_DIR}/vtkXML-fpe.patch BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND "${TPL_INSTALL_COMMAND}" CMAKE_GENERATOR ${TPL_GENERATOR} diff --git a/scripts/setupLC-TPL.bash b/scripts/setupLC-TPL.bash index 92d9cf73..c88b46be 100755 --- a/scripts/setupLC-TPL.bash +++ b/scripts/setupLC-TPL.bash @@ -25,8 +25,7 @@ mv build-* toBeDeleted rm -rf toBeDeleted & echo "Building all LC TPLs from $GEOS_DIR to be installed at $INSTALL_DIR" -chmod -R g+rx $INSTALL_DIR -chgrp -R GEOS $INSTALL_DIR + ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby clang-14 "srun -N 1 -t 90 -n 1 -A vortex" $@ & ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby gcc-12 "srun -N 1 -t 90 -n 1 -A vortex" $@ & ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR dane gcc-12 "srun -N 1 -t 90 -n 1 -A vortex" $@ & @@ -36,4 +35,8 @@ chgrp -R GEOS $INSTALL_DIR ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-13-cuda-12 "lalloc 1 -qpdebug" $@ & wait + +chmod -R g+rx $INSTALL_DIR +chgrp -R GEOS $INSTALL_DIR + echo "Complete" From 9234a5c38f2722331b804a2f6f25ae0e800ea335 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Tue, 27 Aug 2024 15:58:02 -0700 Subject: [PATCH 2/2] update VTK to avoid FPE patching --- CMakeLists.txt | 3 +-- tplMirror/VTK-9.2.6.tar.gz | 3 --- tplMirror/VTK-9.3.1.tar.gz | 3 +++ tplMirror/vtkXML-fpe.patch | 41 -------------------------------- tplMirror/vtkXMLReader-fpe.patch | 19 --------------- tplMirror/vtkXMLWriter-fpe.patch | 19 --------------- 6 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 tplMirror/VTK-9.2.6.tar.gz create mode 100644 tplMirror/VTK-9.3.1.tar.gz delete mode 100644 tplMirror/vtkXML-fpe.patch delete mode 100644 tplMirror/vtkXMLReader-fpe.patch delete mode 100644 tplMirror/vtkXMLWriter-fpe.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index 40a9f469..42178bea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1105,7 +1105,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-9.3.1.tar.gz" ) message( STATUS "Building VTK found at ${VTK_URL}" ) @@ -1133,7 +1133,6 @@ endif( ENABLE_MPI ) PREFIX ${PROJECT_BINARY_DIR}/vtk URL ${VTK_URL} INSTALL_DIR ${VTK_DIR} - PATCH_COMMAND patch -p0 -f < ${TPL_MIRROR_DIR}/vtkXML-fpe.patch BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND "${TPL_INSTALL_COMMAND}" CMAKE_GENERATOR ${TPL_GENERATOR} 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/VTK-9.3.1.tar.gz b/tplMirror/VTK-9.3.1.tar.gz new file mode 100644 index 00000000..af0dec3b --- /dev/null +++ b/tplMirror/VTK-9.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8 +size 99964158 diff --git a/tplMirror/vtkXML-fpe.patch b/tplMirror/vtkXML-fpe.patch deleted file mode 100644 index b1502f1c..00000000 --- a/tplMirror/vtkXML-fpe.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/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); diff --git a/tplMirror/vtkXMLWriter-fpe.patch b/tplMirror/vtkXMLWriter-fpe.patch deleted file mode 100644 index 2dc12f49..00000000 --- a/tplMirror/vtkXMLWriter-fpe.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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);