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

Update develop from main #1115

Merged
merged 4 commits into from
Sep 29, 2023
Merged

Update develop from main #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a737bcb
Merge pull request #1104 from Libensemble/develop
jmlarson1 Sep 27, 2023
8ebb63c
Update CI badge
shuds13 Sep 27, 2023
f013911
Update CI badge in welcome.rst
shuds13 Sep 27, 2023
e89a434
Fix line number refs in forces tutorial
shuds13 Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ updates:
directory: /
schedule:
interval: daily
target-branch: "develop"

- package-ecosystem: pip
directory: /
schedule:
interval: daily
target-branch: "develop"

- package-ecosystem: gitsubmodule
directory: /
schedule:
interval: daily
target-branch: "develop"
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

|

.. image:: https://github.com/Libensemble/libensemble/workflows/libEnsemble-CI/badge.svg?branch=main
.. image:: https://github.com/Libensemble/libensemble/actions/workflows/ci.yml/badge.svg?branch=develop
:target: https://github.com/Libensemble/libensemble/actions

.. image:: https://coveralls.io/repos/github/Libensemble/libensemble/badge.svg?branch=main
Expand Down
6 changes: 3 additions & 3 deletions docs/tutorials/executor_forces_tutorial.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ generation functions and call libEnsemble. Create a Python file called

.. code-block:: python
:linenos:
:emphasize-lines: 17,25, 28
:emphasize-lines: 16,24,27

#!/usr/bin/env python
import os
Expand Down Expand Up @@ -74,13 +74,13 @@ generation functions and call libEnsemble. Create a Python file called
# Parse number of workers, comms type, etc. from arguments
ensemble = Ensemble(parse_args=True, executor=exctr)

On line 15, we instantiate our :doc:`MPI Executor<../executor/mpi_executor>`.
On line 16, we instantiate our :doc:`MPI Executor<../executor/mpi_executor>`.

Registering an application is as easy as providing the full file-path and giving
it a memorable name. This Executor will later be used within our simulation
function to launch the registered app.

On line 22, we initialize the ensemble. The :meth:`parse_args<tools.parse_args>`
On line 27, we initialize the ensemble. The :meth:`parse_args<tools.parse_args>`
parameter is used to read `comms` and `nworkers` from the command line. This sets
the respective `libE_specs` options.

Expand Down
2 changes: 1 addition & 1 deletion docs/welcome.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

|

.. image:: https://github.com/Libensemble/libensemble/workflows/libEnsemble-CI/badge.svg?branch=main
.. image:: https://github.com/Libensemble/libensemble/actions/workflows/ci.yml/badge.svg?branch=develop
:target: https://github.com/Libensemble/libensemble/actions

.. image:: https://coveralls.io/repos/github/Libensemble/libensemble/badge.svg?branch=main
Expand Down