Merge branch 'develop' into experimental/jlnav_plus_shuds_asktell

Libensemble · Nov 20, 2024 · 0d146fc · 0d146fc
2 parents 06c14d7 + 58fc609
commit 0d146fc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 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: |
@@ -116,7 +119,7 @@ jobs:
             mv libensemble/tests/.cov* .
 
         - name: Upload coverage reports to Codecov
-          uses: codecov/codecov-action@v4
+          uses: codecov/codecov-action@v5
           env:
             CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml
@@ -168,7 +168,7 @@ jobs:
             mv libensemble/tests/.cov* .
 
         - name: Upload coverage reports to Codecov
-          uses: codecov/codecov-action@v4
+          uses: codecov/codecov-action@v5
           env:
             CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

diff --git a/install/gen_deps_environment.yml b/install/gen_deps_environment.yml
@@ -6,7 +6,6 @@ channels:
 dependencies:
   - pip
   - numpy>=2
-  - nlopt==2.7.1
   - scipy
   - superlu_dist
   - hypre

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,