From 781547dcde64a8a2b871558e1e07e1287d918fbd Mon Sep 17 00:00:00 2001 From: William F Godoy Date: Wed, 10 Mar 2021 08:39:17 -0500 Subject: [PATCH 1/2] Fix some docs --- docs/user_guide/source/setting_up/package.rst | 5 ++--- docs/user_guide/source/setting_up/source/cmake.rst | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/user_guide/source/setting_up/package.rst b/docs/user_guide/source/setting_up/package.rst index 6b8f7a7586..3c7c7a8b41 100644 --- a/docs/user_guide/source/setting_up/package.rst +++ b/docs/user_guide/source/setting_up/package.rst @@ -23,6 +23,5 @@ ADIOS 2 is packaged in Spack `adios2 package `_ - +Docker images including building and installation of dependencies and ADIOS 2 containers for Ubuntu 20 and CentOS 7 can be found in: +under the directory `scripts/docker/ `_ diff --git a/docs/user_guide/source/setting_up/source/cmake.rst b/docs/user_guide/source/setting_up/source/cmake.rst index ded5b43230..0614803bfe 100644 --- a/docs/user_guide/source/setting_up/source/cmake.rst +++ b/docs/user_guide/source/setting_up/source/cmake.rst @@ -104,7 +104,7 @@ In addition to the ``ADIOS2_USE_Feature`` options, the following options are als ==================================== =============================================== =============================== ``BUILD_SHARED_LIBS`` **ON**/OFF Build shared libraries. ``ADIOS2_BUILD_EXAMPLES`` **ON**/OFF Build examples. -``ADIOS2_BUILD_TESTING`` **ON**/OFF Build test code. +``BUILD_TESTING`` **ON**/OFF Build test code. ``CMAKE_INSTALL_PREFIX`` /path/to/install (``/usr/local``) Installation location. ``CMAKE_BUILD_TYPE`` Debug/**Release**/RelWithDebInfo/MinSizeRel Compiler optimization levels. ==================================== =============================================== =============================== From bdc2a5bf381c5640a09a6ab962ac3729606a3bfa Mon Sep 17 00:00:00 2001 From: William F Godoy Date: Wed, 10 Mar 2021 11:45:25 -0500 Subject: [PATCH 2/2] Minor fixes in ReadMe --- ReadMe.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 6647ceb6ff..ce7a713c54 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -55,21 +55,19 @@ If you find ADIOS2 useful, please cite our [SoftwareX paper](https://doi.org/10. For a `cmake` configuration example see [scripts/runconf/runconf.sh](https://github.com/ornladios/ADIOS2/blob/master/scripts/runconf/runconf.sh) -* Conda packages: -* [https://anaconda.org/williamfgc](https://anaconda.org/williamfgc) +* Conda packages: * [https://anaconda.org/conda-forge/adios2](https://anaconda.org/conda-forge/adios2) * Spack: [adios2 package](https://spack.readthedocs.io/en/latest/package_list.html#adios2) -* Docker images: -* Ubuntu 18.04: under [scripts/docker/images/ubuntu18.04/Dockerfile](https://github.com/ornladios/ADIOS2/tree/master/scripts/docker/images/ubuntu18.04/Dockerfile) +* Docker images: under [scripts/docker](https://github.com/ornladios/ADIOS2/tree/master/scripts/docker) -Once ADIOS 2 is installed refer to: +Once ADIOS2 is installed refer to: -* [Linking ADIOS 2](https://adios2.readthedocs.io/en/latest/setting_up/setting_up.html#linking-adios-2) +* [Linking ADIO 2](https://adios2.readthedocs.io/en/latest/setting_up/setting_up.html#linking-adios-2) ## Releases