diff --git a/CMakeLists.txt b/CMakeLists.txt index 776162380f..76e0e8fbae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/cmake/ADIOSFunctions.cmake) -setup_version(2.6.0) +setup_version(2.7.0) project(ADIOS2 VERSION ${ADIOS2_VERSION}) diff --git a/ReadMe.md b/ReadMe.md index 3e0d303a19..661ec2fd66 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -74,7 +74,7 @@ Once ADIOS 2 is installed refer to: ## Releases -* Latest release: [v2.6.0](https://github.com/ornladios/ADIOS2/releases/tag/v2.6.0) +* Latest release: [v2.7.0](https://github.com/ornladios/ADIOS2/releases/tag/v2.7.0) * Previous releases: [https://github.com/ornladios/ADIOS2/releases](https://github.com/ornladios/ADIOS2/releases) diff --git a/docs/user_guide/source/components/runtime.rst b/docs/user_guide/source/components/runtime.rst index d79398f976..a4f8373941 100644 --- a/docs/user_guide/source/components/runtime.rst +++ b/docs/user_guide/source/components/runtime.rst @@ -7,7 +7,7 @@ ADIOS2 supports passing an optional runtime configuration file to the :ref:`ADIO This file contains key-value pairs equivalent to the compile time ``IO::SetParameters`` (``adios2_set_parameter`` in C, Fortran), and ``IO::AddTransport`` (``adios2_set_transport_parameter`` in C, Fortran). Each ``Engine`` and ``Operator`` must provide a set of available parameters as described in the :ref:`Supported Engines` section. -Up to version v2.6.0 only XML is supported, v2.6.0 and beyond support XML as well as YAML. +Up to version v2.7.0 only XML is supported, v2.7.0 and beyond support XML as well as YAML. .. warning:: @@ -51,7 +51,7 @@ XML YAML ---- -Starting with v2.6.0, ADIOS supports YAML configuration files. +Starting with v2.7.0, ADIOS supports YAML configuration files. The syntax follows strict use of the YAML node keywords mapping to the ADIOS2 components hierarchy. If a keyword is unknown ADIOS2 simply ignores it. For an example file refer to `adios2 config file example in our repo. `_ diff --git a/docs/user_guide/source/conf.py b/docs/user_guide/source/conf.py index 950cdfc325..a1b4c15245 100644 --- a/docs/user_guide/source/conf.py +++ b/docs/user_guide/source/conf.py @@ -76,7 +76,7 @@ # The short X.Y version. version = u'2' # The full version, including alpha/beta/rc tags. -release = u'2.6.0' +release = u'2.7.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/user_guide/source/setting_up/source/cmake.rst b/docs/user_guide/source/setting_up/source/cmake.rst index d988189653..a3cafe80a8 100644 --- a/docs/user_guide/source/setting_up/source/cmake.rst +++ b/docs/user_guide/source/setting_up/source/cmake.rst @@ -132,12 +132,12 @@ Notes: $ export CMAKE_PREFIX_PATH=/opt/foo/bar $ cmake -DHDF5_ROOT=/opt/hdf5/1.12.0 ../ADIOS2 -Example: the following configuration will build, test and install under /opt/adios2/2.6.0 an optimized (Release) version of ADIOS2. +Example: the following configuration will build, test and install under /opt/adios2/2.7.0 an optimized (Release) version of ADIOS2. .. code-block:: bash $ cd build - $ cmake -DADIOS2_USE_Fortran=ON -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.6.0 -DCMAKE_BUILD_Type=Release ../ADIOS2 + $ cmake -DADIOS2_USE_Fortran=ON -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.7.0 -DCMAKE_BUILD_Type=Release ../ADIOS2 $ make -j16 $ ctest $ make install diff --git a/scripts/docker/images/centos8/Dockerfile b/scripts/docker/images/centos8/Dockerfile index 6451042e0c..01e3af8cb9 100644 --- a/scripts/docker/images/centos8/Dockerfile +++ b/scripts/docker/images/centos8/Dockerfile @@ -11,9 +11,9 @@ # Modify at your convenience. # # Usage examples: -# ADIOS v2.6.0 on CentOS 8 +# ADIOS v2.7.0 on CentOS 8 # $ cd /path/to/adios2-src/scripts/docker/images -# $ docker build -t adios2:2.6.0-centos8 --build-arg adios_ver=v2.6.0 centos8 +# $ docker build -t adios2:2.7.0-centos8 --build-arg adios_ver=v2.7.0 centos8 ############################################################################### FROM centos:centos8 diff --git a/scripts/docker/images/ubuntu/Dockerfile b/scripts/docker/images/ubuntu/Dockerfile index e4b7a6c11e..1979b81a07 100644 --- a/scripts/docker/images/ubuntu/Dockerfile +++ b/scripts/docker/images/ubuntu/Dockerfile @@ -16,9 +16,9 @@ # $ cd /path/to/adios2-src/scripts/docker/images # $ docker build -f ubuntu/Dockerfile -t adios2:master-ubuntu1804 # -# ADIOS v2.6.0 on Ubuntu 19.10 +# ADIOS v2.7.0 on Ubuntu 19.10 # $ cd /path/to/adios2-src/scripts/docker/images -# $ docker build -f ubuntu/Dockerfile -t adios2:2.6.0-ubuntu1910 --build-arg ubuntu_ver=19.10 --build-arg adios_ver=v2.6.0 +# $ docker build -f ubuntu/Dockerfile -t adios2:2.7.0-ubuntu1910 --build-arg ubuntu_ver=19.10 --build-arg adios_ver=v2.7.0 ############################################################################### ARG ubuntu_ver=18.04