Skip to content
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

[WIP] Test changes in RAFT PR 1441 #5363

Closed
wants to merge 7 commits into from
Closed

[WIP] Test changes in RAFT PR 1441 #5363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92efbe5
Use RAFT artifacts deployed from PR 1415
ahendriksen Apr 17, 2023
0d67c5a
Fix typo Python build
ahendriksen Apr 17, 2023
43b4d12
Use commit with specialization headers
ahendriksen Apr 17, 2023
bc859b3
Fix typo in build_cpp.sh
ahendriksen Apr 18, 2023
e49b3e9
Test PR raft/1441
ahendriksen Apr 21, 2023
f799c40
Merge branch 'branch-23.06' into test-raft-pr-1415
cjnolet Apr 26, 2023
55d8c86
Updating forks and packages to new PR
cjnolet Apr 27, 2023
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
6 changes: 5 additions & 1 deletion ci/build_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ rapids-print-env

rapids-logger "Begin cpp build"

rapids-mamba-retry mambabuild conda/recipes/libcuml
LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_cpp_cuda11_$(arch).tar.gz)

rapids-mamba-retry mambabuild \
--channel "${LIBRAFT_CHANNEL}" \
conda/recipes/libcuml

rapids-upload-conda-to-s3 cpp
7 changes: 7 additions & 0 deletions ci/build_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,18 @@ rapids-logger "Begin py build"

CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

PY_VER=${RAPIDS_PY_VERSION//./}

LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_cpp_cuda11_$(arch).tar.gz)
RAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_python_cuda11_${PY_VER}_$(arch).tar.gz)

# TODO: Remove `--no-test` flag once importing on a CPU
# node works correctly
rapids-mamba-retry mambabuild \
--no-test \
--channel "${CPP_CHANNEL}" \
--channel "${LIBRAFT_CHANNEL}" \
--channel "${RAFT_CHANNEL}" \
conda/recipes/cuml

rapids-upload-conda-to-s3 python
3 changes: 3 additions & 0 deletions ci/test_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ conda activate test
set -u

CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_cpp_cuda11_$(arch).tar.gz)

RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
mkdir -p "${RAPIDS_TESTS_DIR}"

rapids-print-env

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${LIBRAFT_CHANNEL}" \
libcuml libcuml-tests

rapids-logger "Check GPU usage"
Expand Down
7 changes: 7 additions & 0 deletions ci/test_python_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ set -u
rapids-logger "Downloading artifacts from previous jobs"
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
PY_VER=${RAPIDS_PY_VERSION//./}

LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_cpp_cuda11_$(arch).tar.gz)
RAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_python_cuda11_${PY_VER}_$(arch).tar.gz)


RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}
Expand All @@ -31,6 +36,8 @@ rapids-print-env
rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
--channel "${LIBRAFT_CHANNEL}" \
--channel "${RAFT_CHANNEL}" \
libcuml cuml

rapids-logger "Check GPU usage"
Expand Down
4 changes: 2 additions & 2 deletions cpp/cmake/thirdparty/get_raft.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ endfunction()
# To use a different RAFT locally, set the CMake variable
# CPM_raft_SOURCE=/path/to/local/raft
find_and_configure_raft(VERSION ${CUML_MIN_VERSION_raft}
FORK rapidsai
PINNED_TAG branch-${CUML_BRANCH_VERSION_raft}
FORK ahendriksen
PINNED_TAG enh-header-structure-final
EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL}
# When PINNED_TAG above doesn't match cuml,
# force local raft clone in build directory
Expand Down