Merge branch 'develop' into develop_codecov

Libensemble · Nov 20, 2024 · b179020 · b179020
2 parents fa8c0a1 + 58fc609
commit b179020
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
@@ -71,13 +71,16 @@ jobs:
 
         - name: Install Ubuntu compilers
           if: matrix.os == 'ubuntu-latest'
-          run: conda install gcc_linux-64
+          run: |
+              conda install 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: |

diff --git a/install/testing_requirements.txt b/install/testing_requirements.txt
@@ -9,4 +9,3 @@ anyio==4.6.2.post1
 matplotlib==3.9.2
 mpmath==1.3.0
 rich==13.9.4
-nlopt==2.8.0
diff --git a/libensemble/tests/regression_tests/test_persistent_aposmm_with_grad.py b/libensemble/tests/regression_tests/test_persistent_aposmm_with_grad.py
@@ -76,7 +76,7 @@
             "initial_sample_size": 0,  # Don't need to do evaluations because the sampling already done below
             "localopt_method": "LD_MMA",
             "rk_const": 0.5 * ((gamma(1 + (n / 2)) * 5) ** (1 / n)) / sqrt(pi),
-            "stop_after_k_minima": 25,
+            "stop_after_k_minima": 15,
             "xtol_rel": 1e-6,
             "ftol_rel": 1e-6,
             "max_active_runs": 6,