From 3c0717d48f6311b95d9d8831f931aa93c8050f1d Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Mon, 18 Nov 2024 13:28:37 -0600 Subject: [PATCH 1/4] NLopt isn't stopping as soon as before. --- .../tests/regression_tests/test_persistent_aposmm_with_grad.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6ef34f375b..23e58b134a 100644 --- 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, From 0e1dc6c24affe3ce3ebfba24a7bb05c2395a9aaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:44:08 +0000 Subject: [PATCH 2/4] Bump nlopt from 2.8.0 to 2.9.0 Bumps [nlopt](https://github.com/DanielBok/nlopt-python) from 2.8.0 to 2.9.0. - [Release notes](https://github.com/DanielBok/nlopt-python/releases) - [Commits](https://github.com/DanielBok/nlopt-python/compare/2.8.0...2.9.0) --- updated-dependencies: - dependency-name: nlopt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- install/testing_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/testing_requirements.txt b/install/testing_requirements.txt index 6ac4d88a00..70661776f8 100644 --- a/install/testing_requirements.txt +++ b/install/testing_requirements.txt @@ -9,4 +9,4 @@ anyio==4.6.2.post1 matplotlib==3.9.2 mpmath==1.3.0 rich==13.9.4 -nlopt==2.8.0 \ No newline at end of file +nlopt==2.9.0 \ No newline at end of file From b4357592b75ba9e3084582ae99c35cefca8bf706 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Tue, 19 Nov 2024 14:44:56 -0600 Subject: [PATCH 3/4] Removing duplicate nlopt (and conflicting version number) --- install/gen_deps_environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/install/gen_deps_environment.yml b/install/gen_deps_environment.yml index a69146f3e8..9c5492663f 100644 --- 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 From 3451d7e2674bcbb90706f416764d2324f6a7392b Mon Sep 17 00:00:00 2001 From: jlnav Date: Wed, 20 Nov 2024 08:33:35 -0600 Subject: [PATCH 4/4] pick nlopt version based on OS --- .github/workflows/basic.yml | 5 ++++- install/testing_requirements.txt | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 5f7ef0a43a..cdc5be8f0a 100644 --- 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 index 70661776f8..b182377d18 100644 --- 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.9.0 \ No newline at end of file