diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 12a811009..7f4d230ac 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -53,9 +53,9 @@ jobs: environments: ${{ matrix.python-version }} activate-environment: ${{ matrix.python-version }} - - name: Install IBCDFO + - name: Install minq run: | - pixi run -e ${{ matrix.python-version }} ./install/install_ibcdfo.sh + pixi run -e ${{ matrix.python-version }} ./install/install_minq.sh - name: Install libEnsemble, test flake8 run: | diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index fe097be96..9a4688756 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -58,7 +58,7 @@ jobs: - name: Install other testing dependencies run: | - pixi run -e ${{ matrix.python-version }} install/install_ibcdfo.sh + pixi run -e ${{ matrix.python-version }} install/install_minq.sh - name: Install libEnsemble, flake8, lock environment run: | 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/install_ibcdfo.sh b/install/install_minq.sh similarity index 100% rename from install/install_ibcdfo.sh rename to install/install_minq.sh 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 098ba20f5..fa0463f68 100644 --- a/pixi.lock +++ b/pixi.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7f473ad72a7c038dee9ec8d3dbe035f6e96e3cfe2f95e2c0522e0e937912da5 -size 1056784 +oid sha256:6f36ea99b2026285c2a6747765a74fc5535cb37bd6bdeacf412d3a258bcce15e +size 1056789 diff --git a/pyproject.toml b/pyproject.toml index d094eb54a..a612f0839 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -101,7 +101,7 @@ ibcdfo = { git = "https://github.com/POptUS/IBCDFO.git", subdirectory = "ibcdfo_ # "dev" dependencies needed for basic CI flake8 = ">=7.3.0,<8" coverage = ">=7.13.0,<8" -pytest = ">=9.0.3,<10" +pytest = ">=9.0.3, <10" pytest-cov = ">=7.0.0,<8" pytest-timeout = ">=2.4.0,<3" @@ -165,13 +165,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.10.2,<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.10.2,<5" [tool.pixi.feature.py313e.target.linux-64.dependencies] ax-platform = "==0.5.0"