Skip to content

Combine conda install for local and channel based artifacts into one env create call #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapids-bot merged 10 commits into from
Oct 1, 2025
Merged

Combine conda install for local and channel based artifacts into one env create call #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a623866
Enable only conda build
rgsl888prabhu Sep 30, 2025
006daa7
debug
rgsl888prabhu Sep 30, 2025
5c54486
remove file
rgsl888prabhu Sep 30, 2025
1e55bd6
fix
rgsl888prabhu Sep 30, 2025
f49737c
fix tests
rgsl888prabhu Sep 30, 2025
64a43d3
add test depe
rgsl888prabhu Sep 30, 2025
f93731b
update psutil version
rgsl888prabhu Sep 30, 2025
e068c72
revert pr.yaml changes
rgsl888prabhu Sep 30, 2025
7d4e6b2
remove debug prints and commented code
rgsl888prabhu Sep 30, 2025
4e69ca4
remove verbose
rgsl888prabhu Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions ci/test_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand Down
17 changes: 5 additions & 12 deletions ci/test_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-129_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-129_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-130_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-130_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuopt-server/recipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
15 changes: 13 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion python/cuopt_server/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down