From d3431689cd71ea81483fdfe7ec04a3e43fd42747 Mon Sep 17 00:00:00 2001 From: jlnav Date: Thu, 23 Apr 2026 10:32:49 -0500 Subject: [PATCH 1/5] bump globus-compute-sdk, set optimas to their main branch --- pixi.lock | 4 ++-- pyproject.toml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pixi.lock b/pixi.lock index 72332c8dd..56f96f7fa 100644 --- a/pixi.lock +++ b/pixi.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60267c2464fb5cbe166f6a1310fb545e8a629e7ef3bbfe14bef3be3d75a852a4 -size 1018785 +oid sha256:c1b25ba4f576a6098e05eff7aadd906c7171a68ebb60272b0b0241124808971f +size 1019823 diff --git a/pyproject.toml b/pyproject.toml index 3307bdb7b..002df88dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -161,13 +161,13 @@ python = "3.14.*" ax-platform = "==0.5.0" [tool.pixi.feature.py311e.dependencies] -globus-compute-sdk = ">=4.3.0,<5" +globus-compute-sdk = ">=4.9.0,<5" [tool.pixi.feature.py312e.target.linux-64.dependencies] ax-platform = "==0.5.0" [tool.pixi.feature.py312e.dependencies] -globus-compute-sdk = ">=4.3.0,<5" +globus-compute-sdk = ">=4.9.0,<5" [tool.pixi.feature.py313e.target.linux-64.dependencies] ax-platform = "==0.5.0" @@ -200,7 +200,7 @@ extra = [ "enchant>=0.0.1,<0.0.2", "redis>=7.1.0,<8", "surmise>=0.3.0,<0.5", - "optimas @ git+https://github.com/optimas-org/optimas@multitask_uses_id", + "optimas @ git+https://github.com/optimas-org/optimas", ] dev = ["wat>=0.7.0,<0.8"] docs = ["pyenchant", "enchant>=0.0.1,<0.0.2", "sphinx-lfs-content>=1.1.10,<2"] From c3df43e91d6ea1f6c78f830eb908e84e57ef887d Mon Sep 17 00:00:00 2001 From: jlnav Date: Thu, 23 Apr 2026 15:34:01 -0500 Subject: [PATCH 2/5] remove older conda/dependency-finding scripts --- install/find_mpi.py | 33 --------------------------- install/gen_deps_environment.yml | 17 -------------- install/misc_feature_requirements.txt | 1 - install/testing_requirements.txt | 11 --------- pixi.lock | 2 +- 5 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 install/find_mpi.py delete mode 100644 install/gen_deps_environment.yml delete mode 100644 install/misc_feature_requirements.txt delete mode 100644 install/testing_requirements.txt diff --git a/install/find_mpi.py b/install/find_mpi.py deleted file mode 100644 index 3749fd351..000000000 --- a/install/find_mpi.py +++ /dev/null @@ -1,33 +0,0 @@ -import os - -import mpi4py -from mpi4py import MPI -from pathlib import Path - -path = Path(mpi4py.__path__[0]) -print("\nmpi4py path found is:", path) - -configfile = path / "mpi.cfg" -print("\nShowing config file: ", configfile, "\n") - -with open(configfile, "r") as confile_handle: - print(confile_handle.read()) - -with open(configfile, "r") as infile: - for line in infile: - if line.startswith("mpicc ="): - mpi4py_mpicc = line[8:-1] - cmd_line = str(mpi4py_mpicc) + " -v" - print(cmd_line, ":\n") - os.system(cmd_line) - break - -size = MPI.COMM_WORLD.Get_size() -rank = MPI.COMM_WORLD.Get_rank() -name = MPI.Get_processor_name() - -assert size == 1 -assert rank == 0 -assert len(name) - -print("Passed") diff --git a/install/gen_deps_environment.yml b/install/gen_deps_environment.yml deleted file mode 100644 index 50b88b6b5..000000000 --- a/install/gen_deps_environment.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: condaenv - -channels: - - conda-forge - -dependencies: - - pip - - numpy>=2 - - scipy - - superlu_dist - - hypre - - mumps-mpi - - DFO-LS - - mpmath - - ax-platform==0.5.0 - - petsc - - petsc4py diff --git a/install/misc_feature_requirements.txt b/install/misc_feature_requirements.txt deleted file mode 100644 index 29adc6689..000000000 --- a/install/misc_feature_requirements.txt +++ /dev/null @@ -1 +0,0 @@ -globus-compute-sdk==4.9.0 diff --git a/install/testing_requirements.txt b/install/testing_requirements.txt deleted file mode 100644 index 281619ac2..000000000 --- a/install/testing_requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -flake8==7.3.0 -coverage>=7.5 -pytest==9.0.2 -pytest-cov==7.1.0 -pytest-timeout==2.4.0 -mock==5.2.0 -python-dateutil==2.9.0.post0 -anyio==4.13.0 -matplotlib==3.10.8 -mpmath==1.4.1 -rich==14.3.3 diff --git a/pixi.lock b/pixi.lock index 56f96f7fa..330896730 100644 --- a/pixi.lock +++ b/pixi.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1b25ba4f576a6098e05eff7aadd906c7171a68ebb60272b0b0241124808971f +oid sha256:fa74e9503c8e57c9df59d2c8a31c0a1f88b04d31d9b9ec9b2b7ae5171df28dd2 size 1019823 From 776d19583b3269e87802f161fe56d0056549d3e7 Mon Sep 17 00:00:00 2001 From: jlnav Date: Tue, 5 May 2026 14:23:58 -0500 Subject: [PATCH 3/5] bumping ax to >=1.2.1,<2 throughout --- pixi.lock | 4 ++-- pyproject.toml | 13 +------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/pixi.lock b/pixi.lock index 330896730..f2b4e3a6c 100644 --- a/pixi.lock +++ b/pixi.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa74e9503c8e57c9df59d2c8a31c0a1f88b04d31d9b9ec9b2b7ae5171df28dd2 -size 1019823 +oid sha256:d7a20f40e2778f6eb3e39904d2339477efca94ee76b9ee9cd7a0ca000282b779 +size 1104578 diff --git a/pyproject.toml b/pyproject.toml index 002df88dc..ad4356e53 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -118,6 +118,7 @@ petsc4py = "==3.24.2" pandas = "<3" numpy = "<2.4" proxystore = ">=0.7.1,<0.9" +ax-platform = ">=1.2.1,<2" [tool.pixi.feature.docs.dependencies] sphinx = ">=8.2.3,<9" @@ -155,26 +156,14 @@ python = "3.13.*" [tool.pixi.feature.py314.dependencies] python = "3.14.*" -# ax-platform only works up to 3.13 on Linux - -[tool.pixi.feature.py311e.target.linux-64.dependencies] -ax-platform = "==0.5.0" - [tool.pixi.feature.py311e.dependencies] globus-compute-sdk = ">=4.9.0,<5" -[tool.pixi.feature.py312e.target.linux-64.dependencies] -ax-platform = "==0.5.0" - [tool.pixi.feature.py312e.dependencies] globus-compute-sdk = ">=4.9.0,<5" -[tool.pixi.feature.py313e.target.linux-64.dependencies] -ax-platform = "==0.5.0" - [tool.pixi.feature.py314e] - # Dependencies for libEnsemble [tool.pixi.dependencies] python = ">=3.11,<3.15" From 8b3e342649f6383591dc4f3714ea8bfe11b0040e Mon Sep 17 00:00:00 2001 From: jlnav Date: Tue, 5 May 2026 14:33:33 -0500 Subject: [PATCH 4/5] revert - fix a pixi bug --- pixi.lock | 4 ++-- pyproject.toml | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pixi.lock b/pixi.lock index f2b4e3a6c..b97dcbc1c 100644 --- a/pixi.lock +++ b/pixi.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7a20f40e2778f6eb3e39904d2339477efca94ee76b9ee9cd7a0ca000282b779 -size 1104578 +oid sha256:69fb34dc1d4d761bccf5fee23e1819b52c3e8a9022cd3908dbed0c58fcd16b93 +size 990091 diff --git a/pyproject.toml b/pyproject.toml index ad4356e53..b6fbaed7f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -118,7 +118,6 @@ petsc4py = "==3.24.2" pandas = "<3" numpy = "<2.4" proxystore = ">=0.7.1,<0.9" -ax-platform = ">=1.2.1,<2" [tool.pixi.feature.docs.dependencies] sphinx = ">=8.2.3,<9" @@ -156,14 +155,21 @@ python = "3.13.*" [tool.pixi.feature.py314.dependencies] python = "3.14.*" +[tool.pixi.feature.py311e] + [tool.pixi.feature.py311e.dependencies] globus-compute-sdk = ">=4.9.0,<5" +[tool.pixi.feature.py312e] + [tool.pixi.feature.py312e.dependencies] globus-compute-sdk = ">=4.9.0,<5" +[tool.pixi.feature.py313e] + [tool.pixi.feature.py314e] + # Dependencies for libEnsemble [tool.pixi.dependencies] python = ">=3.11,<3.15" From b1c5dd59bf3623fdff4a2b8af55271af1ab1d7aa Mon Sep 17 00:00:00 2001 From: jlnav Date: Wed, 6 May 2026 15:50:14 -0500 Subject: [PATCH 5/5] revert to develop deps, except for unlocked optimas and bumped globus-compute-sdk --- pixi.lock | 4 ++-- pyproject.toml | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pixi.lock b/pixi.lock index b97dcbc1c..9647358f2 100644 --- a/pixi.lock +++ b/pixi.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69fb34dc1d4d761bccf5fee23e1819b52c3e8a9022cd3908dbed0c58fcd16b93 -size 990091 +oid sha256:e06980796536066169e010792e0bbe452af9f3677526f95345bcd2db70657661 +size 1018459 diff --git a/pyproject.toml b/pyproject.toml index b6fbaed7f..dc4ec6590 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -155,17 +155,22 @@ python = "3.13.*" [tool.pixi.feature.py314.dependencies] python = "3.14.*" -[tool.pixi.feature.py311e] +# ax-platform only works up to 3.13 on Linux + +[tool.pixi.feature.py311e.target.linux-64.dependencies] +ax-platform = "==0.5.0" [tool.pixi.feature.py311e.dependencies] -globus-compute-sdk = ">=4.9.0,<5" +globus-compute-sdk = ">=4.10.2,<5" -[tool.pixi.feature.py312e] +[tool.pixi.feature.py312e.target.linux-64.dependencies] +ax-platform = "==0.5.0" [tool.pixi.feature.py312e.dependencies] -globus-compute-sdk = ">=4.9.0,<5" +globus-compute-sdk = ">=4.10.2,<5" -[tool.pixi.feature.py313e] +[tool.pixi.feature.py313e.target.linux-64.dependencies] +ax-platform = "==0.5.0" [tool.pixi.feature.py314e]