Skip to content

Commit 1bf42f9

Browse files
authored
Merge pull request #1571 from Libensemble/develop
Merge docs into main
2 parents c9a5140 + 9f3f192 commit 1bf42f9

55 files changed

Lines changed: 487 additions & 1285 deletions

Some content is hidden

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

.flake8

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ per-file-ignores =
3737
libensemble/tests/functionality_tests/test_mpi_runners_zrw_supernode_uneven.py:E501
3838

3939
# Need to set something before the APOSMM import
40-
libensemble/tests/scaling_tests/warpx/run_libensemble_on_warpx.py:E402
41-
examples/calling_scripts/run_libensemble_on_warpx.py:E402
4240
libensemble/tests/regression_tests/test_persistent_aposmm*:E402
4341
libensemble/tests/regression_tests/test_persistent_gp_multitask_ax.py:E402
4442
libensemble/tests/functionality_tests/test_uniform_sampling_then_persistent_localopt_runs.py:E402

.github/workflows/basic.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
miniconda-version: "latest"
6161
python-version: ${{ matrix.python-version }}
6262
channels: conda-forge
63-
channel-priority: flexible
63+
channel-priority: strict
6464
auto-update-conda: true
6565

6666
- name: Force-update certifi and pip
@@ -72,7 +72,7 @@ jobs:
7272
- name: Install Ubuntu compilers
7373
if: matrix.os == 'ubuntu-latest'
7474
run: |
75-
conda install gcc_linux-64
75+
conda install -c conda-forge gcc_linux-64
7676
pip install nlopt==2.9.0
7777
7878
# Roundabout solution on macos for proper linking with mpicc
@@ -129,4 +129,4 @@ jobs:
129129
runs-on: ubuntu-latest
130130
steps:
131131
- uses: actions/checkout@v4
132-
- uses: crate-ci/typos@v1.31.1
132+
- uses: crate-ci/typos@v1.34.0

.github/workflows/extra.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
miniconda-version: 'latest'
6565
python-version: ${{ matrix.python-version }}
6666
channels: conda-forge
67-
channel-priority: flexible
67+
channel-priority: strict
6868
auto-update-conda: true
6969

7070
- name: Force-update certifi
@@ -75,7 +75,7 @@ jobs:
7575
- name: Install Ubuntu compilers
7676
if: matrix.os == 'ubuntu-latest'
7777
run: |
78-
conda install gcc_linux-64
78+
conda install -c conda-forge gcc_linux-64
7979
pip install nlopt==2.9.0
8080
8181
# Roundabout solution on macos for proper linking with mpicc
@@ -96,7 +96,7 @@ jobs:
9696
- name: Install gpcam and octave # Neither yet support 3.13
9797
if: matrix.python-version <= '3.12'
9898
run: |
99-
pip install gpcam
99+
pip install gpcam==8.1.13
100100
conda install octave
101101
102102
- name: Install surmise and Tasmanian
@@ -180,4 +180,4 @@ jobs:
180180
runs-on: ubuntu-latest
181181
steps:
182182
- uses: actions/checkout@v4
183-
- uses: crate-ci/typos@v1.31.1
183+
- uses: crate-ci/typos@v1.34.0

README.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ and inference problems on the world's leading supercomputers such as Frontier, A
2222

2323
`Quickstart`_
2424

25+
**New:** Try out the |ScriptCreator| to generate customized scripts for running
26+
ensembles with your MPI applications.
27+
2528
Installation
2629
============
2730

@@ -182,3 +185,7 @@ Resources
182185

183186
.. |Surrogate Modeling| image:: https://colab.research.google.com/assets/colab-badge.svg
184187
:target: https://colab.research.google.com/github/Libensemble/libensemble/blob/develop/examples/tutorials/gpcam_surrogate_model/gpcam.ipynb
188+
189+
.. |ScriptCreator| image:: https://img.shields.io/badge/Script_Creator-purple?logo=magic
190+
:target: https://libensemble.github.io/script-creator/
191+
:alt: Script Creator

docs/data_structures/libE_specs.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,14 @@ libEnsemble is primarily customized by setting options within a ``LibeSpecs`` cl
205205
**save_H_and_persis_on_abort** [bool] = ``True``:
206206
Save states of ``H`` and ``persis_info`` to file on aborting after an exception.
207207

208-
**save_H_on_completion** Optional[bool] = ``False``
208+
**save_H_on_completion** bool | None = ``False``
209209
Save state of ``H`` to file upon completing a workflow. Also enabled when either ``save_every_k_sims``
210210
or ``save_every_k_gens`` is set.
211211

212-
**save_H_with_date** Optional[bool] = ``False``
212+
**save_H_with_date** bool | None = ``False``
213213
Save ``H`` filename contains date and timestamp.
214214

215-
**H_file_prefix** Optional[str] = ``"libE_history"``
215+
**H_file_prefix** str | None = ``"libE_history"``
216216
Prefix for ``H`` filename.
217217

218218
**use_persis_return_gen** [bool] = ``False``:

docs/tutorials/aposmm_tutorial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,6 @@ can be found in libEnsemble's `WarpX Scaling Test`_.
314314
.. _PETSc/TAO: https://www.mcs.anl.gov/petsc/
315315
.. _SciPy: https://scipy.org/
316316
.. _Six-Hump Camel function: https://www.sfu.ca/~ssurjano/camel6.html
317-
.. _WarpX Scaling Test: https://github.com/Libensemble/libensemble/tree/main/libensemble/tests/scaling_tests/warpx
317+
.. _WarpX Scaling Test: https://github.com/Libensemble/libe-community-examples/tree/main/warpx
318318
.. |Open in Colab| image:: https://colab.research.google.com/assets/colab-badge.svg
319319
:target: http://colab.research.google.com/github/Libensemble/libensemble/blob/develop/examples/tutorials/aposmm/aposmm_tutorial_notebook.ipynb

examples/calling_scripts/run_libensemble_on_warpx.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/tutorials/aposmm/aposmm_tutorial_notebook.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
"Many common libEnsemble use-cases involve using libEnsemble's Executor to launch user\n",
349349
"applications with parameters requested by APOSMM, then evaluate their output using\n",
350350
"APOSMM, and repeat until minima are identified. A currently supported example\n",
351-
"can be found in libEnsemble's [WarpX Scaling Test](https://github.com/Libensemble/libensemble/tree/main/libensemble/tests/scaling_tests/warpx)\n",
351+
"can be found in libEnsemble's [WarpX Scaling Test](https://github.com/Libensemble/libe-community-examples/tree/main/warpx)\n",
352352
"\n",
353353
"Please see the [API reference](https://libensemble.readthedocs.io/en/main/examples/aposmm.html) for more APOSMM configuration options and other information."
354354
]

install/gen_deps_environment.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ dependencies:
1212
- mumps-mpi
1313
- DFO-LS
1414
- mpmath
15-
- ax-platform>=0.5.0
15+
- ax-platform==0.5.0
16+
- petsc
17+
- petsc4py
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
globus-compute-sdk==3.3.1
1+
globus-compute-sdk==3.8.0

0 commit comments

Comments
 (0)