Merge pull request #3858 from vicentebolea/backport-from-release

Backports from release_29
ornladios · Oct 24, 2023 · 14a0a3a · 14a0a3a
2 parents 4907f2b + 9757c7d
commit 14a0a3a
Show file tree

Hide file tree

Showing 11 changed files with 279 additions and 1,241 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -170,7 +170,7 @@ adios_option(Profiling  "Enable support for profiling" AUTO)
 adios_option(Endian_Reverse "Enable support for Little/Big Endian Interoperability" AUTO)
 adios_option(Sodium     "Enable support for Sodium for encryption" AUTO)
 adios_option(Catalyst   "Enable support for in situ visualization plugin using ParaView Catalyst" AUTO)
-adios_option(AWSSDK     "Enable support for S3 compatible storage using AWS SDK's S3 module" AUTO)
+adios_option(AWSSDK     "Enable support for S3 compatible storage using AWS SDK's S3 module" OFF)
 include(${PROJECT_SOURCE_DIR}/cmake/DetectOptions.cmake)
 
 if(ADIOS2_HAVE_CUDA OR ADIOS2_HAVE_Kokkos_CUDA)

diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
@@ -546,9 +546,9 @@ endif()
 
 # AWS S3
 if(ADIOS2_USE_AWSSDK STREQUAL AUTO)
-    find_package(AWSSDK QUIET COMPONENTS s3)
+    find_package(AWSSDK 1.10.15 COMPONENTS s3)
 elseif(ADIOS2_USE_AWSSDK)
-    find_package(AWSSDK REQUIRED COMPONENTS s3)
+    find_package(AWSSDK 1.10.15 REQUIRED COMPONENTS s3)
 endif()
 if(AWSSDK_FOUND)
     set(ADIOS2_HAVE_AWSSDK TRUE)

diff --git a/source/utils/bp5dbg/CMakeLists.txt b/source/utils/bp5dbg/CMakeLists.txt
@@ -5,9 +5,9 @@ install(PROGRAMS bp5dbg.py
 install(
   FILES
     adios2/bp5dbg/__init__.py
-    adios2/bp5dbg/data.py
     adios2/bp5dbg/utils.py
     adios2/bp5dbg/metadata.py
+    adios2/bp5dbg/metametadata.py
     adios2/bp5dbg/idxtable.py
   DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/adios2/bp5dbg COMPONENT adios2_scripts-runtime
 )
diff --git a/source/utils/bp5dbg/adios2/bp5dbg/__init__.py b/source/utils/bp5dbg/adios2/bp5dbg/__init__.py
@@ -1,3 +1,3 @@
-from .data import *
 from .idxtable import *
 from .metadata import *
+from .metametadata import *