Skip to content

Commit

Permalink
Merge branch 'release_27'
Browse files Browse the repository at this point in the history
* release_27:
  Bump version to 2.7.1
  • Loading branch information
Chuck Atkins committed Feb 9, 2021
2 parents f891832 + 94c2e37 commit b5f8897
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ endif()

include(${CMAKE_CURRENT_LIST_DIR}/cmake/ADIOSFunctions.cmake)

setup_version(2.7.0)
setup_version(2.7.1)

project(ADIOS2 VERSION ${ADIOS2_VERSION})

Expand Down
2 changes: 1 addition & 1 deletion ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Once ADIOS 2 is installed refer to:

## Releases

* Latest release: [v2.7.0](https://github.com/ornladios/ADIOS2/releases/tag/v2.7.0)
* Latest release: [v2.7.1](https://github.com/ornladios/ADIOS2/releases/tag/v2.7.1)

* Previous releases: [https://github.com/ornladios/ADIOS2/releases](https://github.com/ornladios/ADIOS2/releases)

Expand Down
4 changes: 2 additions & 2 deletions docs/user_guide/source/components/runtime.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0 only XML is supported, v2.7.0 and beyond support XML as well as YAML.
Up to version v2.7.1 only XML is supported, v2.7.1 and beyond support XML as well as YAML.

.. warning::

Expand Down Expand Up @@ -51,7 +51,7 @@ XML
YAML
----

Starting with v2.7.0, ADIOS supports YAML configuration files.
Starting with v2.7.1, 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. <https://github.com/ornladios/ADIOS2/tree/master/testing/adios2/yaml/proto.yaml>`_
Expand Down
2 changes: 1 addition & 1 deletion docs/user_guide/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
# The short X.Y version.
version = u'2'
# The full version, including alpha/beta/rc tags.
release = u'2.7.0'
release = u'2.7.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions docs/user_guide/source/setting_up/source/cmake.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0 an optimized (Release) version of ADIOS2.
Example: the following configuration will build, test and install under /opt/adios2/2.7.1 an optimized (Release) version of ADIOS2.

.. code-block:: bash
$ cd build
$ cmake -DADIOS2_USE_Fortran=ON -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.7.0 -DCMAKE_BUILD_Type=Release ../ADIOS2
$ cmake -DADIOS2_USE_Fortran=ON -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.7.1 -DCMAKE_BUILD_Type=Release ../ADIOS2
$ make -j16
$ ctest
$ make install
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/images/centos8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
# Modify at your convenience.
#
# Usage examples:
# ADIOS v2.7.0 on CentOS 8
# ADIOS v2.7.1 on CentOS 8
# $ cd /path/to/adios2-src/scripts/docker/images
# $ docker build -t adios2:2.7.0-centos8 --build-arg adios_ver=v2.7.0 centos8
# $ docker build -t adios2:2.7.1-centos8 --build-arg adios_ver=v2.7.1 centos8
###############################################################################

FROM centos:centos8
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/images/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
# $ cd /path/to/adios2-src/scripts/docker/images
# $ docker build -f ubuntu/Dockerfile -t adios2:master-ubuntu1804
#
# ADIOS v2.7.0 on Ubuntu 19.10
# ADIOS v2.7.1 on Ubuntu 19.10
# $ cd /path/to/adios2-src/scripts/docker/images
# $ docker build -f ubuntu/Dockerfile -t adios2:2.7.0-ubuntu1910 --build-arg ubuntu_ver=19.10 --build-arg adios_ver=v2.7.0
# $ docker build -f ubuntu/Dockerfile -t adios2:2.7.1-ubuntu1910 --build-arg ubuntu_ver=19.10 --build-arg adios_ver=v2.7.1
###############################################################################

ARG ubuntu_ver=18.04
Expand Down

0 comments on commit b5f8897

Please sign in to comment.