From eba1b1361f2719407669effed9c90c19f846df51 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Wed, 1 Nov 2023 15:58:44 -0400 Subject: [PATCH 1/2] ci: update number of task for mpich build --- scripts/ci/cmake-v2/ci-el8-gcc10-mpich.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/ci/cmake-v2/ci-el8-gcc10-mpich.cmake b/scripts/ci/cmake-v2/ci-el8-gcc10-mpich.cmake index 5ce2313669..49089e515b 100644 --- a/scripts/ci/cmake-v2/ci-el8-gcc10-mpich.cmake +++ b/scripts/ci/cmake-v2/ci-el8-gcc10-mpich.cmake @@ -2,7 +2,6 @@ include(ProcessorCount) ProcessorCount(NCPUS) -math(EXPR N2CPUS "${NCPUS}*2") set(ENV{CC} gcc) set(ENV{CXX} g++) @@ -24,7 +23,7 @@ CMAKE_C_FLAGS:STRING=-Wall CMAKE_CXX_FLAGS:STRING=-Wall CMAKE_Fortran_FLAGS:STRING=-Wall -MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS} +MPIEXEC_MAX_NUMPROCS:STRING=${NCPUS} ") set(CTEST_CMAKE_GENERATOR "Ninja") From 8a37929d81c885864b64e454ce039e2bda324887 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Wed, 1 Nov 2023 14:45:12 -0400 Subject: [PATCH 2/2] Bump version to v2.9.2 --- CMakeLists.txt | 2 +- ReadMe.md | 2 +- docs/user_guide/source/conf.py | 2 +- docs/user_guide/source/setting_up/source/cmake.rst | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3fffc9bd3..03337b6a7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/cmake/ADIOSFunctions.cmake) -setup_version(2.9.1) +setup_version(2.9.2) project(ADIOS2 VERSION ${ADIOS2_VERSION}) diff --git a/ReadMe.md b/ReadMe.md index 95bb71adfd..49a962256c 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -72,7 +72,7 @@ Once ADIOS2 is installed refer to: ## Releases -* Latest release: [v2.9.1](https://github.com/ornladios/ADIOS2/releases/tag/v2.9.1) +* Latest release: [v2.9.2](https://github.com/ornladios/ADIOS2/releases/tag/v2.9.2) * Previous releases: [https://github.com/ornladios/ADIOS2/releases](https://github.com/ornladios/ADIOS2/releases) diff --git a/docs/user_guide/source/conf.py b/docs/user_guide/source/conf.py index 50ff5156fb..ccc829449b 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.9.1' +release = u'2.9.2' # 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 5c460a880b..90b11502e1 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.13.0 ../ADIOS2 -Example: the following configuration will build, test and install under /opt/adios2/2.9.1 an optimized (Release) version of ADIOS2. +Example: the following configuration will build, test and install under /opt/adios2/2.9.2 an optimized (Release) version of ADIOS2. .. code-block:: bash $ cd build - $ cmake -DADIOS2_USE_Fortran=ON -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.9.1 -DCMAKE_BUILD_Type=Release ../ADIOS2 + $ cmake -DADIOS2_USE_Fortran=ON -DCMAKE_INSTALL_PREFIX=/opt/adios2/2.9.2 -DCMAKE_BUILD_Type=Release ../ADIOS2 $ make -j16 $ ctest $ make install