Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some docs #2645

Merged
merged 2 commits into from
Mar 10, 2021
Merged

Fix some docs #2645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
781547d
Fix some docs
williamfgc Mar 10, 2021
bdc2a5b
Minor fixes in ReadMe
williamfgc Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions docs/user_guide/source/setting_up/package.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ ADIOS 2 is packaged in Spack `adios2 package <https://spack.readthedocs.io/en/la
Docker
******

Docker images including building and installation of ADIOS 2 in a container:
* Ubuntu 18.04: under `scripts/docker/images/ubuntu/Dockerfile <https://github.com/ornladios/ADIOS2/tree/master/scripts/docker/images/ubuntu/Dockerfile>`_

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/ <https://github.com/ornladios/ADIOS2/tree/master/scripts/docker>`_
2 changes: 1 addition & 1 deletion docs/user_guide/source/setting_up/source/cmake.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
==================================== =============================================== ===============================
Expand Down