ornladios · vicentebolea · May 10, 2023 · May 29, 2023 · May 17, 2023 · May 5, 2023
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -7,7 +7,7 @@ certifi==2022.12.7
 cffi==1.15.1
 charset-normalizer==2.1.1
 colorama==0.4.6
-cryptography==39.0.1
+cryptography==41.0.0
 docutils==0.17
 funcparserlib==1.0.1
 idna==3.4

diff --git a/scripts/ci/cmake-v2/ci-ascent-common.cmake b/scripts/ci/cmake-v2/ci-ascent-common.cmake
@@ -0,0 +1,6 @@
+# Client maintainer: vicente.bolea@kitware.com
+
+set(CTEST_TEST_ARGS
+  PARALLEL_LEVEL 8
+  EXCLUDE ".*/BPWRCUDA.ADIOS2BPCUDAWrong/.*BP4.Serial|.*/BPWRCUDA.ADIOS2BPCUDAMemSel/.*BP4.Serial|Engine.Staging.TestThreads.*|Install.*"
+  )
diff --git a/scripts/ci/cmake-v2/ci-ascent-cuda.cmake b/scripts/ci/cmake-v2/ci-ascent-cuda.cmake
@@ -18,10 +18,7 @@ CMAKE_DISABLE_FIND_PACKAGE_FLEX=ON
 CMAKE_Fortran_FLAGS:STRING=-Wall
 ")
 
-set(CTEST_TEST_ARGS
-  PARALLEL_LEVEL 8
-  EXCLUDE ".*/BPWRCUDA.ADIOS2BPCUDAWrong/.*BP4.Serial|.*/BPWRCUDA.ADIOS2BPCUDAMemSel/.*BP4.Serial"
-  )
 set(CTEST_CMAKE_GENERATOR "Ninja")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
+include(${CMAKE_CURRENT_LIST_DIR}/ci-ascent-common.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/scripts/ci/cmake-v2/ci-ascent-kokkos-cuda.cmake b/scripts/ci/cmake-v2/ci-ascent-kokkos-cuda.cmake
@@ -23,10 +23,7 @@ CMAKE_DISABLE_FIND_PACKAGE_BISON=ON
 CMAKE_DISABLE_FIND_PACKAGE_FLEX=ON
 ")
 
-set(CTEST_TEST_ARGS
-  PARALLEL_LEVEL 8
-  EXCLUDE ".*/BPWRCUDA.ADIOS2BPCUDAWrong/.*BP4.Serial|.*/BPWRCUDA.ADIOS2BPCUDAMemSel/.*BP4.Serial|Engine.Staging.TestThreads.*"
-  )
 set(CTEST_CMAKE_GENERATOR "Ninja")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
+include(${CMAKE_CURRENT_LIST_DIR}/ci-ascent-common.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/scripts/ci/cmake-v2/ci-ascent-nvhpc.cmake b/scripts/ci/cmake-v2/ci-ascent-nvhpc.cmake
@@ -21,10 +21,7 @@ CMAKE_DISABLE_FIND_PACKAGE_FLEX=ON
 CMAKE_NINJA_FORCE_RESPONSE_FILE=OFF
 ")
 
-set(CTEST_TEST_ARGS
-  PARALLEL_LEVEL 8
-  EXCLUDE ".*/BPWRCUDA.ADIOS2BPCUDAWrong/.*BP4.Serial|.*/BPWRCUDA.ADIOS2BPCUDAMemSel/.*BP4.Serial|Install.*Fortran"
-  )
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
+include(${CMAKE_CURRENT_LIST_DIR}/ci-ascent-common.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/scripts/ci/cmake-v2/ci-ascent-xl.cmake b/scripts/ci/cmake-v2/ci-ascent-xl.cmake
@@ -24,7 +24,7 @@ CMAKE_DISABLE_FIND_PACKAGE_FLEX=ON
 ")
 
 set(NCPUS 4)
-set(CTEST_TEST_ARGS PARALLEL_LEVEL 8)
 set(CTEST_CMAKE_GENERATOR "Ninja")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
+include(${CMAKE_CURRENT_LIST_DIR}/ci-ascent-common.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/source/adios2/toolkit/format/bp5/BP5Deserializer.cpp b/source/adios2/toolkit/format/bp5/BP5Deserializer.cpp
@@ -707,7 +707,7 @@ void BP5Deserializer::InstallMetaData(void *MetadataBlock, size_t BlockLen,
             m_JoinedDimenOffsetArrays = new std::vector<void *>();
             m_JoinedDimenOffsetArrays->resize(writerCohortSize);
             JoinedDimArray[Step] = m_JoinedDimenOffsetArrays;
-            m_FreeableMBA = nullptr;
+            m_FreeableJDOA = nullptr;
         }
     }
     else
@@ -725,7 +725,7 @@ void BP5Deserializer::InstallMetaData(void *MetadataBlock, size_t BlockLen,
         if (!m_JoinedDimenOffsetArrays)
         {
             m_JoinedDimenOffsetArrays = new std::vector<void *>();
-            m_FreeableMBA = m_JoinedDimenOffsetArrays;
+            m_FreeableJDOA = m_JoinedDimenOffsetArrays;
         }
         if (writerCohortSize > m_JoinedDimenOffsetArrays->size())
         {
@@ -2001,7 +2001,13 @@ BP5Deserializer::~BP5Deserializer()
         delete VarRec.second;
     }
     if (m_FreeableMBA)
+    {
         delete m_FreeableMBA;
+    }
+    if (m_FreeableJDOA)
+    {
+        delete m_FreeableJDOA;
+    }
     for (auto &step : MetadataBaseArray)
     {
         delete step;

diff --git a/source/adios2/toolkit/format/bp5/BP5Deserializer.h b/source/adios2/toolkit/format/bp5/BP5Deserializer.h
@@ -250,6 +250,7 @@ class BP5Deserializer : virtual public BP5Base
     /* We assume operators are not thread-safe, call Decompress() one at a time
      */
     std::mutex mutexDecompress;
+    std::vector<void *> *m_FreeableJDOA = nullptr;
 };
 
 } // end namespace format

diff --git a/source/h5vol/CMakeLists.txt b/source/h5vol/CMakeLists.txt
@@ -9,6 +9,18 @@ if(CMAKE_C_COMPILER_ID MATCHES "^(GNU)$")
   string(APPEND CMAKE_C_FLAGS " -Wno-format-zero-length")
 endif()
 
+include(CheckIncludeFiles)
+check_include_files(unistd.h HAVE_UNISTD_H)
+check_include_files(windows.h HAVE_WINDOWS_H)
+
+if (HAVE_UNISTD_H)
+   add_definitions(-DHAVE_UNISTD_H)
+endif()
+
+if (HAVE_WINDOWS_H)
+   add_definitions(-DHAVE_WINDOWS_H)
+endif()
+
 add_library(adios2_h5vol
   H5VolReadWrite.c
   H5Vol.c

diff --git a/source/h5vol/H5VolReadWrite.c b/source/h5vol/H5VolReadWrite.c
@@ -16,7 +16,14 @@
 #include "H5VolReadWrite.h"
 
 #include "H5VolUtil.h"
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h> // sleep
+#elif defined HAVE_WINDOWS_H
+#include <windows.h>
+#define sleep(x) Sleep(1000 * (x))
+#endif
+
 // these are in h5private.h
 #define SUCCEED 1
 #define FAIL 0