Skip to content

Commit

Permalink
Remove leftover mentions of ADIOS1
Browse files Browse the repository at this point in the history
We no longer support it, but some docs and code were still mentioning or specializing for it.
This commit removes all mentions.
  • Loading branch information
sbastrakov committed Sep 22, 2021
1 parent 85d3966 commit 3efa006
Show file tree
Hide file tree
Showing 13 changed files with 12 additions and 30 deletions.
2 changes: 1 addition & 1 deletion docs/TBG_macros.cfg
Expand Up @@ -172,7 +172,7 @@ TBG_transRad="--<species>_transRad.period 1000"
#--<species>_xrayScattering.n_qx Number of scattering vectors needed to be calculated in qx direction.
#--<species>_xrayScattering.n_qy Number of scattering vectors needed to be calculated in qy direction.
#--<species>_xrayScattering.file Output file name. Default is `<species>_xrayScatteringOutput`.
#--<species>_xrayScattering.ext `openPMD` filename extension. This controls the backend picked by the `openPMD` API. Default is `bp` for adios backend.
#--<species>_xrayScattering.ext `openPMD` filename extension. This controls the backend picked by the `openPMD` API. Default is `bp` for adios2 backend.
#--<species>_xrayScattering.memoryLayout Possible values: `mirror` and `split`. Output can be mirrored on all Host+Device pairs or uniformly split, in chunks, over all nodes.
TBG_<species>_xrayScattering="--<species>_xrayScattering.period 1 --e_xrayScattering.outputPeriod 10 \
--e_xrayScattering.n_qx 512 --e_xrayScattering.n_qy 512 \
Expand Down
7 changes: 0 additions & 7 deletions docs/source/install/libraryDependencies.dot
Expand Up @@ -27,12 +27,6 @@ digraph PIConGPU {
mpi -> hdf5;
zlib -> hdf5;

adios [label="ADIOS"];
mpi -> adios;
zlib -> adios;
hdf5 -> adios [style=dashed label="optional"];
fileSystem -> adios [style=dashed label="extra hints"];

adios2 [label="ADIOS2"];
mpi -> adios2;
zlib -> adios2;
Expand All @@ -42,7 +36,6 @@ digraph PIConGPU {

openpmd [label="openPMD API"];
adios2 -> openpmd [style=dashed label="optional"];
adios -> openpmd [style=dashed label="optional"];
hdf5 -> openpmd [style=dashed label="optional"];
nlohmann_json [label="nlohmann_json\n(header-only)\n(internall shipped\nby default)"];
nlohmann_json -> openpmd[style=dashed"]
Expand Down
2 changes: 1 addition & 1 deletion docs/source/postprocessing/python.rst
Expand Up @@ -61,7 +61,7 @@ Also provides an interactive GUI for fast exploration via Jupyter notebooks.
openPMD-api
-----------

A data library that reads (and writes) data in our openPMD files (ADIOS2, ADIOS and HDF5) to and from Numpy data structures.
A data library that reads (and writes) data in our openPMD files (ADIOS2 and HDF5) to and from Numpy data structures.
Provides an API to correctly convert units to SI, interprets iteration steps correctly, etc.

* `Manual <https://openpmd-api.readthedocs.io/>`_
Expand Down
5 changes: 2 additions & 3 deletions docs/source/usage/plugins/openPMD.rst
Expand Up @@ -43,9 +43,8 @@ The openPMD API will parse the file name to decide the chosen backend and iterat
In order to set defaults for these value, two further options control the filename:

* ``--openPMD.ext`` sets the filename extension.
Possible extensions include ``bp`` for the ADIOS2 backends (default), ``h5`` for HDF5 and ``sst`` for Streaming via ADIOS2/SST.
If the openPMD API has been built with support for the ADIOS1 and ADIOS2 backends, ADIOS2 will take precedence over ADIOS1.
This behavior can be overridden by setting the environment variable ``OPENPMD_BP_BACKEND=ADIOS1``.
Possible extensions include ``bp`` for the ADIOS2 backend (default), ``h5`` for HDF5 and ``sst`` for Streaming via ADIOS2/SST.
In case your openPMD API supports both ADIOS1 and ADIOS2, make sure that environment variable ``OPENPMD_BP_BACKEND`` is not set to ADIOS1.
* ``--openPMD.infix`` sets the filename pattern that controls the iteration layout, default is "_06T" for a six-digit number specifying the iteration.
Leave empty to pick group-based iteration layout.
Since passing an empty string may be tricky in some workflows, specifying ``--openPMD.infix=NULL`` is also possible.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/usage/plugins/xrayScattering.rst
Expand Up @@ -106,7 +106,7 @@ Command line option Description

``--<species>_xrayScattering.file`` Output file name. Default is `<species>_xrayScatteringOutput`.

``--<species>_xrayScattering.ext`` `openPMD` filename extension. This controls the backend picked by the `openPMD` API. Default is `bp` for adios backend.
``--<species>_xrayScattering.ext`` `openPMD` filename extension. This controls the backend picked by the `openPMD` API. Default is `bp` for adios2 backend.

``--<species>_xrayScattering.memoryLayout`` Possible values: `mirror` and `split`. Output can be mirrored on all Host+Device pairs or uniformly split, in chunks, over all nodes.
Use split when the output array is too big to store the complete computed q-space on one device.
Expand Down
2 changes: 1 addition & 1 deletion etc/picongpu/juwels-jsc/booster_picongpu.profile.example
Expand Up @@ -63,7 +63,7 @@ export LD_LIBRARY_PATH=$PNGwriter_DIR/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$ADIOS2_ROOT/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$OPENPMD_ROOT/lib64:$LD_LIBRARY_PATH

export PATH=$ADIOS_ROOT/bin:$PATH
export PATH=$ADIOS2_ROOT/bin:$PATH

export CMAKE_PREFIX_PATH=$ZLIB_ROOT:$CMAKE_PREFIX_PATH

Expand Down
2 changes: 1 addition & 1 deletion include/picongpu/plugins/Checkpoint.hpp
Expand Up @@ -77,7 +77,7 @@ namespace picongpu
{
namespace po = boost::program_options;
if(ioBackendsHelp.empty())
desc.add_options()("checkpoint", "plugin disabled [compiled without dependency HDF5 or Adios]");
desc.add_options()("checkpoint", "plugin disabled [compiled without dependency HDF5 or ADIOS2]");
else
desc.add_options()(
"checkpoint.backend",
Expand Down
2 changes: 1 addition & 1 deletion include/picongpu/plugins/PluginController.hpp
Expand Up @@ -70,7 +70,7 @@
#endif

#if((ENABLE_OPENPMD == 1) && (openPMD_HAVE_HDF5 == 1))
// needs to be openPMD-api only in the future to support adios
// needs to be openPMD-api only in the future to support adios2
# include "picongpu/plugins/radiation/Radiation.hpp"
# include "picongpu/plugins/radiation/VectorTypes.hpp"
#endif
Expand Down
2 changes: 1 addition & 1 deletion include/picongpu/plugins/openPMD/Json_private.hpp
Expand Up @@ -268,6 +268,6 @@ namespace picongpu
std::string getDefault() const override;
};

std::vector<std::string> const JsonMatcher::m_recognizedBackends = {"adios1", "adios2", "hdf5", "json"};
std::vector<std::string> const JsonMatcher::m_recognizedBackends = {"adios2", "hdf5", "json"};
} // namespace json
} // namespace picongpu
5 changes: 2 additions & 3 deletions include/picongpu/plugins/openPMD/openPMDWriter.hpp
Expand Up @@ -151,9 +151,8 @@ namespace picongpu
throw std::runtime_error(R"END(
Using ADIOS1 through PIConGPU's openPMD plugin is not supported.
Please use the openPMD plugin with another backend, such as ADIOS2.
If the openPMD API has been compiled with support for ADIOS2, the openPMD API
will automatically prefer using ADIOS2 over ADIOS1.
Make sure that environment variable OPENPMD_BP_BACKEND is not set to ADIOS1.
In case your openPMD API supports both ADIOS1 and ADIOS2,
make sure that environment variable OPENPMD_BP_BACKEND is not set to ADIOS1.
)END");
}
if(at == ::openPMD::Access::CREATE)
Expand Down
2 changes: 1 addition & 1 deletion include/picongpu/plugins/radiation/Radiation.hpp
Expand Up @@ -666,7 +666,7 @@ namespace picongpu
void writeOpenPMDfile(std::vector<Amplitude>& values, std::string name)
{
std::ostringstream filename;
// TODO: needs to be changed to ".h5" and also support adios
// TODO: needs to be changed to ".h5" and also support adios2
filename << name << "%T_0_0_0.h5";

::openPMD::Series openPMDdataFile = ::openPMD::Series(filename.str(), ::openPMD::Access::CREATE);
Expand Down
Expand Up @@ -163,15 +163,6 @@ namespace picongpu
}

private:
HINLINE bool isADIOS1() const
{
#if openPMD_HAVE_ADIOS1 && !openPMD_HAVE_ADIOS2
return this->fileExtension == "bp";
#else
return false;
#endif
}

/** Opens an openPMD Series in a given access mode.
*
* @param at OpenPMD API access type.
Expand Down
Binary file modified libraryDependencies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3efa006

Please sign in to comment.