Unverified Commit 14a0a3a8 authored by Bolea Sanchez, Vicente Adolfo's avatar Bolea Sanchez, Vicente Adolfo Committed by GitHub
Browse files

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

Backports from release_29
parents 4907f2bf 9757c7d9

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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)

cmake/DetectOptions.cmake

+2 −2
Original line number Diff line number Diff line
@@ -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)

source/utils/bp5dbg/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

)

source/utils/bp5dbg/adios2/bp5dbg/__init__.py

+1 −1
Original line number Diff line number Diff line 
from .data import *

from .idxtable import *

from .metadata import *

from .metametadata import *

source/utils/bp5dbg/adios2/bp5dbg/data.py

deleted100644 → 0
+0 −635

File deleted.

Preview size limit exceeded, changes collapsed.