Skip to content

Commit

Permalink
Unblock CI for branch-23.10 (#5561)
Browse files Browse the repository at this point in the history
Pin the container-image for the CI clang-tidy check to a previous version as the latest change to move `rapidsai/ci:latest` to CUDA 12 seemingly broke the test. See this [log](https://github.com/rapidsai/cuml/actions/runs/5955794611/job/16155266993#step:9:1) for an example.

Also includes:
- #5562 
- #5572
- #5575

Authors:
  - Simon Adorf (https://github.com/csadorf)
  - Divye Gala (https://github.com/divyegala)
  - Robert Maynard (https://github.com/robertmaynard)
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - William Hicks (https://github.com/wphicks)
  - Dante Gama Dessavre (https://github.com/dantegd)
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Bradley Dice (https://github.com/bdice)

URL: #5561
  • Loading branch information
csadorf authored Sep 13, 2023
1 parent 7d86042 commit a0722c1
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
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
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
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
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
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
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
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

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

0 comments on commit a0722c1

Please sign in to comment.