Skip to content

Commit

Permalink
Merge pull request #1160 from chuckatkins/bump-version
Browse files Browse the repository at this point in the history
Bump release version to 2.3.1
  • Loading branch information
Chuck Atkins authored Feb 20, 2019
2 parents 43d9cde + 9fa7768 commit 0e3695f
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
"separate from the source directory")
endif()

project(ADIOS2 VERSION 2.3.0)
project(ADIOS2 VERSION 2.3.1)
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
Expand Down
22 changes: 11 additions & 11 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6eeb5a8ac3e34d2599cfdea5bdc3390f)](https://www.codacy.com/app/chuckatkins/ADIOS2?utm_source=github.com&utm_medium=referral&utm_content=ornladios/ADIOS2&utm_campaign=Badge_Grade)


# Adaptable Input / Output System (ADIOS) v2.3.0
This is v2.3.0 of the ADIOS I/O system, developed as part of the
# Adaptable Input / Output System (ADIOS) v2.3.1
This is v2.3.1 of the ADIOS I/O system, developed as part of the
U.S. Department of Energy Exascale Computing Program.

## License
Expand Down Expand Up @@ -64,20 +64,20 @@ $ cd adios2
$ git clone https://github.com/ornladios/adios2.git source
$ mkdir build
$ cd build
$ cmake -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.3.0/gnu/openmpi ../source
$ cmake -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.3.1/gnu/openmpi ../source
-- The C compiler identification is GNU 7.3.0
-- The CXX compiler identification is GNU 7.3.0
...

ADIOS2 build configuration:
ADIOS Version: 2.3.0
ADIOS Version: 2.3.1
C++ Compiler : GNU 7.3.0
/opt/ohpc/pub/compiler/gcc/7.3.0/bin/g++

Fortran Compiler : GNU 7.3.0
/opt/ohpc/pub/compiler/gcc/7.3.0/bin/gfortran

Installation prefix: /opt/adios2/2.3.0/gnu/openmpi
Installation prefix: /opt/adios2/2.3.1/gnu/openmpi
bin: bin
lib: lib
include: include
Expand Down Expand Up @@ -165,15 +165,15 @@ $ make install
...
Install the project...
-- Install configuration: "Release"
-- Installing: /opt/adios2/2.3.0/gnu/openmpi/include/adios2/ADIOSConfig.h
-- Installing: /opt/adios2/2.3.1/gnu/openmpi/include/adios2/ADIOSConfig.h
...
-- Installing: /opt/adios2/2.3.0/gnu/openmpi/bin/adios2-config
-- Installing: /opt/adios2/2.3.1/gnu/openmpi/bin/adios2-config
...
-- Installing: /opt/adios2/2.3.0/gnu/openmpi/include/adios2.h
-- Installing: /opt/adios2/2.3.1/gnu/openmpi/include/adios2.h
...
-- Installing: /opt/adios2/2.3.0/gnu/openmpi/lib/libadios2.so.2.3.0
-- Installing: /opt/adios2/2.3.0/gnu/openmpi/lib/libadios2.so.2
-- Installing: /opt/adios2/2.3.0/gnu/openmpi/lib/libadios2.so
-- Installing: /opt/adios2/2.3.1/gnu/openmpi/lib/libadios2.so.2.3.1
-- Installing: /opt/adios2/2.3.1/gnu/openmpi/lib/libadios2.so.2
-- Installing: /opt/adios2/2.3.1/gnu/openmpi/lib/libadios2.so
...
$
```
2 changes: 1 addition & 1 deletion docs/api_doxygen/C/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = ADIOS2
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 2.3.0
PROJECT_NUMBER = 2.3.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion docs/api_doxygen/CXX11/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = ADIOS2
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 2.3.0
PROJECT_NUMBER = 2.3.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion docs/api_doxygen/Fortran/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = ADIOS2
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 2.3.0
PROJECT_NUMBER = 2.3.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
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.3.0'
release = u'2.3.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docs/user_guide/source/faq/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ ADIOS 2 default configuration on Titan is to build the static library. Python bi
-- Found PythonFull: /sw/titan/.swci/0-login/opt/spack/20180315/linux-suse_linux11-x86_64/gcc-4.3.4/python-2.7.9-v6ctjewwdx6k2qs7ublexz7gnx457jo5/bin/python2.7 found components: Interp Libs numpy mpi4py
...
ADIOS2 build configuration:
ADIOS Version: 2.3.0
ADIOS Version: 2.3.1
C++ Compiler : GNU 6.3.0 CrayPrgEnv
/opt/cray/craype/2.5.13/bin/CC
Expand Down
6 changes: 3 additions & 3 deletions docs/user_guide/source/installation/cmake.rst
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ To build ADIOS2:
-- Found MPI: TRUE (found version "3.1") found components: C
ADIOS2 build configuration:
ADIOS Version: 2.3.0
ADIOS Version: 2.3.1
C++ Compiler : GNU 7.3.0
/opt/ohpc/pub/compiler/gcc/7.3.0/bin/g++
Expand Down Expand Up @@ -418,12 +418,12 @@ In addition to the `ADIOS2_USE_Feature` options, the following options are also
`CMAKE_BUILD_TYPE` ``Debug``/Release/RelWithDebInfo/MinSizeRel Compiler optimization levels.
==================================== =============================================== ===============================
Example: the following configuration will build, test and install under /opt/adios2/2.3.0 an optimized (Release) version of ADIOS2.
Example: the following configuration will build, test and install under /opt/adios2/2.3.1 an optimized (Release) version of ADIOS2.
.. code-block:: bash
$ cd build
$ cmake -DADIOS2_USE_Fortran=ON -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.3.0 -DCMAKE_BUILD_Type=Release ../ADIOS2
$ cmake -DADIOS2_USE_Fortran=ON -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.3.1 -DCMAKE_BUILD_Type=Release ../ADIOS2
$ make -j16
$ ctest
$ make install
Expand Down
2 changes: 1 addition & 1 deletion docs/user_guide/source/using/using.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ If you're not using CMake then you can manually get the necessary compile and li
-isystem /path/to/install-prefix/include -isystem /opt/ohpc/pub/mpi/openmpi3-gnu7/3.1.0/include -pthread -std=gnu++11
$ /path/to/install-prefix/bin/adios2-config --cxxlibs
ADIOS2_DIR: /path/to/install-prefix
-Wl,-rpath,/path/to/install-prefix/lib:/opt/ohpc/pub/mpi/openmpi3-gnu7/3.1.0/lib /path/to/install-prefix/lib/libadios2.so.2.3.0 -pthread -Wl,-rpath -Wl,/opt/ohpc/pub/mpi/openmpi3-gnu7/3.1.0/lib -Wl,--enable-new-dtags -pthread /opt/ohpc/pub/mpi/openmpi3-gnu7/3.1.0/lib/libmpi.so -Wl,-rpath-link,/path/to/install-prefix/lib
-Wl,-rpath,/path/to/install-prefix/lib:/opt/ohpc/pub/mpi/openmpi3-gnu7/3.1.0/lib /path/to/install-prefix/lib/libadios2.so.2.3.1 -pthread -Wl,-rpath -Wl,/opt/ohpc/pub/mpi/openmpi3-gnu7/3.1.0/lib -Wl,--enable-new-dtags -pthread /opt/ohpc/pub/mpi/openmpi3-gnu7/3.1.0/lib/libmpi.so -Wl,-rpath-link,/path/to/install-prefix/lib

0 comments on commit 0e3695f

Please sign in to comment.