From 1991dd8462ca0025485478ac609f8c518d47fc76 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Tue, 18 Feb 2025 14:44:36 -0600 Subject: [PATCH 01/13] Testing for 3.13 --- .github/workflows/extra.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index a9f319684..c0ef64f01 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -11,22 +11,22 @@ jobs: matrix: os: [ubuntu-latest] mpi-version: [mpich] - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.13"] pydantic-version: ["2.8.2"] comms-type: [m, l] include: - os: macos-latest - python-version: 3.11 + python-version: "3.13" mpi-version: mpich pydantic-version: "2.8.2" comms-type: m - os: macos-latest - python-version: 3.11 + python-version: "3.13" mpi-version: mpich pydantic-version: "2.8.2" comms-type: l - os: ubuntu-latest - python-version: "3.10" + python-version: "3.12" mpi-version: mpich pydantic-version: "2.8.2" comms-type: t @@ -37,12 +37,12 @@ jobs: comms-type: l - os: ubuntu-latest mpi-version: mpich - python-version: "3.10" + python-version: "3.12" pydantic-version: "1.10.17" comms-type: m - os: ubuntu-latest mpi-version: mpich - python-version: "3.10" + python-version: "3.12" pydantic-version: "1.10.17" comms-type: l From d836fa14bb159e04056eebba274e0358a92928c5 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Wed, 19 Feb 2025 08:48:50 -0600 Subject: [PATCH 02/13] Ignoring gpcam for 3.13 --- .github/workflows/extra.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index c0ef64f01..139a12d91 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -94,7 +94,7 @@ jobs: conda env update --file install/gen_deps_environment.yml - name: Install gpcam - if: matrix.python-version <= '3.13' + if: matrix.python-version <= '3.12' run: | pip install gpcam @@ -139,6 +139,11 @@ jobs: rm ./libensemble/tests/regression_tests/test_persistent_surmise_calib.py rm ./libensemble/tests/regression_tests/test_persistent_surmise_killsims.py + - name: Remove test for persistent gpcam Python 3.13 + if: matrix.python-version == '3.13' + run: | + rm ./libensemble/tests/regression_tests/test_gpCAM.py + - name: Install redis/proxystore on Pydantic 2 if: matrix.pydantic-version == '2.8.2' run: | From 0e721d232dc36911486c4c84ccacb707315cc452 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Wed, 19 Feb 2025 09:51:20 -0600 Subject: [PATCH 03/13] Mirroring basic in extra --- .github/workflows/extra.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 139a12d91..19b1f8b67 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -124,6 +124,7 @@ jobs: pip install -r install/testing_requirements.txt pip install -r install/misc_feature_requirements.txt source install/install_ibcdfo.sh + conda install numpy scipy - name: Install libEnsemble, flake8, lock environment run: | From 112eb6eeef369fb25c5d6254d7ab0751b8bca9a7 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Wed, 19 Feb 2025 10:27:30 -0600 Subject: [PATCH 04/13] Trying something else --- .github/workflows/extra.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 19b1f8b67..da5607560 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -104,7 +104,7 @@ jobs: pip install --upgrade git+https://github.com/bandframework/surmise.git - name: Install generator dependencies for Ubuntu tests - if: matrix.os == 'ubuntu-latest' && matrix.python-version != '3.12' + if: matrix.os == 'ubuntu-latest' && matrix.python-version <= '3.12' run: | sudo apt-get install bc pip install -r install/ubuntu_no312.txt From b27476876218a03a9f02c3387cbfbde506e329cb Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Wed, 19 Feb 2025 10:48:06 -0600 Subject: [PATCH 05/13] Moving octave --- .github/workflows/extra.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index da5607560..2a98ba03c 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -103,6 +103,11 @@ jobs: run: | pip install --upgrade git+https://github.com/bandframework/surmise.git + - name: Install generator dependencies for Ubuntu tests + if: matrix.python-version <= '3.12' + run: | + conda install octave + - name: Install generator dependencies for Ubuntu tests if: matrix.os == 'ubuntu-latest' && matrix.python-version <= '3.12' run: | @@ -120,7 +125,6 @@ jobs: - name: Install other testing dependencies run: | - conda install octave pip install -r install/testing_requirements.txt pip install -r install/misc_feature_requirements.txt source install/install_ibcdfo.sh From 41161370b239c6672344b96bf304fb1275cc93d7 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Wed, 19 Feb 2025 11:13:39 -0600 Subject: [PATCH 06/13] Removing octave for 3.13 --- .github/workflows/extra.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 2a98ba03c..019e2e42b 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -136,13 +136,15 @@ jobs: pip install -e . flake8 libensemble - - name: Remove test for persistent Tasmanian, Surmise on Python 3.12 + - name: Remove test for persistent Tasmanian, Surmise, octave on Python 3.12 if: matrix.python-version >= '3.12' run: | rm ./libensemble/tests/regression_tests/test_persistent_tasmanian.py rm ./libensemble/tests/regression_tests/test_persistent_tasmanian_async.py rm ./libensemble/tests/regression_tests/test_persistent_surmise_calib.py rm ./libensemble/tests/regression_tests/test_persistent_surmise_killsims.py + rm ./libensemble/tests/regression_tests/test_persistent_fd_param_finder.py # needs octave, which doesn't yet support 3.13 + rm ./libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py # needs octave, which doesn't yet support 3.13 - name: Remove test for persistent gpcam Python 3.13 if: matrix.python-version == '3.13' From 6fbc89927822f4826d3a314fefe00dab4c377a17 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Wed, 19 Feb 2025 11:46:55 -0600 Subject: [PATCH 07/13] Trying adding back tests --- .github/workflows/extra.yml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 019e2e42b..58cc85822 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -93,21 +93,17 @@ jobs: run: | conda env update --file install/gen_deps_environment.yml - - name: Install gpcam + - name: Install gpcam and octave if: matrix.python-version <= '3.12' run: | pip install gpcam + conda install octave - name: Install surmise if: matrix.os == 'ubuntu-latest' run: | pip install --upgrade git+https://github.com/bandframework/surmise.git - - name: Install generator dependencies for Ubuntu tests - if: matrix.python-version <= '3.12' - run: | - conda install octave - - name: Install generator dependencies for Ubuntu tests if: matrix.os == 'ubuntu-latest' && matrix.python-version <= '3.12' run: | @@ -136,20 +132,12 @@ jobs: pip install -e . flake8 libensemble - - name: Remove test for persistent Tasmanian, Surmise, octave on Python 3.12 - if: matrix.python-version >= '3.12' + - name: Remove test for persistent Surmise, octave on Python 3.12 + if: matrix.python-version >= '3.13' run: | - rm ./libensemble/tests/regression_tests/test_persistent_tasmanian.py - rm ./libensemble/tests/regression_tests/test_persistent_tasmanian_async.py - rm ./libensemble/tests/regression_tests/test_persistent_surmise_calib.py - rm ./libensemble/tests/regression_tests/test_persistent_surmise_killsims.py rm ./libensemble/tests/regression_tests/test_persistent_fd_param_finder.py # needs octave, which doesn't yet support 3.13 rm ./libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py # needs octave, which doesn't yet support 3.13 - - - name: Remove test for persistent gpcam Python 3.13 - if: matrix.python-version == '3.13' - run: | - rm ./libensemble/tests/regression_tests/test_gpCAM.py + rm ./libensemble/tests/regression_tests/test_gpCAM.py # needs gpcam, which doesn't build on 3.13 - name: Install redis/proxystore on Pydantic 2 if: matrix.pydantic-version == '2.8.2' From b1c529d1a0365328b2562c842051eae512a5bd16 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Wed, 19 Feb 2025 13:23:40 -0600 Subject: [PATCH 08/13] Trying adding back tests --- .github/workflows/extra.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 58cc85822..587506464 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -105,11 +105,12 @@ jobs: pip install --upgrade git+https://github.com/bandframework/surmise.git - name: Install generator dependencies for Ubuntu tests - if: matrix.os == 'ubuntu-latest' && matrix.python-version <= '3.12' - run: | - sudo apt-get install bc - pip install -r install/ubuntu_no312.txt - pip install Tasmanian --user + if: matrix.os == 'ubuntu-latest' + if: matrix.python-version <= '3.12' + run: | + sudo apt-get install bc + pip install -r install/ubuntu_no312.txt + pip install Tasmanian --user - name: Install Balsam on Pydantic 1 if: matrix.pydantic-version == '1.10.17' From 652f4b383ffe7c65c82fc95db13fcdb1af3ddd3c Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Wed, 19 Feb 2025 13:38:00 -0600 Subject: [PATCH 09/13] Trying adding back tests --- .github/workflows/extra.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 587506464..ba06cf915 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -105,12 +105,11 @@ jobs: pip install --upgrade git+https://github.com/bandframework/surmise.git - name: Install generator dependencies for Ubuntu tests - if: matrix.os == 'ubuntu-latest' - if: matrix.python-version <= '3.12' - run: | - sudo apt-get install bc - pip install -r install/ubuntu_no312.txt - pip install Tasmanian --user + if: matrix.os == 'ubuntu-latest' && matrix.python-version <= "3.12" + run: | + sudo apt-get install bc + pip install -r install/ubuntu_no312.txt + pip install Tasmanian --user - name: Install Balsam on Pydantic 1 if: matrix.pydantic-version == '1.10.17' @@ -134,7 +133,7 @@ jobs: flake8 libensemble - name: Remove test for persistent Surmise, octave on Python 3.12 - if: matrix.python-version >= '3.13' + if: matrix.python-version >= "3.13" run: | rm ./libensemble/tests/regression_tests/test_persistent_fd_param_finder.py # needs octave, which doesn't yet support 3.13 rm ./libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py # needs octave, which doesn't yet support 3.13 From 6496ce0390a2c11ebb7eaa76fa222d0a79868917 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Thu, 20 Feb 2025 07:57:27 -0600 Subject: [PATCH 10/13] Debugging --- .github/workflows/extra.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index ba06cf915..77e37cb59 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -105,7 +105,7 @@ jobs: pip install --upgrade git+https://github.com/bandframework/surmise.git - name: Install generator dependencies for Ubuntu tests - if: matrix.os == 'ubuntu-latest' && matrix.python-version <= "3.12" + if: matrix.os == 'ubuntu-latest' && matrix.python-version <= '3.12' run: | sudo apt-get install bc pip install -r install/ubuntu_no312.txt From 94751cd2cc3e5206fa22a7709949815d15cb3275 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Thu, 20 Feb 2025 08:03:28 -0600 Subject: [PATCH 11/13] Debugging --- .github/workflows/extra.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 77e37cb59..2d7904f75 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -11,43 +11,43 @@ jobs: matrix: os: [ubuntu-latest] mpi-version: [mpich] - python-version: ["3.10", "3.11", "3.12", "3.13"] - pydantic-version: ["2.8.2"] + python-version: ['3.10', '3.11', '3.12', '3.13'] + pydantic-version: ['2.8.2'] comms-type: [m, l] include: - os: macos-latest - python-version: "3.13" + python-version: '3.13' mpi-version: mpich - pydantic-version: "2.8.2" + pydantic-version: '2.8.2' comms-type: m - os: macos-latest - python-version: "3.13" + python-version: '3.13' mpi-version: mpich - pydantic-version: "2.8.2" + pydantic-version: '2.8.2' comms-type: l - os: ubuntu-latest - python-version: "3.12" + python-version: '3.12' mpi-version: mpich - pydantic-version: "2.8.2" + pydantic-version: '2.8.2' comms-type: t - os: ubuntu-latest - mpi-version: "openmpi" - pydantic-version: "2.8.2" - python-version: "3.12" + mpi-version: 'openmpi' + pydantic-version: '2.8.2' + python-version: '3.12' comms-type: l - os: ubuntu-latest mpi-version: mpich - python-version: "3.12" - pydantic-version: "1.10.17" + python-version: '3.12' + pydantic-version: '1.10.17' comms-type: m - os: ubuntu-latest mpi-version: mpich - python-version: "3.12" - pydantic-version: "1.10.17" + python-version: '3.12' + pydantic-version: '1.10.17' comms-type: l env: - HYDRA_LAUNCHER: "fork" + HYDRA_LAUNCHER: 'fork' TERM: xterm-256color GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -61,7 +61,7 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: activate-environment: condaenv - miniconda-version: "latest" + miniconda-version: 'latest' python-version: ${{ matrix.python-version }} channels: conda-forge channel-priority: flexible @@ -133,7 +133,7 @@ jobs: flake8 libensemble - name: Remove test for persistent Surmise, octave on Python 3.12 - if: matrix.python-version >= "3.13" + if: matrix.python-version >= '3.13' run: | rm ./libensemble/tests/regression_tests/test_persistent_fd_param_finder.py # needs octave, which doesn't yet support 3.13 rm ./libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py # needs octave, which doesn't yet support 3.13 From 73717d8b62f6915286bc5a89aa9864512e1c69a4 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Thu, 20 Feb 2025 09:13:30 -0600 Subject: [PATCH 12/13] Trying something out --- .github/workflows/extra.yml | 15 +++++++-------- install/ubuntu_no312.txt | 4 ---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 2d7904f75..abf9f0a27 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -75,8 +75,8 @@ jobs: - name: Install Ubuntu compilers if: matrix.os == 'ubuntu-latest' run: | - conda install gcc_linux-64 - pip install nlopt==2.9.0 + conda install gcc_linux-64 + pip install nlopt==2.9.0 # Roundabout solution on macos for proper linking with mpicc - name: Install macOS compilers @@ -93,23 +93,22 @@ jobs: run: | conda env update --file install/gen_deps_environment.yml - - name: Install gpcam and octave + - name: Install gpcam and octave # Neither yet support 3.13 if: matrix.python-version <= '3.12' run: | pip install gpcam conda install octave - - name: Install surmise + - name: Install surmise and Tasmanian if: matrix.os == 'ubuntu-latest' run: | pip install --upgrade git+https://github.com/bandframework/surmise.git + pip install Tasmanian --user - name: Install generator dependencies for Ubuntu tests if: matrix.os == 'ubuntu-latest' && matrix.python-version <= '3.12' run: | - sudo apt-get install bc - pip install -r install/ubuntu_no312.txt - pip install Tasmanian --user + pip install scikit-build packaging - name: Install Balsam on Pydantic 1 if: matrix.pydantic-version == '1.10.17' @@ -132,7 +131,7 @@ jobs: pip install -e . flake8 libensemble - - name: Remove test for persistent Surmise, octave on Python 3.12 + - name: Remove test using octave, gpcam on Python 3.13 if: matrix.python-version >= '3.13' run: | rm ./libensemble/tests/regression_tests/test_persistent_fd_param_finder.py # needs octave, which doesn't yet support 3.13 diff --git a/install/ubuntu_no312.txt b/install/ubuntu_no312.txt index 671febe2b..e69de29bb 100644 --- a/install/ubuntu_no312.txt +++ b/install/ubuntu_no312.txt @@ -1,4 +0,0 @@ -gpcam==8.1.12 -scikit-build==0.18.1 -packaging==24.1 -git+https://github.com/bandframework/surmise.git From f181c1abb08ae7a0272c6074acf10ed6ce640ae2 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Thu, 20 Feb 2025 10:30:30 -0600 Subject: [PATCH 13/13] Removing --- install/ubuntu_no312.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 install/ubuntu_no312.txt diff --git a/install/ubuntu_no312.txt b/install/ubuntu_no312.txt deleted file mode 100644 index e69de29bb..000000000