diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index cb6d61b5e..d16225dcb 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -22,6 +22,7 @@ RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) export RAPIDS_PACKAGE_VERSION # populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array +source ./ci/use_conda_packages_from_prs.sh source rapids-rattler-channel-string diff --git a/ci/build_docs.sh b/ci/build_docs.sh index c9fc8a5fe..5607103e9 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -20,6 +20,7 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuopt cuopt --cuda "$RAPIDS_CUDA_VERSION")") PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python cuopt cuopt --py "$RAPIDS_PY_VERSION" --cuda "$RAPIDS_CUDA_VERSION")") +source ./ci/use_conda_packages_from_prs.sh rapids-logger "Generating conda environment YAML" rapids-dependency-file-generator \ diff --git a/ci/build_python.sh b/ci/build_python.sh index 4595e3a82..4f402b58a 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -27,6 +27,7 @@ for package_name in cuopt cuopt_server; do done # populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array +source ./ci/use_conda_packages_from_prs.sh source rapids-rattler-channel-string # Override `rapids-rattler-channelstring` while cuOpt is not on the standard RAPIDS release cycle diff --git a/ci/build_wheel_cuopt.sh b/ci/build_wheel_cuopt.sh index f624b2770..5cac4e520 100755 --- a/ci/build_wheel_cuopt.sh +++ b/ci/build_wheel_cuopt.sh @@ -29,6 +29,7 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" LIBCUOPT_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libcuopt cuopt --cuda "$RAPIDS_CUDA_VERSION")") +source ./ci/use_wheels_from_prs.sh echo "libcuopt-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBCUOPT_WHEELHOUSE}/libcuopt_*.whl)" >> "${PIP_CONSTRAINT}" EXCLUDE_ARGS=( diff --git a/ci/build_wheel_libcuopt.sh b/ci/build_wheel_libcuopt.sh index faa28c147..5a958d3fa 100755 --- a/ci/build_wheel_libcuopt.sh +++ b/ci/build_wheel_libcuopt.sh @@ -65,6 +65,8 @@ rapids-dependency-file-generator \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true" \ | tee /tmp/requirements-build.txt +source ./ci/use_wheels_from_prs.sh + rapids-logger "Installing build requirements" rapids-pip-retry install \ -v \ diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index f824aabea..780cbedf5 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -11,11 +11,15 @@ rapids-logger "Configuring conda strict channel priority" conda config --set channel_priority strict CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuopt cuopt --cuda "$RAPIDS_CUDA_VERSION")") +source ./ci/use_conda_packages_from_prs.sh rapids-logger "Generate C++ testing dependencies" +source ./ci/use_conda_packages_from_prs.sh rapids-dependency-file-generator \ --output conda \ --file-key test_cpp \ + --prepend-channel "${LIBRAFT_CHANNEL}" \ + --prepend-channel "${RAFT_CHANNEL}" \ --prepend-channel "${CPP_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml diff --git a/ci/test_cpp_memcheck.sh b/ci/test_cpp_memcheck.sh index 373504a13..5ca48329b 100755 --- a/ci/test_cpp_memcheck.sh +++ b/ci/test_cpp_memcheck.sh @@ -15,12 +15,16 @@ set -euo pipefail rapids-logger "Configuring conda strict channel priority" conda config --set channel_priority strict +source ./ci/use_conda_packages_from_prs.sh RAPIDS_VERSION="$(rapids-version)" rapids-logger "Generate C++ testing dependencies" +source ./ci/use_conda_packages_from_prs.sh rapids-dependency-file-generator \ --output conda \ --file-key test_cpp \ + --prepend-channel "${LIBRAFT_CHANNEL}" \ + --prepend-channel "${RAFT_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 461b8092d..9ef8784ce 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -14,13 +14,17 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuopt cuopt --cuda "$RAPIDS_CUDA_VERSION")") PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python cuopt cuopt --py "$RAPIDS_PY_VERSION" --cuda "$RAPIDS_CUDA_VERSION")") +source ./ci/use_conda_packages_from_prs.sh rapids-logger "Generate notebook testing dependencies" ENV_YAML_DIR="$(mktemp -d)" +source ./ci/use_conda_packages_from_prs.sh rapids-dependency-file-generator \ --output conda \ --file-key test_notebooks \ + --prepend-channel "${LIBRAFT_CHANNEL}" \ + --prepend-channel "${RAFT_CHANNEL}" \ --prepend-channel "${CPP_CHANNEL}" \ --prepend-channel "${PYTHON_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml" diff --git a/ci/test_python.sh b/ci/test_python.sh index e346ea5fd..707e99c61 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -14,10 +14,13 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuopt cuopt --cuda "$RAPIDS_CUDA_VERSION")") PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python cuopt cuopt --py "$RAPIDS_PY_VERSION" --cuda "$RAPIDS_CUDA_VERSION")") +source ./ci/use_conda_packages_from_prs.sh rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ --output conda \ --file-key test_python \ + --prepend-channel "${LIBRAFT_CHANNEL}" \ + --prepend-channel "${RAFT_CHANNEL}" \ --prepend-channel "${CPP_CHANNEL}" \ --prepend-channel "${PYTHON_CHANNEL}" \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml diff --git a/ci/test_self_hosted_service.sh b/ci/test_self_hosted_service.sh index 85498b16e..20d226afd 100755 --- a/ci/test_self_hosted_service.sh +++ b/ci/test_self_hosted_service.sh @@ -12,6 +12,7 @@ LIBCUOPT_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_ CUOPT_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python cuopt cuopt --py "$RAPIDS_PY_VERSION" --cuda "$RAPIDS_CUDA_VERSION")") CUOPT_SERVER_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python cuopt-server cuopt --pure --arch any --cuda "$RAPIDS_CUDA_VERSION")") +source ./ci/use_wheels_from_prs.sh # generate constraints (possibly pinning to oldest support versions of dependencies) rapids-generate-pip-constraints test_python "${PIP_CONSTRAINT}" diff --git a/ci/test_wheel_cuopt.sh b/ci/test_wheel_cuopt.sh index 12c8d2396..f9e853bd6 100755 --- a/ci/test_wheel_cuopt.sh +++ b/ci/test_wheel_cuopt.sh @@ -20,6 +20,7 @@ LIBCUOPT_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_ CUOPT_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python cuopt cuopt --py "$RAPIDS_PY_VERSION" --cuda "$RAPIDS_CUDA_VERSION")") CUOPT_SH_CLIENT_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python cuopt-sh-client cuopt --pure --arch any)") +source ./ci/use_wheels_from_prs.sh # update pip constraints.txt to ensure all future 'pip install' (including those in ci/thirdparty-testing) # use these wheels for cuopt packages cat > "${PIP_CONSTRAINT}" < "${PIP_CONSTRAINT}" <