Skip to content

Commit 695eecd

Browse files
authored
Merge pull request #949 from dapomeroy/update_documentation
Fix documentation issues
2 parents bec0235 + dcbd249 commit 695eecd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+233
-202
lines changed

lib/ramble/docs/conf.py

+16-1
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,28 @@ def setup(sphinx):
196196
# Python classes that intersphinx is unable to resolve
197197
("py:class", "argparse.HelpFormatter"),
198198
("py:class", "contextlib.contextmanager"),
199+
("py:class", "func"),
199200
("py:class", "module"),
200201
("py:class", "_io.BufferedReader"),
202+
("py:class", "ramble.repository._PrependFileLoader"),
201203
("py:class", "unittest.case.TestCase"),
202204
("py:class", "_frozen_importlib_external.SourceFileLoader"),
203205
("py:class", "clingo.Control"),
204-
("py:class", "six.moves.urllib.parse.ParseResult"),
205206
("py:class", "TextIO"),
207+
("py:class", "llnl.util.argparsewriter.ArgparseCompletionWriter"),
208+
("py:class", "llnl.util.argparsewriter.ArgparseRstWriter"),
209+
("py:class", "llnl.util.argparsewriter.ArgparseWriter"),
210+
("py:class", "llnl.util.lock.Lock"),
211+
("py:class", "pandas.core.frame.DataFrame"),
212+
("py:class", "spack.environment.Environment"),
213+
("py:class", "spack.error.SpackError"),
214+
("py:class", "spack.error.SpecError"),
215+
("py:class", "spack.parse.Lexer"),
216+
("py:class", "spack.parse.Parser"),
217+
("py:class", "spack.package.Package"),
218+
("py:class", "spack.util.environment.EnvironmentModifications"),
219+
("py:class", "spack.util.executable.Executable"),
220+
("py:class", "spack.util.pattern.Composite"),
206221
]
207222

208223
# The reST default role (used for this markup: `text`) to use for all documents.

lib/ramble/docs/configuration_files.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Upload
213213

214214
Ramble aims to support the upload of experiment outcomes (including FOMs), to
215215
SQL-like datastores. To do this we can specify an ``upload:type`` as defined by
216-
:mod:`ramble.experimental.uploader.Upload`, and a ``upload:uri`` to specify the
216+
:mod:`ramble.experimental.uploader.uploader_types`, and a ``upload:uri`` to specify the
217217
destination.
218218

219219
As part of the upload it tries to attribute the data to a user. This can be
@@ -534,9 +534,9 @@ be searched for when looking for application definitions. Its format is as follo
534534
535535
.. _software-config:
536536

537-
--------------
537+
-----------------
538538
Software Section:
539-
--------------
539+
-----------------
540540

541541
The software config section is used to define package definitions, and software
542542
environments created from those packages. Its format is as follows:

lib/ramble/docs/dev_guides/advanced_topics.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ types supported in Ramble.
2424

2525
.. _ramble-pipelines-and-phases:
2626

27-
------------------------------
27+
-------------------------------
2828
Experiment Pipelines and Phases
29-
------------------------------
29+
-------------------------------
3030

3131
Ramble has a concept of ``pipeline``, which represent full actions that can
3232
be taken on a workspace. Some of the common ``pipelines`` that are used are the

lib/ramble/docs/dev_guides/modifier_dev_guide.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This guide will provide general steps for creating a new modifier definition fil
2323
**NOTE:** Modifiers are considered a more advanced feature of Ramble. Writing a
2424
new modifier definition file in Ramble largely follows the same workflow as
2525
writing an application definition file, although the intent and behavior are
26-
different. It is recommended that you review :ref:`application-def-guide`
26+
different. It is recommended that you review :ref:`application-dev-guide`
2727
before writing a modifier.
2828

2929
-----------

lib/ramble/docs/dev_guides/package_manager_dev_guide.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ definition file.
2727
Writing a new pcakage manager definition file in Ramble largely follows the
2828
same workflow as writing an application definition file, although the intent
2929
and behavior are different. It is recommended that you review
30-
:ref:`application-def-guide` before writing a modifier.
30+
:ref:`application-dev-guide` before writing a modifier.
3131

3232
-----------
3333
Preparation

lib/ramble/docs/index.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,20 @@ If you're new to Ramble and want to start using it, see :doc:`getting_started`.
2222
:maxdepth: 2
2323
:caption: Basics
2424

25-
ramble
2625
getting_started
2726
configuration_files
2827
workspace
2928
workspace_config
3029
package_managers
3130
success_criteria
31+
results
32+
mirror_config
3233

3334
.. toctree::
3435
:maxdepth: 2
3536
:caption: Reference
3637

38+
ramble
3739
command_index
3840

3941
.. toctree::
File renamed without changes.

lib/ramble/docs/package_managers.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
except according to those terms.
88
99
10-
.. _package_manager_control:
10+
.. _package-manager-control:
1111

1212
================
1313
Package Managers
@@ -113,7 +113,7 @@ determine what packages to install within the resulting virtual environment.
113113
The use of this package manager requires ``pip`` to be installed outside of
114114
Ramble. This happens automatically in several Python installations. For more
115115
information see
116-
`pip's documentation<https://pip.pypa.io/en/stable/installation/>`_.
116+
`pip's documentation <https://pip.pypa.io/en/stable/installation/>`_.
117117

118118
^^^^^^^^^^^^^^^^^^^^^
119119
Spack Package Manager

lib/ramble/docs/requirements.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@ sphinx_rtd_theme
44
sphinxcontrib-programoutput
55
sphinxcontrib-jquery
66
sphinx-copybutton
7-
tdqm
7+
tqdm
88
deprecation
9+
pytest
10+
pandas
11+
matplotlib

lib/ramble/docs/results.rst

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
option. This file may not be copied, modified, or distributed
77
except according to those terms.
88
9-
.. _workspace:
9+
.. _results:
1010

11-
================
11+
==============
1212
Ramble Results
13-
================
13+
==============
1414

1515
Ramble provides support and tooling around processing results data.
1616

@@ -20,9 +20,9 @@ Most notably, the two supported functionalities are:
2020
* Uploading of stand alone JSON in ramble-output format
2121
* Generation of plots and analysis as part of a report
2222

23-
-------------------
23+
------
2424
Upload
25-
-------------------
25+
------
2626

2727
The ``ramble results upload`` command is used to import experiment results from
2828
a JSON file, and upload them as specified in the upload block of Ramble's
@@ -31,9 +31,9 @@ config file (see :ref:`config documentation<upload-config-option>`).
3131
This can be used for both results from an arbitrary ramble workspace, or for
3232
data that is generated by tools which conform to rambles data schema.
3333

34-
-------------------
34+
------
3535
Report
36-
-------------------
36+
------
3737
The ``ramble results report`` command is experimental functionality that provides
3838
the user a way to generate plots and reports from the output of a workspace.
3939
This output is in the form of individual `png` plots, and a combined `pdf`
@@ -47,9 +47,9 @@ Multiple plot types are supported, to aid in comparison of runs and common tasks
4747
For these plots, common operations are supported such as log axis, data
4848
grouping, and idealized line plotting.
4949

50-
^^^^^^^^^^^^^^^
50+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5151
Strong and Weak Scaling Plots
52-
^^^^^^^^^^^^^^^
52+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5353

5454
Activated by either the ``strong-scaling`` or ``weak-scaling`` subcommand, these plots generate a line plot and attempt to annotate idealized scaling based on the data input.
5555

@@ -73,9 +73,9 @@ Another common use case might be to plot data by context (such as in OMB), which
7373
7474
Other compelling options include ``-n`` to normalize the plot y values, or ``--logx``/``--logy`` for log axes.
7575

76-
^^^^^^^^^^^^^^^^^^^
76+
^^^^^^^^^^^^^^^^^^^^^^^^
7777
Comparison and FOM plots
78-
^^^^^^^^^^^^^^^^^^^
78+
^^^^^^^^^^^^^^^^^^^^^^^^
7979

8080
A comparison plot compares a specific FOM across all valid experiments, and generates a bar plot with one bar per experiment. It can be invoked by:
8181

lib/ramble/docs/success_criteria.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ The above example shows the full interface for defining success criteria with
116116
* ``fom_context``: (Optional) The context ``fom_name`` should exist in. Defaults to ``null``.
117117

118118
Both ``fom_name`` and ``fom_context`` support
119-
`python style globbing<https://docs.python.org/3/library/fnmatch.html>`_.
119+
`python style globbing <https://docs.python.org/3/library/fnmatch.html>`_.
120120

121121
When using the globbing functionality, all contexts that match the
122122
``fom_context`` argument are searched. Within each context, all FOMs that match

lib/ramble/docs/tutorials/10_using_modifiers.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ experiment run directories to see what changed after applying the ``lscpu``
145145
modifier.
146146

147147
Advanced Modifiers
148-
-----------------
148+
------------------
149149

150150
Some modifiers have additional functionality, which can include requiring
151151
specific software packages to be present. An example of this is the

lib/ramble/docs/tutorials/3_modifying_a_gromacs_experiment.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
option. This file may not be copied, modified, or distributed
77
except according to those terms.
88
9-
.. _modifying_an_experiment_tutorial:
9+
.. _modifying_a_gromacs_experiment_tutorial:
1010

1111
=======================================
1212
3) Modifying A GROMACS Experiment
@@ -203,7 +203,7 @@ This command opens the ``ramble.yaml`` file, along with any ``*.tpl`` files in
203203
the workspace's ``configs`` directory. The root directory of the workspace can
204204
be seen in the ``Location`` attribute output from:
205205

206-
.. code-blocks:: console
206+
.. code-block:: console
207207
208208
$ ramble workspace info
209209

lib/ramble/docs/tutorials/5_changing_your_software_stack.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
option. This file may not be copied, modified, or distributed
77
except according to those terms.
88
9-
.. _modifying_an_experiment_tutorial:
9+
.. _changing_a_software_stack_tutorial:
1010

1111
============================
1212
5) Changing A Software Stack

lib/ramble/docs/tutorials/7_using_zips_and_matrices.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Your final configuration file should look something like:
165165
.. include:: shared/wrf_execute.rst
166166

167167
**NOTE** Some of these experiments can take a while to execute. Experiments can
168-
be filtered using the :ref:`--where<filter-experiments>`` option to execute the
168+
be filtered using the :ref:`--where <filter-experiments>` option to execute the
169169
higher scale experiments if desired. To do this, try:
170170

171171
.. code-block:: console

lib/ramble/docs/tutorials/shared/gromacs_vector_workspace.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ contents of ``$RAMBLE_ROOT/examples/vector_matrix_gromacs_config.yaml``:
6565
requires ``spack`` is installed and available in your path. Modifications to
6666
the ``package_manager`` variant will change this behavior.
6767

68-
.. literalinclude:: ../../../../examples/vector_matrix_gromacs_config.yaml
68+
.. literalinclude:: /../../../examples/vector_matrix_gromacs_config.yaml
6969
:language: YAML
7070

7171
Note that specifying compilers that Spack doesn't have installed may take a while.

lib/ramble/docs/tutorials/shared/gromacs_workspace.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ contents of ``$RAMBLE_ROOT/examples/basic_gromacs_config.yaml``:
7575
requires ``spack`` is installed and available in your path. Modifications to
7676
the ``package_manager`` variant will change this behavior.
7777

78-
.. literalinclude:: ../../../../examples/basic_gromacs_config.yaml
78+
.. literalinclude:: /../../../examples/basic_gromacs_config.yaml
7979
:language: YAML
8080

8181
Note that specifying compilers that Spack doesn't have installed may take a while.

lib/ramble/docs/tutorials/shared/wrf_scaling_workspace.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final configuration from a previous tutorial.
3030
requires ``spack`` is installed and available in your path. Modifications to
3131
the ``package_manager`` variant will change this behavior.
3232

33-
.. literalinclude:: ../../../../examples/wrf_scaling_config.yaml
33+
.. literalinclude:: /../../../examples/wrf_scaling_config.yaml
3434
:language: YAML
3535

3636
The above configuration will execute 2 experiments, comprising a basic scaling

lib/ramble/docs/workspace.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ the installation and generate software environments for each experiment.
421421

422422
As an example, if the applications and workspace configuration file provide a
423423
configuration for Spack, Ramble will generate
424-
`Spack environments<https://spack.readthedocs.io/en/latest/environments.html>`_.
424+
`Spack environments <https://spack.readthedocs.io/en/latest/environments.html>`_.
425425

426426
By default, Ramble uses the following format for creating a spack environment file:
427427

0 commit comments

Comments
 (0)