Skip to content

Commit

Permalink
Merge pull request #1003 from Libensemble/refactor/ensemble_as_pydantic
Browse files Browse the repository at this point in the history
Refactoring the Ensemble class somewhat
  • Loading branch information
jlnav committed May 17, 2023
2 parents 0fed585 + 6849aec commit 8c277fb
Show file tree
Hide file tree
Showing 15 changed files with 503 additions and 393 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ jobs:
- name: Activate API unit test if using mpich
if: matrix.mpi-version == 'mpich'
run: |
mv libensemble/tests/unit_tests/mpich-only_test_api.py libensemble/tests/unit_tests/test_alt_api.py
mv libensemble/tests/unit_tests/mpich-only_test_ensemble.py libensemble/tests/unit_tests/test_ensemble.py
- name: Remove ytopt-heffte test on Python 3.11 (easy way)
if: matrix.python-version == '3.11'
Expand Down
1 change: 0 additions & 1 deletion docs/data_structures/data_structures.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ a complete libEnsemble workflow, or using the alternative yaml interface.
alloc_specs
persis_info
exit_criteria
ensemble_specs
14 changes: 0 additions & 14 deletions docs/data_structures/ensemble_specs.rst

This file was deleted.

24 changes: 19 additions & 5 deletions docs/libe_module.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
.. _libe-module:

Main libE Module - Calling Script
=================================
Running an Ensemble
===================

.. automodule:: libensemble.libE
:members:
:no-undoc-members:
libEnsemble features two approaches to run an ensemble. We recommend the newer Class
approach, but will always support the classic ``libE()`` approach for backward
compatibility.

.. tab-set::

.. tab-item:: Ensemble Class

.. autoclass:: libensemble.ensemble.Ensemble()
:members:
:no-undoc-members:

.. tab-item:: libE()

.. automodule:: libensemble.libE
:members:
:no-undoc-members:
8 changes: 4 additions & 4 deletions libensemble/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

from libensemble import logger

# try:
# from .api import Ensemble
# except ModuleNotFoundError:
# pass
try:
from .ensemble import Ensemble
except ModuleNotFoundError:
pass
223 changes: 0 additions & 223 deletions libensemble/api.py

This file was deleted.

0 comments on commit 8c277fb

Please sign in to comment.