From 48ece48a226d834df7cbad26e6461755d3846d55 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 17 Aug 2021 21:26:06 -0700 Subject: [PATCH] openPMD-api: 0.14.2 Update to the next major release of openPMD-api. Changelog: https://openpmd-api.readthedocs.io/en/0.14.2/install/changelog.html Upgrade Guide: https://openpmd-api.readthedocs.io/en/0.14.2/install/upgrade.html --- cmake/dependencies/AMReX.cmake | 2 +- cmake/dependencies/openPMD.cmake | 6 +++--- docs/source/building/building.rst | 30 +++++++++++++++--------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 7a2368e853..2f64a96e33 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -118,7 +118,7 @@ macro(find_amrex) mark_as_advanced(AMReX_FPE) mark_as_advanced(AMReX_FORTRAN) mark_as_advanced(AMReX_FORTRAN_INTERFACES) - mark_as_advanced(AMReX_HDF5) # we will do HDF5 I/O (and more) via openPMD-api + mark_as_advanced(AMReX_HDF5) # we do HDF5 I/O (and more) via openPMD-api mark_as_advanced(AMReX_LINEAR_SOLVERS) mark_as_advanced(AMReX_MEM_PROFILE) mark_as_advanced(AMReX_MPI) diff --git a/cmake/dependencies/openPMD.cmake b/cmake/dependencies/openPMD.cmake index 44240e3384..7f26f21f9f 100644 --- a/cmake/dependencies/openPMD.cmake +++ b/cmake/dependencies/openPMD.cmake @@ -10,7 +10,7 @@ function(find_openpmd) if(HiPACE_openpmd_internal OR HiPACE_openpmd_src) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) - # see https://openpmd-api.readthedocs.io/en/0.13.1-alpha/dev/buildoptions.html + # see https://openpmd-api.readthedocs.io/en/0.14.2/dev/buildoptions.html set(openPMD_USE_MPI ${HiPACE_MPI} CACHE INTERNAL "") set(openPMD_USE_PYTHON OFF CACHE INTERNAL "") set(openPMD_BUILD_CLI_TOOLS OFF CACHE INTERNAL "") @@ -65,7 +65,7 @@ function(find_openpmd) else() set(COMPONENT_WMPI NOMPI) endif() - find_package(openPMD 0.13.0 CONFIG REQUIRED COMPONENTS ${COMPONENT_WMPI}) + find_package(openPMD 0.14.2 CONFIG REQUIRED COMPONENTS ${COMPONENT_WMPI}) message(STATUS "openPMD-api: Found version '${openPMD_VERSION}'") endif() endfunction() @@ -81,7 +81,7 @@ if(HiPACE_OPENPMD) set(HiPACE_openpmd_repo "https://github.com/openPMD/openPMD-api.git" CACHE STRING "Repository URI to pull and build openPMD-api from if(HiPACE_openpmd_internal)") - set(HiPACE_openpmd_branch "ac083025ee662469b8cad1adf93eef48cde35f58" + set(HiPACE_openpmd_branch "0.14.2" CACHE STRING "Repository branch for HiPACE_openpmd_repo if(HiPACE_openpmd_internal)") diff --git a/docs/source/building/building.rst b/docs/source/building/building.rst index 7cc1b14162..925e24532a 100644 --- a/docs/source/building/building.rst +++ b/docs/source/building/building.rst @@ -32,10 +32,10 @@ Please see installation instructions below in the Developers section. - a mature `C++14 `__ compiler: e.g. GCC 5, Clang 3.6 or newer - `CMake 3.15.0+ `__ - `AMReX development `__: we automatically download and compile a copy of AMReX -- `openPMD-api dev `__: we automatically download and compile a copy of openPMD-api +- `openPMD-api 0.14.2+ `__: we automatically download and compile a copy of openPMD-api - `HDF5 `__ 1.8.13+ (optional; for ``.h5`` file support) - - `ADIOS2 `__ 2.6.0+ (optional; for ``.bp`` file support) + - `ADIOS2 `__ 2.7.0+ (optional; for ``.bp`` file support) - Nvidia GPU support: `CUDA Toolkit 9.0+ `__ (see `matching host-compilers `__) - CPU-only: `FFTW3 `__ (only used serially; *not* needed for Nvidia GPUs) @@ -171,19 +171,19 @@ HiPACE++ can be configured in further detail with options from AMReX, which are **Developers** might be interested in additional options that control dependencies of HiPACE++. By default, the most important dependencies of HiPACE++ are automatically downloaded for convenience: -=========================== ============================================= ============================================================ -CMake Option Default & Values Description ---------------------------- --------------------------------------------- ------------------------------------------------------------ -``HiPACE_amrex_src`` *None* Path to AMReX source directory (preferred if set) -``HiPACE_amrex_repo`` `https://github.com/AMReX-Codes/amrex.git` Repository URI to pull and build AMReX from -``HiPACE_amrex_branch`` ``development`` Repository branch for ``HiPACE_amrex_repo`` -``HiPACE_amrex_internal`` **ON**/OFF Needs a pre-installed AMReX library if set to ``OFF`` -``HiPACE_openpmd_src`` *None* Path to openPMD-api source directory (preferred if set) -``HiPACE_openpmd_repo`` `https://github.com/openPMD/openPMD-api.git` Repository URI to pull and build openPMD-api from -``HiPACE_openpmd_branch`` `0.13.2` Repository branch for ``HiPACE_openpmd_repo`` -``HiPACE_openpmd_internal`` **ON**/OFF Needs a pre-installed openPMD-api library if set to ``OFF`` -``AMReX_LINEAR_SOLVERS`` **ON**/OFF Compile AMReX multigrid solver. Required for explicit solver -=========================== ============================================= ============================================================ +=========================== ============================================== ============================================================ +CMake Option Default & Values Description +--------------------------- ---------------------------------------------- ------------------------------------------------------------ +``HiPACE_amrex_src`` *None* Path to AMReX source directory (preferred if set) +``HiPACE_amrex_repo`` ``https://github.com/AMReX-Codes/amrex.git`` Repository URI to pull and build AMReX from +``HiPACE_amrex_branch`` ``development`` Repository branch for ``HiPACE_amrex_repo`` +``HiPACE_amrex_internal`` **ON**/OFF Needs a pre-installed AMReX library if set to ``OFF`` +``HiPACE_openpmd_src`` *None* Path to openPMD-api source directory (preferred if set) +``HiPACE_openpmd_repo`` ``https://github.com/openPMD/openPMD-api.git`` Repository URI to pull and build openPMD-api from +``HiPACE_openpmd_branch`` ``0.14.2`` Repository branch for ``HiPACE_openpmd_repo`` +``HiPACE_openpmd_internal`` **ON**/OFF Needs a pre-installed openPMD-api library if set to ``OFF`` +``AMReX_LINEAR_SOLVERS`` **ON**/OFF Compile AMReX multigrid solver. Required for explicit solver +=========================== ============================================== ============================================================ For example, one can also build against a local AMReX copy. Assuming AMReX' source is located in ``$HOME/src/amrex``, add the ``cmake`` argument ``-DHiPACE_amrex_src=$HOME/src/amrex``.