Merge branch 'develop' into refactor/deprecate_from_yaml_toml_json

Author: jlnav

.github/workflows/basic.yml

@@ -60,14 +60,12 @@ jobs:
           if: matrix.os == 'ubuntu-latest'
           run: |
               conda install -c conda-forge gcc_linux-64
-              pip install nlopt==2.9.0
 
         # Roundabout solution on macos for proper linking with mpicc
         - name: Install macOS compilers
           if: matrix.os == 'macos-latest'
           run: |
             conda install clang_osx-64
-            pip install nlopt==2.8.0
 
         - name: Install basic testing/feature dependencies
           run: |

.github/workflows/extra.yml

@@ -121,7 +121,7 @@ jobs:
 
         - name: Start Redis
           if: matrix.os == 'ubuntu-latest'
-          uses: supercharge/redis-github-action@1.8.1
+          uses: supercharge/redis-github-action@v2
           with:
             redis-version: 7
 

install/testing_requirements.txt

@@ -1,6 +1,6 @@
 flake8==7.3.0
 coverage>=7.5
-pytest==9.0.1
+pytest==9.0.2
 pytest-cov==7.0.0
 pytest-timeout==2.4.0
 mock==5.2.0

libensemble/tests/regression_tests/test_persistent_aposmm_nlopt.py

@@ -14,6 +14,7 @@
 # Do not change these lines - they are parsed by run-tests.sh
 # TESTSUITE_COMMS: local mpi tcp
 # TESTSUITE_NPROCS: 3
+# TESTSUITE_EXTRA: true
 
 import sys
 from math import gamma, pi, sqrt

libensemble/tests/regression_tests/test_persistent_aposmm_scipy.py

@@ -14,7 +14,6 @@
 # Do not change these lines - they are parsed by run-tests.sh
 # TESTSUITE_COMMS: mpi local
 # TESTSUITE_NPROCS: 4
-# TESTSUITE_EXTRA: true
 
 import multiprocessing
 import sys

libensemble/tests/unit_tests/RENAME_test_persistent_aposmm.py

@@ -5,7 +5,7 @@
 
 import libensemble.gen_funcs
 
-libensemble.gen_funcs.rc.aposmm_optimizers = "nlopt"
+libensemble.gen_funcs.rc.aposmm_optimizers = "scipy"
 
 if platform.system() in ["Linux", "Darwin"]:
     multiprocessing.set_start_method("fork", force=True)
@@ -66,14 +66,13 @@ def combined_func(x):
 
 @pytest.mark.extra
 def test_standalone_persistent_aposmm():
-    from math import gamma, pi, sqrt
 
     import libensemble.gen_funcs
     from libensemble.message_numbers import FINISHED_PERSISTENT_GEN_TAG
     from libensemble.sim_funcs.six_hump_camel import six_hump_camel_func, six_hump_camel_grad
     from libensemble.tests.regression_tests.support import six_hump_camel_minima as minima
 
-    libensemble.gen_funcs.rc.aposmm_optimizers = "nlopt"
+    libensemble.gen_funcs.rc.aposmm_optimizers = "scipy"
     from libensemble.gen_funcs.persistent_aposmm import aposmm
 
     persis_info = {"rand_stream": np.random.default_rng(1), "nworkers": 4}
@@ -90,16 +89,16 @@ def test_standalone_persistent_aposmm():
             "initial_sample_size": 100,
             # 'localopt_method': 'LD_MMA', # Needs gradients
             "sample_points": np.round(minima, 1),
-            "localopt_method": "LN_BOBYQA",
+            "localopt_method": "scipy_Nelder-Mead",
             "standalone": {
                 "eval_max": eval_max,
                 "obj_func": six_hump_camel_func,
                 "grad_func": six_hump_camel_grad,
             },
-            "rk_const": 0.5 * ((gamma(1 + (n / 2)) * 5) ** (1 / n)) / sqrt(pi),
-            "xtol_abs": 1e-6,
-            "ftol_abs": 1e-6,
-            "dist_to_bound_multiple": 0.5,
+            "opt_return_codes": [0],
+            "nu": 1e-8,
+            "mu": 1e-8,
+            "dist_to_bound_multiple": 0.01,
             "max_active_runs": 6,
             "lb": np.array([-3, -2]),
             "ub": np.array([3, 2]),
@@ -124,7 +123,6 @@ def test_standalone_persistent_aposmm():
 
 @pytest.mark.extra
 def test_standalone_persistent_aposmm_combined_func():
-    from math import gamma, pi, sqrt
 
     import libensemble.gen_funcs
     from libensemble.message_numbers import FINISHED_PERSISTENT_GEN_TAG
@@ -147,12 +145,12 @@ def test_standalone_persistent_aposmm_combined_func():
             "initial_sample_size": 100,
             # 'localopt_method': 'LD_MMA', # Needs gradients
             "sample_points": np.round(minima, 1),
-            "localopt_method": "LN_BOBYQA",
+            "localopt_method": "scipy_Nelder-Mead",
             "standalone": {"eval_max": eval_max, "obj_and_grad_func": combined_func},
-            "rk_const": 0.5 * ((gamma(1 + (n / 2)) * 5) ** (1 / n)) / sqrt(pi),
-            "xtol_abs": 1e-6,
-            "ftol_abs": 1e-6,
-            "dist_to_bound_multiple": 0.5,
+            "opt_return_codes": [0],
+            "nu": 1e-8,
+            "mu": 1e-8,
+            "dist_to_bound_multiple": 0.01,
             "max_active_runs": 6,
             "lb": np.array([-3, -2]),
             "ub": np.array([3, 2]),