Skip to content

Commit 0439113

Browse files
jameslambjameslamb
committed
Merge branch 'branch-25.06' into ci/pip-init
2 parents d0ce0db + a3f2d98 commit 0439113

File tree

120 files changed

+3655
-863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+3655
-863
lines changed

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ repos:
4848
additional_dependencies: [toml]
4949
args: ["--config=pyproject.toml"]
5050
- repo: https://github.com/pre-commit/mirrors-clang-format
51-
rev: v16.0.6
51+
rev: v20.1.4
5252
hooks:
5353
- id: clang-format
5454
types_or: [c, c++, cuda]

‎ci/build_wheel.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ EXCLUDE_ARGS=(
3131
--exclude "libcusparse.so.*"
3232
--exclude "libnvJitLink.so.*"
3333
--exclude "librapids_logger.so"
34+
--exclude "librmm.so"
3435
--exclude "libucp.so.*"
3536
)
3637

‎ci/build_wheel_raft_dask.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ echo "libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${LIBRAFT_WHEELHOUSE}"/l
2020
RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}"
2121
# raft-dask CUDA 11 package still vendors libnccl.so, which is why the size is larger
2222
if [[ "${RAPIDS_CUDA_MAJOR}" == "11" ]]; then
23-
export PYDISTCHECK_MAX_SIZE="300M"
23+
export PYDISTCHECK_MAX_SIZE="320M"
2424
else
2525
export PYDISTCHECK_MAX_SIZE="2M"
2626
fi

‎conda/environments/all_cuda-118_arch-aarch64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ channels:
99
dependencies:
1010
- breathe
1111
- c-compiler
12-
- clang-tools=16.0.6
13-
- clang==16.0.6
12+
- clang-tools=20.1.4
13+
- clang==20.1.4
1414
- cmake>=3.30.4
1515
- cuda-nvtx=11.8
1616
- cuda-profiler-api=11.8.86

‎conda/environments/all_cuda-118_arch-x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ channels:
99
dependencies:
1010
- breathe
1111
- c-compiler
12-
- clang-tools=16.0.6
13-
- clang==16.0.6
12+
- clang-tools=20.1.4
13+
- clang==20.1.4
1414
- cmake>=3.30.4
1515
- cuda-nvtx=11.8
1616
- cuda-profiler-api=11.8.86

‎conda/environments/all_cuda-128_arch-aarch64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ channels:
99
dependencies:
1010
- breathe
1111
- c-compiler
12-
- clang-tools=16.0.6
13-
- clang==16.0.6
12+
- clang-tools=20.1.4
13+
- clang==20.1.4
1414
- cmake>=3.30.4
1515
- cuda-cudart-dev
1616
- cuda-nvcc

‎conda/environments/all_cuda-128_arch-x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ channels:
99
dependencies:
1010
- breathe
1111
- c-compiler
12-
- clang-tools=16.0.6
13-
- clang==16.0.6
12+
- clang-tools=20.1.4
13+
- clang==20.1.4
1414
- cmake>=3.30.4
1515
- cuda-cudart-dev
1616
- cuda-nvcc

‎conda/recipes/libraft/recipe.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ context:
77
cuda_version: ${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[:2] | join(".") }}
88
cuda_major: '${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[0] }}'
99
date_string: '${{ env.get("RAPIDS_DATE_STRING") }}'
10-
head_rev: ${{ git.head_rev(".")[:8] }}
10+
head_rev: '${{ git.head_rev(".")[:8] }}'
1111
linux64: ${{ linux and x86_64 }}
1212

1313
recipe:

‎conda/recipes/pylibraft/recipe.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ context:
99
date_string: '${{ env.get("RAPIDS_DATE_STRING") }}'
1010
py_version: ${{ env.get("RAPIDS_PY_VERSION") }}
1111
py_buildstring: ${{ py_version | version_to_buildstring }}
12-
head_rev: ${{ git.head_rev(".")[:8] }}
12+
head_rev: '${{ git.head_rev(".")[:8] }}'
1313

1414
package:
1515
name: pylibraft

‎conda/recipes/raft-dask/recipe.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ context:
99
date_string: '${{ env.get("RAPIDS_DATE_STRING") }}'
1010
py_version: ${{ env.get("RAPIDS_PY_VERSION") }}
1111
py_buildstring: ${{ py_version | version_to_buildstring }}
12-
head_rev: ${{ git.head_rev(".")[:8] }}
12+
head_rev: '${{ git.head_rev(".")[:8] }}'
1313

1414
package:
1515
name: raft-dask

‎cpp/bench/prims/core/copy.cu

Lines changed: 168 additions & 168 deletions
Large diffs are not rendered by default.

‎cpp/cmake/modules/ConfigureCUDA.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ list(APPEND RAFT_CXX_FLAGS "-DCUDA_API_PER_THREAD_DEFAULT_STREAM")
4141
list(APPEND RAFT_CUDA_FLAGS "-DCUDA_API_PER_THREAD_DEFAULT_STREAM")
4242
# make sure we produce smallest binary size
4343
list(APPEND RAFT_CUDA_FLAGS -Xfatbin=-compress-all)
44+
if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA"
45+
AND (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 12.9 AND CMAKE_CUDA_COMPILER_VERSION
46+
VERSION_LESS 13.0)
47+
)
48+
list(APPEND RAFT_CUDA_FLAGS -Xfatbin=--compress-level=3)
49+
endif()
4450

4551
# Option to enable line info in CUDA device compilation to allow introspection when profiling /
4652
# memchecking

‎cpp/include/raft/common/cub_wrappers.cuh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#pragma once
2626

2727
#ifndef RAFT_HIDE_DEPRECATION_WARNINGS
28-
#pragma message(__FILE__ \
29-
" is deprecated and will be removed in a future release." \
30-
" Please note that there is no equivalent in RAFT's public API"
28+
#pragma message(__FILE__ \
29+
" is deprecated and will be removed in a future release." \
30+
" Please note that there is no equivalent in RAFT's public API"
3131
" so this file will eventually be removed altogether.")
3232
#endif
3333

‎cpp/include/raft/common/device_loads_stores.cuh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#pragma once
2626

2727
#ifndef RAFT_HIDE_DEPRECATION_WARNINGS
28-
#pragma message(__FILE__ \
29-
" is deprecated and will be removed in a future release." \
30-
" Please use the raft/util version instead.")
28+
#pragma message(__FILE__ \
29+
" is deprecated and will be removed in a future release." \
30+
" Please use the raft/util version instead.")
3131
#endif
3232

3333
#include <raft/util/device_loads_stores.cuh>

‎cpp/include/raft/common/scatter.cuh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#pragma once
2626

2727
#ifndef RAFT_HIDE_DEPRECATION_WARNINGS
28-
#pragma message(__FILE__ \
29-
" is deprecated and will be removed in a future release." \
30-
" Please use the raft/matrix version instead.")
28+
#pragma message(__FILE__ \
29+
" is deprecated and will be removed in a future release." \
30+
" Please use the raft/matrix version instead.")
3131
#endif
3232

3333
#include <raft/util/scatter.cuh>

‎cpp/include/raft/common/seive.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#pragma once
2626

2727
#ifndef RAFT_HIDE_DEPRECATION_WARNINGS
28-
#pragma message(__FILE__ \
29-
" is deprecated and will be removed in a future release." \
30-
" Please use the raft/util version instead.")
28+
#pragma message(__FILE__ \
29+
" is deprecated and will be removed in a future release." \
30+
" Please use the raft/util version instead.")
3131
#endif
3232

3333
#include <raft/util/seive.hpp>

‎cpp/include/raft/core/coo_matrix.hpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ template <typename RowType, typename ColType, typename NZType, int is_device>
3232
class coordinate_structure_t : public sparse_structure<RowType, ColType, NZType, is_device> {
3333
public:
3434
coordinate_structure_t(RowType n_rows, ColType n_cols, NZType nnz)
35-
: sparse_structure<RowType, ColType, NZType, is_device>(n_rows, n_cols, nnz){};
35+
: sparse_structure<RowType, ColType, NZType, is_device>(n_rows, n_cols, nnz) {};
3636

3737
/**
3838
* Return span containing underlying rows array
@@ -108,8 +108,7 @@ template <typename RowType,
108108
typename ColType,
109109
typename NZType,
110110
bool is_device,
111-
template <typename T>
112-
typename ContainerPolicy>
111+
template <typename T> typename ContainerPolicy>
113112
class coordinate_structure : public coordinate_structure_t<RowType, ColType, NZType, is_device> {
114113
public:
115114
static constexpr SparsityType sparsity_type = OWNING;
@@ -226,13 +225,12 @@ template <typename ElementType,
226225
typename ColType,
227226
typename NZType,
228227
bool is_device,
229-
template <typename T>
230-
typename ContainerPolicy,
228+
template <typename T> typename ContainerPolicy,
231229
SparsityType sparsity_type = SparsityType::OWNING,
232230
typename structure_type = std::conditional_t<
233-
sparsity_type == SparsityType::OWNING,
234-
coordinate_structure<RowType, ColType, NZType, is_device, ContainerPolicy>,
235-
coordinate_structure_view<RowType, ColType, NZType, is_device>>>
231+
sparsity_type == SparsityType::OWNING,
232+
coordinate_structure<RowType, ColType, NZType, is_device, ContainerPolicy>,
233+
coordinate_structure_view<RowType, ColType, NZType, is_device>>>
236234
class coo_matrix
237235
: public sparse_matrix<ElementType,
238236
structure_type,

‎cpp/include/raft/core/csr_matrix.hpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class compressed_structure_t : public sparse_structure<IndptrType, IndicesType,
3737
* @param nnz sparsity of matrix
3838
*/
3939
compressed_structure_t(IndptrType n_rows, IndicesType n_cols, NZType nnz)
40-
: sparse_structure<IndptrType, IndicesType, NZType, is_device>(n_rows, n_cols, nnz){};
40+
: sparse_structure<IndptrType, IndicesType, NZType, is_device>(n_rows, n_cols, nnz) {};
4141

4242
/**
4343
* Return span containing underlying indptr array
@@ -112,8 +112,7 @@ template <typename IndptrType,
112112
typename IndicesType,
113113
typename NZType,
114114
bool is_device,
115-
template <typename T>
116-
typename ContainerPolicy>
115+
template <typename T> typename ContainerPolicy>
117116
class compressed_structure
118117
: public compressed_structure_t<IndptrType, IndicesType, NZType, is_device> {
119118
public:
@@ -229,21 +228,20 @@ class csr_matrix_view
229228
compressed_structure_view<IndptrType, IndicesType, NZType, is_device> structure_view)
230229
: sparse_matrix_view<ElementType,
231230
compressed_structure_view<IndptrType, IndicesType, NZType, is_device>,
232-
is_device>(element_span, structure_view){};
231+
is_device>(element_span, structure_view) {};
233232
};
234233

235234
template <typename ElementType,
236235
typename IndptrType,
237236
typename IndicesType,
238237
typename NZType,
239238
bool is_device,
240-
template <typename T>
241-
typename ContainerPolicy,
239+
template <typename T> typename ContainerPolicy,
242240
SparsityType sparsity_type = SparsityType::OWNING,
243241
typename structure_type = std::conditional_t<
244-
sparsity_type == SparsityType::OWNING,
245-
compressed_structure<IndptrType, IndicesType, NZType, is_device, ContainerPolicy>,
246-
compressed_structure_view<IndptrType, IndicesType, NZType, is_device>>>
242+
sparsity_type == SparsityType::OWNING,
243+
compressed_structure<IndptrType, IndicesType, NZType, is_device, ContainerPolicy>,
244+
compressed_structure_view<IndptrType, IndicesType, NZType, is_device>>>
247245
class csr_matrix
248246
: public sparse_matrix<ElementType,
249247
structure_type,

‎cpp/include/raft/core/detail/copy.hpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,8 @@ mdspan_copyable_t<DstType, SrcType> copy(resources const& res, DstType&& dst, Sr
414414
// Copy to intermediate source on device, then perform necessary
415415
// changes in layout on device, directly into final destination
416416
using mdarray_t = device_mdarray<typename config::src_value_type,
417-
typename config::src_extents_type,
418-
typename config::src_layout_type>;
417+
typename config::src_extents_type,
418+
typename config::src_layout_type>;
419419
auto intermediate = mdarray_t(res,
420420
typename mdarray_t::mapping_type{src.extents()},
421421
typename mdarray_t::container_policy_type{});
@@ -431,8 +431,8 @@ mdspan_copyable_t<DstType, SrcType> copy(resources const& res, DstType&& dst, Sr
431431
// Perform necessary changes in layout on device, then copy to final
432432
// destination on host
433433
using mdarray_t = device_mdarray<typename config::dst_value_type,
434-
typename config::dst_extents_type,
435-
typename config::dst_layout_type>;
434+
typename config::dst_extents_type,
435+
typename config::dst_layout_type>;
436436
auto intermediate = mdarray_t(res,
437437
typename mdarray_t::mapping_type{dst.extents()},
438438
typename mdarray_t::container_policy_type{});
@@ -450,8 +450,9 @@ mdspan_copyable_t<DstType, SrcType> copy(resources const& res, DstType&& dst, Sr
450450
#endif
451451
} else if constexpr (config::can_use_cublas) {
452452
#ifndef RAFT_DISABLE_CUDA
453-
if constexpr (!((std::is_same_v<typename std::remove_reference_t<DstType>::value_type, half>)&&(
454-
std::is_same_v<typename std::remove_reference_t<SrcType>::value_type, half>))) {
453+
if constexpr (!((std::is_same_v<typename std::remove_reference_t<DstType>::value_type, half>) &&
454+
(std::is_same_v<typename std::remove_reference_t<SrcType>::value_type,
455+
half>))) {
455456
auto constexpr const alpha = typename std::remove_reference_t<DstType>::value_type{1};
456457
auto constexpr const beta = typename std::remove_reference_t<DstType>::value_type{0};
457458
if constexpr (std::is_same_v<typename config::dst_layout_type, layout_c_contiguous>) {

‎cpp/include/raft/core/device_coo_matrix.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ template <typename ElementType,
100100
typename RowType,
101101
typename ColType,
102102
typename NZType,
103-
template <typename T>
104-
typename ContainerPolicy,
103+
template <typename T> typename ContainerPolicy,
105104
SparsityType sparsity_type>
106105
struct is_device_coo_matrix<
107106
device_coo_matrix<ElementType, RowType, ColType, NZType, ContainerPolicy, sparsity_type>>

‎cpp/include/raft/core/device_csr_matrix.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ template <typename ElementType,
107107
typename IndptrType,
108108
typename IndicesType,
109109
typename NZType,
110-
template <typename T>
111-
typename ContainerPolicy,
110+
template <typename T> typename ContainerPolicy,
112111
SparsityType sparsity_type>
113112
struct is_device_csr_matrix<
114113
device_csr_matrix<ElementType, IndptrType, IndicesType, NZType, ContainerPolicy, sparsity_type>>

0 commit comments

Comments
 (0)