diff --git a/install/install_ibcdfo.sh b/install/install_ibcdfo.sh index adf4197b7..cdc325ccd 100644 --- a/install/install_ibcdfo.sh +++ b/install/install_ibcdfo.sh @@ -5,7 +5,3 @@ pushd MINQ/py/minq5/ export PYTHONPATH="$PYTHONPATH:$(pwd)" echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV popd -git clone -b main https://github.com/POptUS/IBCDFO.git -pushd IBCDFO/ibcdfo_pypkg/ -pip install -e . -popd diff --git a/libensemble/tests/functionality_tests/test_asktell_sampling.py b/libensemble/tests/functionality_tests/test_asktell_sampling.py index c66666839..f2b48547a 100644 --- a/libensemble/tests/functionality_tests/test_asktell_sampling.py +++ b/libensemble/tests/functionality_tests/test_asktell_sampling.py @@ -11,7 +11,7 @@ # Do not change these lines - they are parsed by run-tests.sh # TESTSUITE_COMMS: mpi local -# TESTSUITE_NPROCS: 2 4 +# TESTSUITE_NPROCS: 4 import numpy as np from gest_api.vocs import VOCS diff --git a/libensemble/tests/functionality_tests/test_cancel_in_alloc.py b/libensemble/tests/functionality_tests/test_cancel_in_alloc.py index e1866fac0..f0bcead55 100644 --- a/libensemble/tests/functionality_tests/test_cancel_in_alloc.py +++ b/libensemble/tests/functionality_tests/test_cancel_in_alloc.py @@ -15,7 +15,7 @@ # Do not change these lines - they are parsed by run-tests.sh # TESTSUITE_COMMS: mpi local tcp -# TESTSUITE_NPROCS: 2 4 +# TESTSUITE_NPROCS: 4 import numpy as np diff --git a/libensemble/tests/functionality_tests/test_fast_alloc.py b/libensemble/tests/functionality_tests/test_fast_alloc.py index 3b40469d7..6d49162da 100644 --- a/libensemble/tests/functionality_tests/test_fast_alloc.py +++ b/libensemble/tests/functionality_tests/test_fast_alloc.py @@ -10,7 +10,7 @@ # Do not change these lines - they are parsed by run-tests.sh # TESTSUITE_COMMS: mpi local -# TESTSUITE_NPROCS: 2 4 +# TESTSUITE_NPROCS: 4 import gc import sys diff --git a/libensemble/tests/functionality_tests/test_stats_output.py b/libensemble/tests/functionality_tests/test_stats_output.py index f7f176f22..015bd06f1 100644 --- a/libensemble/tests/functionality_tests/test_stats_output.py +++ b/libensemble/tests/functionality_tests/test_stats_output.py @@ -13,7 +13,7 @@ # Do not change these lines - they are parsed by run-tests.sh # TESTSUITE_COMMS: mpi local -# TESTSUITE_NPROCS: 2 4 +# TESTSUITE_NPROCS: 4 import sys import warnings diff --git a/libensemble/tests/regression_tests/test_asktell_aposmm_nlopt.py b/libensemble/tests/regression_tests/test_asktell_aposmm_nlopt.py index a9f7e64f8..bbc2c89d1 100644 --- a/libensemble/tests/regression_tests/test_asktell_aposmm_nlopt.py +++ b/libensemble/tests/regression_tests/test_asktell_aposmm_nlopt.py @@ -13,7 +13,7 @@ # Do not change these lines - they are parsed by run-tests.sh # TESTSUITE_COMMS: local mpi tcp -# TESTSUITE_NPROCS: 3 +# TESTSUITE_NPROCS: 4 from math import gamma, pi, sqrt @@ -88,20 +88,20 @@ def six_hump_camel_func(x): if run == 0: workflow.sim_specs = SimSpecs(simulator=six_hump_camel_func, vocs=vocs) - workflow.exit_criteria = ExitCriteria(sim_max=2000) + workflow.exit_criteria = ExitCriteria(sim_max=2000, wallclock_max=600) elif run == 1: workflow.persis_info["num_gens_started"] = 0 sim_app2 = six_hump_camel.__file__ exctr = MPIExecutor() exctr.register_app(full_path=sim_app2, app_name="six_hump_camel", calc_type="sim") # Named app workflow.sim_specs = SimSpecs(simulator=six_hump_camel_func, vocs=vocs) - workflow.exit_criteria = ExitCriteria(sim_max=200) + workflow.exit_criteria = ExitCriteria(sim_max=200, wallclock_max=600) elif run == 2: workflow.persis_info["num_gens_started"] = 0 workflow.sim_specs = SimSpecs( sim_f=six_hump_camel_func, vocs=vocs ) # wrong parameter, but check we get error message - workflow.exit_criteria = ExitCriteria(sim_max=200) + workflow.exit_criteria = ExitCriteria(sim_max=200, wallclock_max=600) workflow.libE_specs.abort_on_exception = False try: diff --git a/pixi.lock b/pixi.lock index 72332c8dd..3f2a28803 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:531eb14e2044b746a3c32f764db3cf94dd837ec91bc8f45fdd5b3c5384553ab2 +size 1052714 diff --git a/pyproject.toml b/pyproject.toml index 3307bdb7b..464817c00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -95,6 +95,9 @@ scipy = ">=1.15.2,<2" mpmath = "<=1.3.0" nlopt = ">=2.10.0,<3" +[tool.pixi.feature.basic.pypi-dependencies] +ibcdfo = { git = "https://github.com/POptUS/IBCDFO.git", subdirectory = "ibcdfo_pypkg" } + # "dev" dependencies needed for basic CI flake8 = ">=7.3.0,<8" coverage = ">=7.13.0,<8"