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

Jump to bottom

Unblock CI for branch-23.10 #5561

Merged
merged 18 commits into from
Sep 13, 2023
Merged

Unblock CI for branch-23.10 #5561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b417bfd
Pin container image for clang-tidy CI check to CUDA 11.8.
csadorf Aug 25, 2023
804cfa7
Update .github/workflows/pr.yaml
csadorf Aug 25, 2023
e73f07d
Increase the numerical tolerance for test_pairwise_distances tests.
csadorf Aug 25, 2023
20a147d
increase tolerance further
csadorf Aug 28, 2023
721aed0
Decrease compare precision to 2 decimal points.
csadorf Aug 30, 2023
f70f198
Reduce precision only for nan_euclidean metric.
csadorf Aug 30, 2023
1112522
Reduce general precision to 4 decimals.
csadorf Aug 31, 2023
c6b5bca
pick new RAFT targets
divyegala Sep 1, 2023
6efac97
fix typo
divyegala Sep 1, 2023
2b52f32
fix target name
divyegala Sep 1, 2023
2d2a649
no such thing as raft::raft_static
divyegala Sep 1, 2023
22476cd
bump
divyegala Sep 2, 2023
ce368d1
Propagate RAFT_COMPILED_LIB to correct scope
robertmaynard Sep 5, 2023
9658aa5
remove unnecessary variable setting
divyegala Sep 5, 2023
eaaba1a
Merge remote-tracking branch 'upstream/pull-request/5572' into ci-pin…
csadorf Sep 8, 2023
b46e087
Use conda mambabuild not mamba mambabuild.
bdice Sep 8, 2023
b4c34ef
Merge remote-tracking branch 'upstream/pull-request/5575' into ci-pin…
csadorf Sep 8, 2023
ed1040d
Fix _extract_partitions function.
csadorf Sep 12, 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
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
build_type: pull-request
node_type: "cpu8"
arch: "amd64"
container_image: "rapidsai/ci:latest"
container_image: "rapidsai/ci:cuda11.8.0-ubuntu22.04-py3.10"
run_script: "ci/run_clang_tidy.sh"
conda-cpp-build:
needs: checks
Expand Down
2 changes: 1 addition & 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,6 @@ rapids-print-env

rapids-logger "Begin cpp build"

rapids-mamba-retry mambabuild conda/recipes/libcuml
rapids-conda-retry mambabuild conda/recipes/libcuml

rapids-upload-conda-to-s3 cpp
2 changes: 1 addition & 1 deletion ci/build_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

# TODO: Remove `--no-test` flag once importing on a CPU
# node works correctly
rapids-mamba-retry mambabuild \
rapids-conda-retry mambabuild \
--no-test \
--channel "${CPP_CHANNEL}" \
conda/recipes/cuml
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ if(BUILD_CUML_CPP_LIBRARY)
# because cumlprims_mg and cuML inherit their CUDA libs from the raft::raft
# INTERFACE target.
list(APPEND ${_cuml_cpp_libs_var_name}
$<$<BOOL:${CUML_RAFT_COMPILED}>:raft::compiled>
$<$<BOOL:${CUML_RAFT_COMPILED}>:${RAFT_COMPILED_LIB}>
$<TARGET_NAME_IF_EXISTS:cumlprims_mg::cumlprims_mg>
)

Expand Down
18 changes: 7 additions & 11 deletions cpp/cmake/thirdparty/get_raft.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,14 @@ function(find_and_configure_raft)
string(APPEND RAFT_COMPONENTS " distributed")
endif()


if(PKG_COMPILE_LIBRARY)
string(APPEND RAFT_COMPONENTS " compiled")
set(RAFT_COMPILE_LIBRARY ON)
else()
set(RAFT_COMPILE_LIBRARY OFF)
endif()

set(RAFT_BUILD_SHARED_LIBS ON)
if(${PKG_USE_RAFT_STATIC})
set(RAFT_BUILD_SHARED_LIBS OFF)
if(NOT PKG_USE_RAFT_STATIC)
string(APPEND RAFT_COMPONENTS " compiled")
set(RAFT_COMPILED_LIB raft::compiled PARENT_SCOPE)
else()
string(APPEND RAFT_COMPONENTS " compiled_static")
set(RAFT_COMPILED_LIB raft::compiled_static PARENT_SCOPE)
endif()
endif()

# We need to set this each time so that on subsequent calls to cmake
Expand All @@ -68,7 +65,6 @@ function(find_and_configure_raft)
OPTIONS
"BUILD_TESTS OFF"
"BUILD_BENCH OFF"
"BUILD_SHARED_LIBS ${RAFT_BUILD_SHARED_LIBS}"
"RAFT_COMPILE_LIBRARY ${PKG_COMPILE_LIBRARY}"
)

Expand Down
2 changes: 1 addition & 1 deletion python/cuml/dask/common/part_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def _extract_partitions(dask_obj, client=None):

yield wait(parts)

key_to_part = [(str(part.key), part) for part in parts]
key_to_part = [(part.key, part) for part in parts]
who_has = yield client.who_has(parts)

raise gen.Return(
Expand Down
3 changes: 1 addition & 2 deletions python/cuml/tests/test_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,8 +1030,7 @@ def test_pairwise_distances(metric: str, matrix_size, is_col_major):
# Test the pairwise_distance helper function.
rng = np.random.RandomState(0)

# For fp64, compare at 13 decimals, (2 places less than the ~15 max)
compare_precision = 6
compare_precision = 2 if metric == "nan_euclidean" else 4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would a comment be helpful here to justify the different values?


# Compare to sklearn, single input
X = prep_dense_array(
Expand Down