diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 30d664dc2a..6c68577876 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -19,16 +19,15 @@ set -euo pipefail . /opt/conda/etc/profile.d/conda.sh -CUOPT_VERSION="$(rapids-version)" +CPP_CHANNEL=$(rapids-download-conda-from-github cpp) rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ --output conda \ --file-key test_cpp \ + --prepend-channel "${CPP_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml -CPP_CHANNEL=$(rapids-download-conda-from-github cpp) - rapids-mamba-retry env create --yes -f env.yaml -n test --channel "${CPP_CHANNEL}" # Temporarily allow unbound variables for conda activation. @@ -41,11 +40,6 @@ mkdir -p "${RAPIDS_TESTS_DIR}" rapids-print-env -rapids-mamba-retry install \ - --channel "${CPP_CHANNEL}" \ - "libcuopt=${CUOPT_VERSION}" \ - "libcuopt-tests=${CUOPT_VERSION}" - rapids-logger "Check GPU usage" nvidia-smi diff --git a/ci/test_python.sh b/ci/test_python.sh index 46de2d0d82..0d3d1e5963 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -19,12 +19,16 @@ set -euo pipefail . /opt/conda/etc/profile.d/conda.sh -CUOPT_VERSION="$(rapids-version)" +rapids-logger "Downloading artifacts from previous jobs" +CPP_CHANNEL=$(rapids-download-conda-from-github cpp) +PYTHON_CHANNEL=$(rapids-download-conda-from-github python) rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ --output conda \ --file-key test_python \ + --prepend-channel "${CPP_CHANNEL}" \ + --prepend-channel "${PYTHON_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test @@ -34,23 +38,12 @@ set +u conda activate test set -u -rapids-logger "Downloading artifacts from previous jobs" -CPP_CHANNEL=$(rapids-download-conda-from-github cpp) -PYTHON_CHANNEL=$(rapids-download-conda-from-github python) - RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"} mkdir -p "${RAPIDS_TESTS_DIR}" "${RAPIDS_COVERAGE_DIR}" rapids-print-env -rapids-mamba-retry install \ - --channel "${CPP_CHANNEL}" \ - --channel "${PYTHON_CHANNEL}" \ - "libcuopt=${CUOPT_VERSION}" \ - "cuopt=${CUOPT_VERSION}" \ - "cuopt-server=${CUOPT_VERSION}" - rapids-logger "Download datasets" RAPIDS_DATASET_ROOT_DIR="$(realpath datasets)" export RAPIDS_DATASET_ROOT_DIR diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index e173a04100..f690f8c293 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -52,7 +52,7 @@ dependencies: - pexpect - pip - pre-commit -- psutil>=5.9,<6.0a0 +- psutil>=6.0.0 - pylibraft==25.10.*,>=0.0.0a0 - pyrsistent - pytest-cov diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 7767e5a953..f261d370ac 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -52,7 +52,7 @@ dependencies: - pexpect - pip - pre-commit -- psutil>=5.9,<6.0a0 +- psutil>=6.0.0 - pylibraft==25.10.*,>=0.0.0a0 - pyrsistent - pytest-cov diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml index e8b8ab2b5d..13a32fc830 100644 --- a/conda/environments/all_cuda-130_arch-aarch64.yaml +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -52,7 +52,7 @@ dependencies: - pexpect - pip - pre-commit -- psutil>=5.9,<6.0a0 +- psutil>=6.0.0 - pylibraft==25.10.*,>=0.0.0a0 - pyrsistent - pytest-cov diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml index 66b5f8f4bd..65570465fc 100644 --- a/conda/environments/all_cuda-130_arch-x86_64.yaml +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -52,7 +52,7 @@ dependencies: - pexpect - pip - pre-commit -- psutil>=5.9,<6.0a0 +- psutil>=6.0.0 - pylibraft==25.10.*,>=0.0.0a0 - pyrsistent - pytest-cov diff --git a/conda/recipes/cuopt-server/recipe.yaml b/conda/recipes/cuopt-server/recipe.yaml index 32c9efa0f7..f124b95255 100644 --- a/conda/recipes/cuopt-server/recipe.yaml +++ b/conda/recipes/cuopt-server/recipe.yaml @@ -38,7 +38,7 @@ requirements: - msgpack-numpy =0.4.8 - numpy >=1.23,<3.0a0 - pandas>=2 - - psutil>=5.9,<6.0a0 + - psutil>=6.0.0 - python - uvicorn ${{ uvicorn_version }} diff --git a/dependencies.yaml b/dependencies.yaml index ee479e520a..19cb347c27 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -55,11 +55,17 @@ files: - cuda - cuda_version - test_cpp + - test_cpp_cuopt - depends_on_libcuopt test_python: output: none includes: - py_version + - depends_on_libcuopt + - depends_on_cuopt + - depends_on_cuopt_server + - depends_on_cuopt_sh_client + - depends_on_mps_parser - test_python_common - test_python_cuopt - test_python_cuopt_server @@ -318,6 +324,11 @@ dependencies: - cuda-sanitizer-api - gmock - gtest + test_cpp_cuopt: + common: + - output_types: [conda] + packages: + - libcuopt-tests==25.10.*,>=0.0.0a0 build_wheels: common: - output_types: [requirements, pyproject] @@ -401,11 +412,11 @@ dependencies: packages: - *msgpack_python - pip - - psutil>=5.9,<6.0a0 + - psutil>=6.0.0 - output_types: [requirements, pyproject] packages: - *msgpack - - psutil==5.9.6 + - psutil>=6.0.0 run_cuopt_sh_client: common: diff --git a/python/cuopt_server/pyproject.toml b/python/cuopt_server/pyproject.toml index f842975893..40845f4a6a 100644 --- a/python/cuopt_server/pyproject.toml +++ b/python/cuopt_server/pyproject.toml @@ -40,7 +40,7 @@ dependencies = [ "msgpack==1.1.0", "numpy>=1.23.5,<3.0a0", "pandas>=2.0", - "psutil==5.9.6", + "psutil>=6.0.0", "uvicorn==0.34.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [