Skip to content

Commit d36b08c

Browse files
committed
Merge branch 'develop' into deps/bump
2 parents b451065 + fcc8533 commit d36b08c

11 files changed

Lines changed: 46 additions & 10 deletions

.readthedocs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ build:
2626
- pixi run -e docs build-docs
2727
- mkdir -p $READTHEDOCS_OUTPUT/html/
2828
- cp -r docs/_build/html/** $READTHEDOCS_OUTPUT/html/
29+
- pixi run -e docs build-pdf
30+
- mkdir -p $READTHEDOCS_OUTPUT/pdf/
31+
- cp -r docs/_build/latex/libEnsemble.pdf $READTHEDOCS_OUTPUT/pdf/
2932

3033
sphinx:
3134
configuration: docs/conf.py

README.rst

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@ and inference problems on the world's leading supercomputers such as Frontier, A
2525
**New:** libEnsemble nows supports the `gest-api`_ generator standard, and can run with
2626
Optimas and Xopt generators.
2727

28-
The |ScriptCreator| to generate customized scripts for running ensembles with your
28+
.. before_script_creator_tag
29+
30+
Try the |ScriptCreator| to generate customized scripts for running ensembles with your
2931
MPI applications.
3032

33+
.. after_script_creator_tag
34+
3135
Installation
3236
============
3337

@@ -109,6 +113,8 @@ and an exit condition.
109113
ensemble.save_output(__file__)
110114
print("Some output data:\n", ensemble.H[["x0", "x1", "f"]][:10])
111115
116+
.. before_colab_tag
117+
112118
|Inline Example|
113119

114120
Try some other examples live in Colab.
@@ -127,6 +133,8 @@ Try some other examples live in Colab.
127133
| Bayesian Optimization with Xopt. | |Bayesian Optimization with Xopt| |
128134
+---------------------------------------------------------------+-------------------------------------+
129135

136+
.. after_colab_tag
137+
130138
There are many more examples in the `regression tests`_ and `Community Examples repository`_.
131139

132140
Resources
@@ -216,6 +224,6 @@ Resources
216224
.. |Bayesian Optimization with Xopt| image:: https://colab.research.google.com/assets/colab-badge.svg
217225
:target: https://colab.research.google.com/github/Libensemble/libensemble/blob/develop/examples/tutorials/xopt_bayesian_gen/xopt_EI_example.ipynb
218226

219-
.. |ScriptCreator| image:: https://img.shields.io/badge/Script_Creator-purple?logo=magic
227+
.. |ScriptCreator| image:: https://img.shields.io/badge/Script_Creator-purple
220228
:target: https://libensemble.github.io/script-creator/
221229
:alt: Script Creator

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ class AxParameterWarning(Warning): # Ensure it's a real warning subclass
9191
"sphinx.ext.napoleon",
9292
# 'sphinx.ext.autosectionlabel',
9393
"sphinx.ext.intersphinx",
94-
"sphinx.ext.imgconverter",
9594
"sphinx.ext.mathjax",
9695
"sphinxcontrib.autodoc_pydantic",
9796
"sphinx_design",

docs/introduction.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
.. include:: ../README.rst
22
:start-after: after_badges_rst_tag
3+
:end-before: before_script_creator_tag
4+
5+
.. include:: ../README.rst
6+
:start-after: after_script_creator_tag
7+
:end-before: before_colab_tag
8+
9+
.. include:: ../README.rst
10+
:start-after: after_colab_tag
311

412
See the :doc:`tutorial<tutorials/local_sine_tutorial/local_sine_tutorial>` for a step-by-step beginners guide.
513

docs/tutorials/aposmm_tutorial.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ simulation :ref:`sim_f<funcguides-sim>` that defines a function with
1010
multiple minima, then write a libEnsemble calling script that imports APOSMM and
1111
parameterizes it to check for minima over a domain of outputs from our ``sim_f``.
1212

13-
|Open in Colab|
13+
.. only:: html
14+
15+
|Open in Colab|
1416

1517
Six-Hump Camel Simulation Function
1618
----------------------------------

docs/tutorials/executor_forces_tutorial.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ This tutorial highlights libEnsemble's capability to portably execute
66
and monitor external scripts or user applications within simulation or generator
77
functions using the :doc:`executor<../executor/ex_index>`.
88

9-
|Open in Colab|
9+
.. only:: html
10+
11+
|Open in Colab|
1012

1113
The calling script registers a compiled executable that simulates
1214
electrostatic forces between a collection of particles. The simulator function

docs/tutorials/gpcam_tutorial.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ This example uses gpCAM_ to construct a global surrogate of ``f`` values using a
55

66
In each iteration, a batch of points is produced for concurrent evaluation, maximizing uncertainty reduction.
77

8-
|Open in Colab|
8+
.. only:: html
9+
10+
|Open in Colab|
911

1012
Ensure that libEnsemble, and gpCAM are installed via: ``pip install libensemble gpcam``
1113

docs/tutorials/local_sine_tutorial/local_sine_tutorial.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ calculations in parallel using :doc:`libEnsemble<../../introduction>`.
99

1010
We recommend reading this brief :doc:`Overview<../../overview_usecases>`.
1111

12-
|Open in Colab|
12+
.. only:: html
13+
14+
|Open in Colab|
15+
1316

1417
For this tutorial, our generator will produce uniform randomly sampled
1518
values, and our simulator will calculate the sine of each. By default we don't

docs/tutorials/xopt_bayesian_gen.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ We'll show two approaches:
1010
1. Using an xopt-style simulator (callable function)
1111
2. Using a libEnsemble-style simulator function
1212

13-
|Open in Colab|
13+
.. only:: html
14+
15+
|Open in Colab|
1416

1517
Imports
1618
-------

pixi.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)