Skip to content

Commit 52ee430

Browse files
committed
Merge branch 'develop' into docs/generator_section_refactor
2 parents dfeb9a0 + 5b7a14d commit 52ee430

File tree

7 files changed

+11
-21
lines changed

7 files changed

+11
-21
lines changed

.github/workflows/basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ jobs:
129129
runs-on: ubuntu-latest
130130
steps:
131131
- uses: actions/checkout@v4
132-
- uses: crate-ci/typos@v1.28.4
132+
- uses: crate-ci/typos@v1.29.4

.github/workflows/extra.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,4 @@ jobs:
181181
runs-on: ubuntu-latest
182182
steps:
183183
- uses: actions/checkout@v4
184-
- uses: crate-ci/typos@v1.28.4
184+
- uses: crate-ci/typos@v1.29.4

docs/conf.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,18 @@ class Mock(MagicMock):
3030
def __getattr__(cls, name):
3131
return MagicMock()
3232

33+
autodoc_mock_imports = ["ax", "balsam", "gpcam", "IPython", "matplotlib", "pandas", "scipy", "surmise"]
3334

3435
MOCK_MODULES = [
3536
"argparse",
3637
"dfols",
37-
"IPython",
38-
"IPython.display",
39-
"IPython.core",
40-
"IPython.core.pylabtools",
4138
"math",
42-
"matplotlib",
43-
"matplotlib.pyplot",
4439
"mpi4py",
4540
"mpmath",
4641
"nlopt",
4742
"PETSc",
4843
"petsc4py",
4944
"psutil",
50-
"scipy",
51-
"scipy.io",
52-
"scipy.sparse",
53-
"scipy.spatial",
54-
"scipy.spatial.distance",
55-
# "scipy.special", # Adding this raises many more errors
56-
"scipy.stats",
57-
"surmise.calibration",
58-
"surmise.emulation",
5945
"Tasmanian",
6046
]
6147

@@ -132,7 +118,6 @@ def __getattr__(cls, name):
132118

133119
autodoc_pydantic_model_show_json = False
134120

135-
autodoc_mock_imports = ["balsam"]
136121
extlinks = {
137122
"duref": ("http://docutils.sourceforge.net/docs/ref/rst/" "restructuredtext.html#%s", ""),
138123
"durole": ("http://docutils.sourceforge.net/docs/ref/rst/" "roles.html#%s", ""),

docs/examples/gen_funcs.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Here we list many generator functions included with libEnsemble.
2727
:maxdepth: 2
2828
:caption: Modeling and Approximation
2929

30+
gpcam
3031
tasmanian
3132
fd_param_finder
3233
surmise

docs/tutorials/executor_forces_tutorial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ Running forces application with input file
380380
Many applications read an input file instead of being given parameters directly on the run line.
381381

382382
forces_simple_with_input_file_ directory contains a variant of this example, where a templated
383-
input file is parametized for each evaluation.
383+
input file is parameterized for each evaluation.
384384

385385
This requires **jinja2** to be installed::
386386

libensemble/gen_funcs/persistent_ax_multitask.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
from libensemble.message_numbers import EVAL_GEN_TAG, FINISHED_PERSISTENT_GEN_TAG, PERSIS_STOP, STOP_TAG
4242
from libensemble.tools.persistent_support import PersistentSupport
4343

44+
__all__ = ["persistent_gp_mt_ax_gen_f"]
45+
4446

4547
def persistent_gp_mt_ax_gen_f(H, persis_info, gen_specs, libE_info):
4648
"""

libensemble/tools/tools.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ def _get_shortname(calling_file):
8383

8484
# =================== save libE output to pickle and np ========================
8585

86-
87-
def save_libE_output(H, persis_info, calling_file, nworkers, dest_path=os.getcwd(), mess="Run completed"):
86+
def save_libE_output(H, persis_info, calling_file, nworkers, dest_path=None, mess="Run completed"):
8887
"""
8988
Writes out history array and persis_info to files.
9089
@@ -121,6 +120,9 @@ def save_libE_output(H, persis_info, calling_file, nworkers, dest_path=os.getcwd
121120
A message to print/log when saving the file.
122121
123122
"""
123+
if dest_path is None:
124+
dest_path = os.getcwd()
125+
124126
short_name = _get_shortname(calling_file)
125127
prob_str = "length=" + str(len(H)) + "_evals=" + str(sum(H["sim_ended"])) + "_workers=" + str(nworkers)
126128

0 commit comments

Comments
 (0)