More ADIOS1 Cleanups

Singularity

@@ -7,7 +7,7 @@ From: debian:unstable
 Welcome to the openPMD-api container.
 This container contains a pre-installed openPMD-api library.
 This container provides serial I/O.
-Supported backends are HDF5 and ADIOS1.
+Supported backends are HDF5 and ADIOS2.
 Supported frontends are C++11 and Python3.
 
 %setup
@@ -25,24 +25,19 @@ Supported frontends are C++11 and Python3.
         ipython3 \
         python3-dev \
         pybind11-dev \
-        libadios-bin libadios-dev \
         libglib2.0-dev libbz2-dev libibverbs-dev libnetcdf-dev \
         libhdf5-dev && \
     rm -rf /var/lib/apt/lists/*
 
     # python3-numpy
 
     # missing: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900804
-    # libadios-openmpi-dev
     # libopenmpi-dev libhdf5-openmpi-dev
 
-    # libadios2-dev
-
     cd $(mktemp -d)
     cmake /opt/openpmd-api       \
         -DopenPMD_USE_MPI=OFF    \
         -DopenPMD_USE_HDF5=ON    \
-        -DopenPMD_USE_ADIOS1=ON  \
         -DopenPMD_USE_ADIOS2=OFF \
         -DopenPMD_USE_PYTHON=ON  \
         -DopenPMD_BUILD_TESTING=OFF       \
@@ -61,6 +56,5 @@ Supported frontends are C++11 and Python3.
 %labels
     openPMD_HAVE_MPI OFF
     openPMD_HAVE_HDF5 ON
-    openPMD_HAVE_ADIOS1 ON
     openPMD_HAVE_ADIOS2 OFF
     openPMD_HAVE_PYTHON ON

docs/Doxyfile

@@ -1,7 +1,7 @@
 PROJECT_NAME      = "openPMD-api"
 XML_OUTPUT        = xml
 INPUT             = ../src ../include ../README.md
-EXCLUDE_PATTERNS  = *CommonADIOS1IOHandler.cpp
+#EXCLUDE_PATTERNS  = *CommonADIOS1IOHandler.cpp
 
 # TAGFILES += "cppreference-doxygen-web.tag.xml=http://en.cppreference.com/w/"
 BUILTIN_STL_SUPPORT = YES
@@ -24,7 +24,6 @@ MACRO_EXPANSION   = YES
 PREDEFINED        = DOXYGEN_SHOULD_SKIP_THIS \
                     openPMD_HAVE_MPI=1 \
                     openPMD_HAVE_HDF5=1 \
-                    openPMD_HAVE_ADIOS1=1 \
                     openPMD_HAVE_ADIOS2=1 \
                     openPMD_HAVE_PYTHON=1 \
                     OPENPMD_private:=private \

docs/source/analysis/paraview.rst

@@ -22,7 +22,7 @@ openPMD
 -------
 
 openPMD files can be visualized with ParaView 5.9+, using 5.11+ is recommended.
-ParaView supports ADIOS1, ADIOS2 and HDF5 files, as it implements against the Python bindings of openPMD-api.
+ParaView supports ADIOS2 and HDF5 files, as it implements against the Python bindings of openPMD-api.
 
 For openPMD output to be recognized, create a small textfile with ``.pmd`` ending per data series, which can be opened with ParaView:
 

docs/source/dev/dependencies.rst

@@ -27,7 +27,6 @@ Optional: I/O backends
 
 * `JSON <https://en.wikipedia.org/wiki/JSON>`_
 * `HDF5 <https://support.hdfgroup.org/HDF5>`_ 1.8.13+
-* `ADIOS1 <https://www.olcf.ornl.gov/center-projects/adios>`_ 1.13.1+ (deprecated)
 * `ADIOS2 <https://github.com/ornladios/ADIOS2>`_ 2.7.0+
 
 while those can be build either with or without:

examples/8a_benchmark_write_parallel.cpp

@@ -240,8 +240,7 @@ std::vector<std::string> getBackends()
 {
     std::vector<std::string> res;
 #if openPMD_HAVE_ADIOS2
-    if (auxiliary::getEnvString("OPENPMD_BP_BACKEND", "NOT_SET") != "ADIOS1")
-        res.emplace_back(".bp");
+    res.emplace_back(".bp");
 #endif
 
 #if openPMD_HAVE_HDF5

examples/8b_benchmark_read_parallel.cpp

@@ -198,8 +198,7 @@ std::vector<std::string> getBackends()
 {
     std::vector<std::string> res;
 #if openPMD_HAVE_ADIOS2
-    if (auxiliary::getEnvString("OPENPMD_BP_BACKEND", "NOT_SET") != "ADIOS1")
-        res.emplace_back(".bp");
+    res.emplace_back(".bp");
     if (auxiliary::getEnvString("OPENPMD_BENCHMARK_USE_BACKEND", "NOT_SET") ==
         "ADIOS")
         return res;

openPMDConfig.cmake.in

@@ -29,12 +29,6 @@ if(openPMD_HAVE_HDF5)
 endif()
 set(openPMD_HDF5_FOUND ${openPMD_HAVE_HDF5})
 
-set(openPMD_HAVE_ADIOS1 @openPMD_HAVE_ADIOS1@)
-if(openPMD_HAVE_ADIOS1)
-    find_dependency(ADIOS)
-endif()
-set(openPMD_ADIOS1_FOUND ${openPMD_HAVE_ADIOS1})
-
 set(openPMD_HAVE_ADIOS2 @openPMD_HAVE_ADIOS2@)
 if(openPMD_HAVE_ADIOS2)
     find_dependency(ADIOS2)

setup.py

@@ -61,10 +61,8 @@ def build_extension(self, ext):
             # static/shared libs
             '-DopenPMD_BUILD_SHARED_LIBS:BOOL=' + BUILD_SHARED_LIBS,
             '-DHDF5_USE_STATIC_LIBRARIES:BOOL=' + HDF5_USE_STATIC_LIBRARIES,
-            '-DADIOS_USE_STATIC_LIBS:BOOL=' + ADIOS_USE_STATIC_LIBS,
             # Unix: rpath to current dir when packaged
-            #       needed for shared (here non-default) builds and ADIOS1
-            #       wrapper libraries
+            #       needed for shared (here non-default) builds
             '-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON',
             '-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF',
             # Windows: has no RPath concept, all `.dll`s must be in %PATH%
@@ -129,7 +127,6 @@ def build_extension(self, ext):
 # note: changed default for SHARED, MPI, TESTING and EXAMPLES
 openPMD_USE_MPI = os.environ.get('openPMD_USE_MPI', 'OFF')
 HDF5_USE_STATIC_LIBRARIES = os.environ.get('HDF5_USE_STATIC_LIBRARIES', 'OFF')
-ADIOS_USE_STATIC_LIBS = os.environ.get('ADIOS_USE_STATIC_LIBS', 'OFF')
 # deprecated: backwards compatibility to <= 0.13.*
 BUILD_SHARED_LIBS = os.environ.get('BUILD_SHARED_LIBS', 'OFF')
 BUILD_TESTING = os.environ.get('BUILD_TESTING', 'OFF')