Skip to content

Commit fdbd062

Browse files
authored
Merge pull request #1269 from Libensemble/release/v_1.2.2
Release/v 1.2.2
2 parents 7c59373 + 68bb912 commit fdbd062

File tree

27 files changed

+319
-119
lines changed

27 files changed

+319
-119
lines changed

.github/workflows/basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@ jobs:
167167
runs-on: ubuntu-latest
168168
steps:
169169
- uses: actions/checkout@v4
170-
- uses: crate-ci/typos@v1.18.2
170+
- uses: crate-ci/typos@v1.19.0

.github/workflows/extra.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,4 +250,4 @@ jobs:
250250
runs-on: ubuntu-latest
251251
steps:
252252
- uses: actions/checkout@v4
253-
- uses: crate-ci/typos@v1.18.2
253+
- uses: crate-ci/typos@v1.19.0

.wci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ description: |
1616
language: Python
1717

1818
release:
19-
version: 1.2.1
20-
date: 2024-02-23
19+
version: 1.2.2
20+
date: 2024-03-21
2121

2222
documentation:
2323
general: https://libensemble.readthedocs.io

CHANGELOG.rst

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,30 @@ GitHub issues are referenced, and can be viewed with hyperlinks on the `github r
88

99
.. _`github releases page`: https://github.com/Libensemble/libensemble/releases
1010

11+
Release 1.2.2
12+
--------------
13+
14+
:Date: March 21, 2024
15+
16+
* Bugfix: Some `libE_specs` were not passed through correctly when added after ensemble initialization. #1264
17+
* `platform_specs` options are now merged with detected platforms, rather than replacing. #1265
18+
* Ensure simulation directories are created when `sim_input_dir` is specified, likewise for gen dirs. #1266
19+
20+
Example user functions:
21+
22+
* Improved structure of gpCAM generator. #1260
23+
24+
:Note:
25+
26+
* Tests were run on Linux and MacOS with Python versions 3.9, 3.10, 3.11, 3.12
27+
* Heterogeneous workflows tested on Frontier (OLCF), Polaris (ALCF), and Perlmutter (NERSC).
28+
* Note that tests have been recently run on Aurora (ALCF), but the system was unavailable at time of release.
29+
* Tests were also run on Bebop and Improv LCRC systems.
30+
31+
:Known Issues:
32+
33+
* See known issues section in the documentation.
34+
1135
Release 1.2.1
1236
--------------
1337

docs/data_structures/libE_specs.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ libEnsemble is primarily customized by setting options within a ``LibeSpecs`` cl
128128

129129
**sim_input_dir** [str]:
130130
Copy this directory's contents into the working directory upon calling the simulation function.
131+
Forms the base of a simulation directory.
131132

132133
.. tab-item:: Gens
133134

@@ -145,6 +146,7 @@ libEnsemble is primarily customized by setting options within a ``LibeSpecs`` cl
145146

146147
**gen_input_dir** [str]:
147148
Copy this directory's contents into the working directory upon calling the generator function.
149+
Forms the base of a generator directory.
148150

149151
.. tab-item:: Profiling
150152

docs/dev_guide/release_management/release_platforms/rel_spack.rst

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ A workflow for updating libEnsemble on Spack
55

66
This assumes you have already:
77

8-
- made a PyPI package for new version of libEnsemble and
8+
- made a PyPI package for the new libEnsemble version and
99
- made a GitHub fork of Spack and cloned it to your local system.
1010

1111
Details on how to create forks can be found at https://help.github.com/articles/fork-a-repo.
1212

13-
You now have a configuration like that shown at (but without the upstream/local connection).
14-
https://stackoverflow.com/questions/6286571/are-git-forks-actually-git-clones.
13+
You now have a configuration like that shown at https://stackoverflow.com/a/6286877/6346040.
1514

1615
Upstream, in this case, is the official Spack repository on GitHub. Origin is
1716
your fork on GitHub, and Local Machine is your local clone (from your fork).
@@ -33,7 +32,7 @@ To set upstream repo::
3332
git remote set-url --push upstream no_push
3433
git remote -v # Check for line: `upstream no_push (push)`
3534

36-
Updating (the main develop branch)
35+
Updating (the develop branch)
3736
----------------------------------
3837

3938
You will now update your local machine from the upstream repo (if in doubt,
@@ -54,16 +53,17 @@ Fetch from the upstream repo::
5453
To update your local machine, you may wish to rebase or overwrite your local files.
5554
Select from the following:
5655

57-
If you have local changes to go "on top" of latest code::
56+
Now make your local machine identical to the upstream repo (**WARNING:** Any local changes will be lost!)::
5857

59-
git rebase upstream/develop
58+
git reset --hard upstream/develop
6059

61-
Or to make your local machine identical to upstream repo (**WARNING:** Any local changes will be lost!)::
60+
Alternatively, if you have existing local changes to go "on top" of the latest
61+
code (usually we will make our release updates after this)::
6262

63-
git reset --hard upstream/develop
63+
git rebase upstream/develop
6464

6565
(Optional) You may want to update your forked (origin) repo on GitHub at this point.
66-
This may requires a forced push::
66+
This may require a forced push::
6767

6868
git push origin develop --force
6969

@@ -84,11 +84,11 @@ Quick example to update libEnsemble
8484
This will open the libEnsemble ``package.py`` file in your editor (given by
8585
environment variable ``EDITOR``)::
8686

87-
spack edit py-libensemble # SPACK_ROOT must be set (see above) (python packages use "py-" prefix)
87+
spack edit py-libensemble # SPACK_ROOT must be set (see above) (Python packages use "py-" prefix)
8888

8989
Or just open it manually: ``var/spack/repos/builtin/packages/py-libensemble/package.py``.
9090

91-
Now get checksum for new lines:
91+
Now get the checksum for new lines:
9292

9393
Get the tarball (see PyPI instructions), for the new release and use::
9494

@@ -102,13 +102,13 @@ Check package::
102102

103103
spack style
104104

105-
This will install a few python spack packages and run style checks on just
105+
This will install a few Python Spack packages and run style checks on just
106106
your changes. Make adjustments if needed, until this passes.
107107

108108
If okay - add, commit, and push to origin (forked repo). For example, if your version
109-
number is 0.9.1::
109+
number is 1.2.2::
110110

111-
git commit -am "libEnsemble: add v0.9.1"
111+
git commit -am "libEnsemble: add v1.2.2"
112112
git push origin develop --force
113113

114114
Once the branch is pushed to the forked repo, go to GitHub and do a pull request from this
@@ -117,7 +117,7 @@ branch on the fork to the develop branch on the upstream.
117117
Express Summary: Make Fork Identical to Upstream
118118
------------------------------------------------
119119

120-
Quick summary for bringing develop branch on forked repo up to speed with upstream
120+
Quick summary for bringing the develop branch on a forked repo up to speed with upstream
121121
(YOU WILL LOSE ANY CHANGES)::
122122

123123
git remote add upstream https://github.com/spack/spack.git

docs/dev_guide/release_management/release_process.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Before release
2929
- ``MANIFEST.in`` is checked. Locally, try out ``python setup.py sdist`` and check created tarball.
3030
contains correct files and directories for PyPI package.
3131

32+
- Locally check that the example code in the README works with both local comms and mpi4py.
33+
3234
- Tests are run with source to be released (this may iterate):
3335

3436
- On-line CI (GitHub Actions) tests must pass.

docs/platforms/bebop.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ Additional Information
140140
See the LCRC Bebop docs here_ for more information about Bebop.
141141

142142
.. _Anaconda: https://www.anaconda.com/
143-
.. _Bebop: https://www.lcrc.anl.gov/systems/resources/bebop/
143+
.. _Bebop: https://www.lcrc.anl.gov/systems/bebop
144144
.. _conda: https://conda.io/en/latest/
145-
.. _here: https://www.lcrc.anl.gov/for-users/using-lcrc/running-jobs/running-jobs-on-bebop/
145+
.. _here: https://docs.lcrc.anl.gov/bebop/running-jobs-bebop/
146146
.. _mpi4py: https://mpi4py.readthedocs.io/en/stable/
147147
.. _options: https://slurm.schedmd.com/srun.html
148148
.. _Slurm: https://slurm.schedmd.com/

docs/platforms/improv.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ You can install mpi4py as usual having installed the Open-MPI module::
6868
Note if using ``mpi4py`` comms with Open-MPI, you may need to set ``export OMPI_MCA_coll_hcoll_enable=0``
6969
to prevent HCOLL warnings.
7070

71-
.. _Improv: https://www.lcrc.anl.gov/for-users/using-lcrc/running-jobs/running-jobs-on-improv/
71+
.. _Improv: https://docs.lcrc.anl.gov/improv/running-jobs-improv/

docs/platforms/platforms_index.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ On systems with a job scheduler, libEnsemble is typically run within a single
4242
:doc:`job submission<example_scripts>`. All user simulations will run on
4343
the nodes within that allocation.
4444

45-
*How does libensemble know where to run tasks (user applications)?*
45+
*How does libEnsemble know where to run tasks (user applications)?*
4646

4747
The libEnsemble :doc:`Executor<../executor/ex_index>` can be initialized from the user calling
4848
script, and then used by workers to run tasks. The Executor will automatically detect the nodes
@@ -221,7 +221,6 @@ libEnsemble on specific HPC systems.
221221
example_scripts
222222

223223
.. _Balsam: https://balsam.readthedocs.io/en/latest/
224-
.. _Cooley: https://www.alcf.anl.gov/support-center/cooley
225224
.. _Globus Compute: https://www.globus.org/compute
226225
.. _Globus Compute endpoints: https://globus-compute.readthedocs.io/en/latest/endpoints.html
227226
.. _Globus: https://www.globus.org/

0 commit comments

Comments
 (0)