diff --git a/libensemble/gen_funcs/aposmm_localopt_support.py b/libensemble/gen_funcs/aposmm_localopt_support.py index 2de29c870..1bbe27fdf 100644 --- a/libensemble/gen_funcs/aposmm_localopt_support.py +++ b/libensemble/gen_funcs/aposmm_localopt_support.py @@ -44,9 +44,9 @@ class APOSMMException(Exception): if "dfols" in optimizers: import dfols # noqa: F401 if "ibcdfo_pounders" in optimizers: - from ibcdfo.pounders import pounders # noqa: F401 + from ibcdfo import run_pounders if "ibcdfo_manifold_sampling" in optimizers: - from ibcdfo.manifold_sampling import manifold_sampling_primal # noqa: F401 + from ibcdfo import run_MSP # noqa: F401 if "scipy" in optimizers: from scipy import optimize as sp_opt # noqa: F401 if "external_localopt" in optimizers: @@ -449,7 +449,7 @@ def run_local_ibcdfo_manifold_sampling(user_specs, comm_queue, x0, f0, child_can # m = len(f0) subprob_switch = "linprog" - [X, F, hF, xkin, flag] = manifold_sampling_primal( + [X, F, hF, xkin, flag] = run_MSP( user_specs["hfun"], lambda x: scipy_dfols_callback_fun(x, comm_queue, child_can_read, parent_can_read, user_specs), x0, @@ -507,7 +507,7 @@ def run_local_ibcdfo_pounders(user_specs, comm_queue, x0, f0, child_can_read, pa else: Options = None - [X, F, hF, flag, xkin] = pounders( + [X, F, hF, flag, xkin] = run_pounders( lambda x: scipy_dfols_callback_fun(x, comm_queue, child_can_read, parent_can_read, user_specs), x0, n, diff --git a/libensemble/tests/regression_tests/support.py b/libensemble/tests/regression_tests/support.py index 4189bcfe4..cd6386aa3 100644 --- a/libensemble/tests/regression_tests/support.py +++ b/libensemble/tests/regression_tests/support.py @@ -1,7 +1,6 @@ import copy import numpy as np - from libensemble.specs import input_fields, output_data branin_vals_and_minima = np.array( diff --git a/libensemble/tests/regression_tests/test_1d_sampling.py b/libensemble/tests/regression_tests/test_1d_sampling.py index edecabb66..71ee298f6 100644 --- a/libensemble/tests/regression_tests/test_1d_sampling.py +++ b/libensemble/tests/regression_tests/test_1d_sampling.py @@ -14,7 +14,6 @@ # TESTSUITE_NPROCS: 2 4 import numpy as np - from libensemble import Ensemble from libensemble.gen_funcs.sampling import latin_hypercube_sample as gen_f diff --git a/libensemble/tests/regression_tests/test_2d_sampling.py b/libensemble/tests/regression_tests/test_2d_sampling.py index 8164c2844..32844ae57 100644 --- a/libensemble/tests/regression_tests/test_2d_sampling.py +++ b/libensemble/tests/regression_tests/test_2d_sampling.py @@ -14,7 +14,6 @@ # TESTSUITE_NPROCS: 2 4 import numpy as np - from libensemble import Ensemble from libensemble.gen_funcs.sampling import latin_hypercube_sample as gen_f diff --git a/libensemble/tests/regression_tests/test_GPU_variable_resources.py b/libensemble/tests/regression_tests/test_GPU_variable_resources.py index b6b3197f9..914beee47 100644 --- a/libensemble/tests/regression_tests/test_GPU_variable_resources.py +++ b/libensemble/tests/regression_tests/test_GPU_variable_resources.py @@ -26,7 +26,6 @@ # TESTSUITE_NPROCS: 6 import numpy as np - from libensemble import Ensemble from libensemble.alloc_funcs.start_only_persistent import only_persistent_gens as alloc_f from libensemble.executors.mpi_executor import MPIExecutor diff --git a/libensemble/tests/regression_tests/test_GPU_variable_resources_multi_task.py b/libensemble/tests/regression_tests/test_GPU_variable_resources_multi_task.py index 2b583d4f0..5abb42b69 100644 --- a/libensemble/tests/regression_tests/test_GPU_variable_resources_multi_task.py +++ b/libensemble/tests/regression_tests/test_GPU_variable_resources_multi_task.py @@ -35,7 +35,6 @@ # TESTSUITE_NPROCS: 10 import numpy as np - from libensemble import Ensemble from libensemble.alloc_funcs.start_only_persistent import only_persistent_gens as alloc_f from libensemble.executors.mpi_executor import MPIExecutor diff --git a/libensemble/tests/regression_tests/test_evaluate_mixed_sample.py b/libensemble/tests/regression_tests/test_evaluate_mixed_sample.py index 481db8419..98e3ce8ec 100644 --- a/libensemble/tests/regression_tests/test_evaluate_mixed_sample.py +++ b/libensemble/tests/regression_tests/test_evaluate_mixed_sample.py @@ -17,7 +17,6 @@ import warnings import numpy as np - from libensemble import Ensemble from libensemble.alloc_funcs.give_pregenerated_work import give_pregenerated_sim_work as alloc_f diff --git a/libensemble/tests/regression_tests/test_gpCAM.py b/libensemble/tests/regression_tests/test_gpCAM.py index 218ecfc91..ea2c3c216 100644 --- a/libensemble/tests/regression_tests/test_gpCAM.py +++ b/libensemble/tests/regression_tests/test_gpCAM.py @@ -27,7 +27,6 @@ import warnings import numpy as np - from libensemble.alloc_funcs.start_only_persistent import only_persistent_gens as alloc_f from libensemble.gen_funcs.persistent_gpCAM import persistent_gpCAM, persistent_gpCAM_covar diff --git a/libensemble/tests/regression_tests/test_inverse_bayes_example.py b/libensemble/tests/regression_tests/test_inverse_bayes_example.py index f1e5d1cc3..31f0c632f 100644 --- a/libensemble/tests/regression_tests/test_inverse_bayes_example.py +++ b/libensemble/tests/regression_tests/test_inverse_bayes_example.py @@ -19,7 +19,6 @@ # TESTSUITE_NPROCS: 3 4 import numpy as np - from libensemble import Ensemble from libensemble.alloc_funcs.inverse_bayes_allocf import only_persistent_gens_for_inverse_bayes as alloc_f from libensemble.gen_funcs.persistent_inverse_bayes import persistent_updater_after_likelihood as gen_f diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_dfols.py b/libensemble/tests/regression_tests/test_persistent_aposmm_dfols.py index 6e1993069..cd40d5982 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_dfols.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_dfols.py @@ -21,9 +21,8 @@ import multiprocessing import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np # Import libEnsemble items for this test from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_exception.py b/libensemble/tests/regression_tests/test_persistent_aposmm_exception.py index b197dc3f0..60e4ef1a1 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_exception.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_exception.py @@ -18,9 +18,8 @@ import multiprocessing import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np # Import libEnsemble items for this test from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py b/libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py index dd01d1069..a76268a85 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py @@ -26,9 +26,8 @@ import shutil # For copying the external_localopt script import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np # Import libEnsemble items for this test from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_manifold_sampling.py b/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_manifold_sampling.py index 9f987eadc..0fcc011fb 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_manifold_sampling.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_manifold_sampling.py @@ -27,9 +27,8 @@ import multiprocessing import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np from libensemble.libE import libE libensemble.gen_funcs.rc.aposmm_optimizers = "ibcdfo_manifold_sampling" @@ -39,8 +38,7 @@ from libensemble.tools import add_unique_random_streams, parse_args, save_libE_output try: - from ibcdfo.manifold_sampling import manifold_sampling_primal # noqa: F401 - from ibcdfo.manifold_sampling.h_examples import pw_maximum as hfun + import ibcdfo # noqa: F401 except ModuleNotFoundError: sys.exit("Please 'pip install ibcdfo'") @@ -110,7 +108,7 @@ def synthetic_beamline_mapping(H, _, sim_specs): }, } - gen_specs["user"]["hfun"] = hfun + gen_specs["user"]["hfun"] = ibcdfo.manifold_sampling.h_pw_maximum alloc_specs = {"alloc_f": alloc_f} diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_pounders.py b/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_pounders.py index 753337c9b..501394444 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_pounders.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_pounders.py @@ -27,9 +27,8 @@ import multiprocessing import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np from libensemble.libE import libE from libensemble.sim_funcs.chwirut1 import chwirut_eval @@ -40,8 +39,7 @@ from libensemble.tools import add_unique_random_streams, parse_args, save_libE_output try: - from ibcdfo.pounders import pounders # noqa: F401 - from ibcdfo.pounders.general_h_funs import emittance_combine, emittance_h + import ibcdfo # noqa: F401 except ModuleNotFoundError: sys.exit("Please 'pip install ibcdfo'") @@ -122,8 +120,8 @@ def synthetic_beamline_mapping(H, _, sim_specs): } if inst == 1: - gen_specs["user"]["hfun"] = emittance_h - gen_specs["user"]["combinemodels"] = emittance_combine + gen_specs["user"]["hfun"] = ibcdfo.pounders.h_emittance + gen_specs["user"]["combinemodels"] = ibcdfo.pounders.combine_emittance alloc_specs = {"alloc_f": alloc_f} diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_pounders_jax.py b/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_pounders_jax.py index 9d635ae60..8379d0844 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_pounders_jax.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_ibcdfo_pounders_jax.py @@ -27,9 +27,8 @@ import multiprocessing import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np from libensemble.libE import libE libensemble.gen_funcs.rc.aposmm_optimizers = "ibcdfo_pounders" @@ -39,8 +38,9 @@ from libensemble.tools import add_unique_random_streams, parse_args, save_libE_output try: - from ibcdfo.pounders import pounders # noqa: F401 - from declare_hfun_and_combine_model_with_jax import hfun, combinemodels_jax + import ibcdfo # noqa: F401 + + from declare_hfun_and_combine_model_with_jax import combinemodels_jax, hfun except ModuleNotFoundError: sys.exit("Please 'pip install ibcdfo'") diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_nlopt.py b/libensemble/tests/regression_tests/test_persistent_aposmm_nlopt.py index b43a249b3..bfbc2facf 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_nlopt.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_nlopt.py @@ -19,9 +19,8 @@ import sys from math import gamma, pi, sqrt -import numpy as np - import libensemble.gen_funcs +import numpy as np # Import libEnsemble items for this test from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_periodic.py b/libensemble/tests/regression_tests/test_persistent_aposmm_periodic.py index d99e8802a..653b79ac8 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_periodic.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_periodic.py @@ -19,9 +19,8 @@ import multiprocessing import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np libensemble.gen_funcs.rc.aposmm_optimizers = ["nlopt", "scipy"] from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_pounders.py b/libensemble/tests/regression_tests/test_persistent_aposmm_pounders.py index 5b038a0ce..fdc6c8ef4 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_pounders.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_pounders.py @@ -22,9 +22,8 @@ import sys from math import ceil, gamma, pi, sqrt -import numpy as np - import libensemble.gen_funcs +import numpy as np # Import libEnsemble items for this test from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_scipy.py b/libensemble/tests/regression_tests/test_persistent_aposmm_scipy.py index 76107f567..1712df7c2 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_scipy.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_scipy.py @@ -18,9 +18,8 @@ import multiprocessing import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np # Import libEnsemble items for this test from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_tao_blmvm.py b/libensemble/tests/regression_tests/test_persistent_aposmm_tao_blmvm.py index 39ff3b79f..19740010b 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_tao_blmvm.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_tao_blmvm.py @@ -20,9 +20,8 @@ import sys from math import gamma, pi, sqrt -import numpy as np - import libensemble.gen_funcs +import numpy as np # Import libEnsemble items for this test from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_tao_nm.py b/libensemble/tests/regression_tests/test_persistent_aposmm_tao_nm.py index d6db6b63a..350f06cf0 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_tao_nm.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_tao_nm.py @@ -19,9 +19,8 @@ import multiprocessing import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np # Import libEnsemble items for this test from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_timeout.py b/libensemble/tests/regression_tests/test_persistent_aposmm_timeout.py index e61843fd7..c20dfa9c6 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_timeout.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_timeout.py @@ -20,9 +20,8 @@ import multiprocessing import sys -import numpy as np - import libensemble.gen_funcs +import numpy as np libensemble.gen_funcs.rc.aposmm_optimizers = "nlopt" diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_with_grad.py b/libensemble/tests/regression_tests/test_persistent_aposmm_with_grad.py index f2d2f09cc..c5f0ba1e5 100644 --- a/libensemble/tests/regression_tests/test_persistent_aposmm_with_grad.py +++ b/libensemble/tests/regression_tests/test_persistent_aposmm_with_grad.py @@ -21,9 +21,8 @@ import sys from math import gamma, pi, sqrt -import numpy as np - import libensemble.gen_funcs +import numpy as np # Import libEnsemble items for this test from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_fd_param_finder.py b/libensemble/tests/regression_tests/test_persistent_fd_param_finder.py index ac01d5683..632bc78c1 100644 --- a/libensemble/tests/regression_tests/test_persistent_fd_param_finder.py +++ b/libensemble/tests/regression_tests/test_persistent_fd_param_finder.py @@ -20,7 +20,6 @@ import shutil # For ECnoise.m import numpy as np - from libensemble import Ensemble from libensemble.alloc_funcs.start_fd_persistent import finite_diff_alloc as alloc_f from libensemble.gen_funcs.persistent_fd_param_finder import fd_param_finder as gen_f diff --git a/libensemble/tests/regression_tests/test_persistent_gp_multitask_ax.py b/libensemble/tests/regression_tests/test_persistent_gp_multitask_ax.py index 990493a17..e67326ac3 100644 --- a/libensemble/tests/regression_tests/test_persistent_gp_multitask_ax.py +++ b/libensemble/tests/regression_tests/test_persistent_gp_multitask_ax.py @@ -24,7 +24,6 @@ import warnings import numpy as np - from libensemble import logger from libensemble.alloc_funcs.start_only_persistent import only_persistent_gens from libensemble.libE import libE diff --git a/libensemble/tests/regression_tests/test_persistent_surmise_calib.py b/libensemble/tests/regression_tests/test_persistent_surmise_calib.py index 39cf11b5d..8701d5881 100644 --- a/libensemble/tests/regression_tests/test_persistent_surmise_calib.py +++ b/libensemble/tests/regression_tests/test_persistent_surmise_calib.py @@ -31,7 +31,6 @@ # Install Surmise package import numpy as np - from libensemble import Ensemble from libensemble.alloc_funcs.start_only_persistent import only_persistent_gens as alloc_f from libensemble.gen_funcs.persistent_surmise_calib import surmise_calib as gen_f diff --git a/libensemble/tests/regression_tests/test_persistent_surmise_killsims.py b/libensemble/tests/regression_tests/test_persistent_surmise_killsims.py index 11095f61f..a4fad2ca9 100644 --- a/libensemble/tests/regression_tests/test_persistent_surmise_killsims.py +++ b/libensemble/tests/regression_tests/test_persistent_surmise_killsims.py @@ -33,7 +33,6 @@ import os import numpy as np - from libensemble.alloc_funcs.start_only_persistent import only_persistent_gens as alloc_f from libensemble.executors.executor import Executor from libensemble.gen_funcs.persistent_surmise_calib import surmise_calib as gen_f diff --git a/libensemble/tests/regression_tests/test_persistent_tasmanian.py b/libensemble/tests/regression_tests/test_persistent_tasmanian.py index 269c4ba59..edaa7f8f9 100644 --- a/libensemble/tests/regression_tests/test_persistent_tasmanian.py +++ b/libensemble/tests/regression_tests/test_persistent_tasmanian.py @@ -21,7 +21,6 @@ from time import time import numpy as np - from libensemble.alloc_funcs.start_only_persistent import only_persistent_gens as alloc_f from libensemble.gen_funcs.persistent_tasmanian import sparse_grid_batched as gen_f_batched diff --git a/libensemble/tests/regression_tests/test_persistent_tasmanian_async.py b/libensemble/tests/regression_tests/test_persistent_tasmanian_async.py index f21544d18..3febdcdb1 100644 --- a/libensemble/tests/regression_tests/test_persistent_tasmanian_async.py +++ b/libensemble/tests/regression_tests/test_persistent_tasmanian_async.py @@ -22,7 +22,6 @@ from time import time import numpy as np - from libensemble.gen_funcs.persistent_tasmanian import get_sparse_grid_specs # Import libEnsemble items for this test diff --git a/libensemble/tests/regression_tests/test_with_app_persistent_aposmm_tao_nm.py b/libensemble/tests/regression_tests/test_with_app_persistent_aposmm_tao_nm.py index 9592e479d..77d6f9616 100644 --- a/libensemble/tests/regression_tests/test_with_app_persistent_aposmm_tao_nm.py +++ b/libensemble/tests/regression_tests/test_with_app_persistent_aposmm_tao_nm.py @@ -24,7 +24,6 @@ import sys import numpy as np - from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f from libensemble.executors import MPIExecutor from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f