Using new functionality in all-but-one test

Libensemble · Apr 15, 2020 · a8d5d10 · a8d5d10
1 parent 073b3b2
commit a8d5d10
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 0 deletions.
diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_dfols.py b/libensemble/tests/regression_tests/test_persistent_aposmm_dfols.py
@@ -19,6 +19,10 @@
 # Import libEnsemble items for this test
 from libensemble.libE import libE
 from libensemble.sim_funcs.chwirut1 import chwirut_eval as sim_f
+
+import libensemble.gen_funcs
+libensemble.gen_funcs.rc.aposmm_optimizer = 'dfols'
+
 from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f
 from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f
 from libensemble.tools import parse_args, save_libE_output, add_unique_random_streams

diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_exception.py b/libensemble/tests/regression_tests/test_persistent_aposmm_exception.py
@@ -20,7 +20,11 @@
 # Import libEnsemble items for this test
 from libensemble.libE import libE
 from libensemble.sim_funcs.periodic_func import func_wrapper as sim_f
+
+import libensemble.gen_funcs
+libensemble.gen_funcs.rc.aposmm_optimizer = 'nlopt'
 from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f
+
 from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f
 from libensemble.tools import parse_args, add_unique_random_streams
 

diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py b/libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py
@@ -28,7 +28,11 @@
 # Import libEnsemble items for this test
 from libensemble.libE import libE
 from libensemble.sim_funcs.six_hump_camel import six_hump_camel as sim_f
+
+import libensemble.gen_funcs
+libensemble.gen_funcs.rc.aposmm_optimizer = 'nlopt'
 from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f
+
 from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f
 from libensemble.tools import parse_args, save_libE_output, add_unique_random_streams
 from libensemble.tests.regression_tests.support import six_hump_camel_minima as minima

diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_nlopt.py b/libensemble/tests/regression_tests/test_persistent_aposmm_nlopt.py
@@ -21,7 +21,11 @@
 from libensemble.libE import libE
 from math import gamma, pi, sqrt
 from libensemble.sim_funcs.six_hump_camel import six_hump_camel as sim_f
+
+import libensemble.gen_funcs
+libensemble.gen_funcs.rc.aposmm_optimizer = 'nlopt'
 from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f
+
 from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f
 from libensemble.tools import parse_args, save_libE_output, add_unique_random_streams
 from libensemble.tests.regression_tests.support import six_hump_camel_minima as minima

diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_pounders.py b/libensemble/tests/regression_tests/test_persistent_aposmm_pounders.py
@@ -20,7 +20,11 @@
 from libensemble.libE import libE
 from math import gamma, pi, sqrt, ceil
 from libensemble.sim_funcs.chwirut1 import chwirut_eval as sim_f
+
+import libensemble.gen_funcs
+libensemble.gen_funcs.rc.aposmm_optimizer = 'petsc'
 from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f
+
 from libensemble.gen_funcs.sampling import lhs_sample
 from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f
 from libensemble.tools import parse_args, save_libE_output, add_unique_random_streams

diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_scipy.py b/libensemble/tests/regression_tests/test_persistent_aposmm_scipy.py
@@ -20,7 +20,11 @@
 # Import libEnsemble items for this test
 from libensemble.libE import libE
 from libensemble.sim_funcs.six_hump_camel import six_hump_camel as sim_f
+
+import libensemble.gen_funcs
+libensemble.gen_funcs.rc.aposmm_optimizer = 'scipy'
 from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f
+
 from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f
 from libensemble.tools import parse_args, save_libE_output, add_unique_random_streams
 from libensemble.tests.regression_tests.support import six_hump_camel_minima as minima

diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_tao_blmvm.py b/libensemble/tests/regression_tests/test_persistent_aposmm_tao_blmvm.py
@@ -21,7 +21,11 @@
 from libensemble.libE import libE
 from math import gamma, pi, sqrt
 from libensemble.sim_funcs.six_hump_camel import six_hump_camel as sim_f
+
+import libensemble.gen_funcs
+libensemble.gen_funcs.rc.aposmm_optimizer = 'petsc'
 from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f
+
 from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f
 from libensemble.tools import parse_args, save_libE_output, add_unique_random_streams
 from libensemble.tests.regression_tests.support import six_hump_camel_minima as minima

diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_tao_nm.py b/libensemble/tests/regression_tests/test_persistent_aposmm_tao_nm.py
@@ -20,7 +20,11 @@
 # Import libEnsemble items for this test
 from libensemble.libE import libE
 from libensemble.sim_funcs.six_hump_camel import six_hump_camel as sim_f
+
+import libensemble.gen_funcs
+libensemble.gen_funcs.rc.aposmm_optimizer = 'petsc'
 from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f
+
 from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f
 from libensemble.tools import parse_args, add_unique_random_streams
 

diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_with_grad.py b/libensemble/tests/regression_tests/test_persistent_aposmm_with_grad.py
@@ -21,7 +21,11 @@
 from libensemble.libE import libE
 from math import gamma, pi, sqrt
 from libensemble.sim_funcs.six_hump_camel import six_hump_camel as sim_f, six_hump_camel_func, six_hump_camel_grad
+
+import libensemble.gen_funcs
+libensemble.gen_funcs.rc.aposmm_optimizer = 'nlopt'
 from libensemble.gen_funcs.persistent_aposmm import aposmm as gen_f
+
 from libensemble.alloc_funcs.persistent_aposmm_alloc import persistent_aposmm_alloc as alloc_f
 from libensemble.tools import parse_args, save_libE_output, add_unique_random_streams
 from libensemble.tests.regression_tests.support import six_hump_camel_minima as minima