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.

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

Update fmt (to 11.0.2) and spdlog (to 1.14.1). #2433

Merged
merged 24 commits into from
Sep 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
867452b
Update fmt (to 11.0.2) and spdlog (to 1.14.1).
jameslamb Sep 16, 2024
2a6aeea
use rmm and ucxx CI artifacts
jameslamb Sep 16, 2024
b7c151e
try using librmm wheels
jameslamb Sep 16, 2024
f1b0793
try again to use rmm wheels
jameslamb Sep 17, 2024
d4ef11a
rapids-get-pr-wheel-artifact was missing RAPIDS_PY_WHEEL_NAME
jameslamb Sep 17, 2024
06fcda5
ok you do not need to provide the Python slug yourself for rapids-get…
jameslamb Sep 17, 2024
3b83970
constraints need 'file://' protocol
jameslamb Sep 17, 2024
3ba2201
try suppressing unreachable-code diagnostics from nvcc (this should b…
jameslamb Sep 17, 2024
31520f5
fix checks
jameslamb Sep 17, 2024
366f4c8
Revert "try suppressing unreachable-code diagnostics from nvcc (this …
jameslamb Sep 17, 2024
124ce29
Merge branch 'branch-24.10' of github.com:rapidsai/raft into fmt-and-…
jameslamb Sep 18, 2024
9ef2133
copyright
jameslamb Sep 18, 2024
1a9b308
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 18, 2024
7869cce
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 18, 2024
81cf3b3
move rapids-cmake overrides [skip ci]
jameslamb Sep 18, 2024
1a89935
Merge branch 'branch-24.10' of github.com:rapidsai/raft into fmt-and-…
jameslamb Sep 19, 2024
8f918bd
kick off a build
jameslamb Sep 19, 2024
b43c6a8
Merge branch 'fmt-and-spdlog' of github.com:jameslamb/raft into fmt-a…
jameslamb Sep 19, 2024
4dd6040
fix dependency graph
jameslamb Sep 19, 2024
67334b7
devcontainer
jameslamb Sep 19, 2024
925840e
run all CI
jameslamb Sep 20, 2024
b7ff8b3
Merge branch 'branch-24.10' of github.com:rapidsai/raft into fmt-and-…
jameslamb Sep 20, 2024
90c4496
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 23, 2024
f2d8a88
remove testing-only changes [skip ci]
jameslamb Sep 23, 2024
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
Prev Previous commit
Next Next commit
try suppressing unreachable-code diagnostics from nvcc (this should b…
…e narrowed down / upstreamed before merging)
  • Loading branch information
jameslamb committed Sep 17, 2024

Verified

This commit was signed with the committer’s verified signature.
jameslamb James Lamb
commit 3ba2201d678cc8befdfcaa0e89630a95a00a78b2
2 changes: 2 additions & 0 deletions cpp/include/raft/cluster/detail/agglomerative.cuh
Original file line number Diff line number Diff line change
@@ -22,7 +22,9 @@
#include <raft/util/cuda_utils.cuh>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <thrust/device_ptr.h>
#include <thrust/execution_policy.h>
2 changes: 2 additions & 0 deletions cpp/include/raft/cluster/detail/connectivities.cuh
Original file line number Diff line number Diff line change
@@ -29,7 +29,9 @@
#include <raft/util/cuda_utils.cuh>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <thrust/iterator/zip_iterator.h>
#include <thrust/transform.h>
2 changes: 2 additions & 0 deletions cpp/include/raft/cluster/detail/kmeans.cuh
Original file line number Diff line number Diff line change
@@ -38,8 +38,10 @@
#include <raft/random/rng.cuh>
#include <raft/util/cuda_utils.cuh>

#pragma nv_diag_suppress 128
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <cuda.h>
#include <thrust/fill.h>
2 changes: 2 additions & 0 deletions cpp/include/raft/cluster/detail/kmeans_balanced.cuh
Original file line number Diff line number Diff line change
@@ -41,10 +41,12 @@
#include <raft/util/device_atomics.cuh>
#include <raft/util/integer_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_scalar.hpp>
#include <rmm/mr/device/managed_memory_resource.hpp>
#include <rmm/resource_ref.hpp>
#pragma nv_diag_default 128

#include <thrust/gather.h>
#include <thrust/transform.h>
2 changes: 2 additions & 0 deletions cpp/include/raft/cluster/detail/kmeans_common.cuh
Original file line number Diff line number Diff line change
@@ -36,8 +36,10 @@
#include <raft/random/rng.cuh>
#include <raft/util/cuda_utils.cuh>

#pragma nv_diag_suppress 128
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <cub/cub.cuh>
#include <cuda.h>
2 changes: 2 additions & 0 deletions cpp/include/raft/cluster/detail/mst.cuh
Original file line number Diff line number Diff line change
@@ -23,7 +23,9 @@
#include <raft/util/cuda_utils.cuh>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <thrust/device_ptr.h>
#include <thrust/execution_policy.h>
2 changes: 2 additions & 0 deletions cpp/include/raft/cluster/detail/single_linkage.cuh
Original file line number Diff line number Diff line change
@@ -23,7 +23,9 @@
#include <raft/core/resource/cuda_stream.hpp>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

namespace raft::cluster::detail {

2 changes: 2 additions & 0 deletions cpp/include/raft/comms/detail/mpi_comms.hpp
Original file line number Diff line number Diff line change
@@ -22,8 +22,10 @@
#include <raft/core/resources.hpp>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_scalar.hpp>
#pragma nv_diag_default 128

#include <mpi.h>
#include <nccl.h>
2 changes: 2 additions & 0 deletions cpp/include/raft/comms/detail/std_comms.hpp
Original file line number Diff line number Diff line change
@@ -23,8 +23,10 @@
#include <raft/core/resources.hpp>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <cuda_runtime.h>
#include <thrust/iterator/zip_iterator.h>
2 changes: 2 additions & 0 deletions cpp/include/raft/comms/detail/test.hpp
Original file line number Diff line number Diff line change
@@ -21,8 +21,10 @@
#include <raft/core/resource/cuda_stream.hpp>
#include <raft/core/resources.hpp>

#pragma nv_diag_suppress 128
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <iostream>
#include <numeric>
2 changes: 2 additions & 0 deletions cpp/include/raft/core/detail/callback_sink.hpp
Original file line number Diff line number Diff line change
@@ -18,10 +18,12 @@
#include <iostream>
#include <mutex>

#pragma nv_diag_suppress 128
#define SPDLOG_HEADER_ONLY
#include <spdlog/common.h>
#include <spdlog/details/log_msg.h>
#include <spdlog/sinks/base_sink.h>
#pragma nv_diag_default 128

namespace spdlog::sinks {

2 changes: 2 additions & 0 deletions cpp/include/raft/core/detail/nvtx.hpp
Original file line number Diff line number Diff line change
@@ -16,7 +16,9 @@

#pragma once

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#pragma nv_diag_default 128

#ifdef NVTX_ENABLED

2 changes: 2 additions & 0 deletions cpp/include/raft/core/device_container_policy.hpp
Original file line number Diff line number Diff line change
@@ -29,10 +29,12 @@
#include <raft/core/resource/device_memory_resource.hpp>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_uvector.hpp>
#include <rmm/mr/device/per_device_resource.hpp>
#include <rmm/resource_ref.hpp>
#pragma nv_diag_default 128

#include <thrust/device_ptr.h>

2 changes: 2 additions & 0 deletions cpp/include/raft/core/device_mdarray.hpp
Original file line number Diff line number Diff line change
@@ -21,7 +21,9 @@
#include <raft/core/mdarray.hpp>
#include <raft/core/resources.hpp>

#pragma nv_diag_suppress 128
#include <rmm/resource_ref.hpp>
#pragma nv_diag_default 128

#include <cstdint>

2 changes: 2 additions & 0 deletions cpp/include/raft/core/device_resources.hpp
Original file line number Diff line number Diff line change
@@ -35,9 +35,11 @@
#include <raft/core/resource/thrust_policy.hpp>
#include <raft/core/resources.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_pool.hpp>
#include <rmm/exec_policy.hpp>
#include <rmm/mr/device/device_memory_resource.hpp>
#pragma nv_diag_default 128

#include <cuda_runtime.h>

2 changes: 2 additions & 0 deletions cpp/include/raft/core/device_resources_manager.hpp
Original file line number Diff line number Diff line change
@@ -18,11 +18,13 @@
#include <raft/core/device_resources.hpp>
#include <raft/core/device_setter.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_device.hpp>
#include <rmm/cuda_stream.hpp>
#include <rmm/cuda_stream_pool.hpp>
#include <rmm/mr/device/cuda_memory_resource.hpp>
#include <rmm/mr/device/per_device_resource.hpp>
#pragma nv_diag_default 128

#include <algorithm>
#include <memory>
2 changes: 2 additions & 0 deletions cpp/include/raft/core/interruptible.hpp
Original file line number Diff line number Diff line change
@@ -22,7 +22,9 @@
#include <raft/core/error.hpp>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#pragma nv_diag_default 128

#include <memory>
#include <mutex>
2 changes: 2 additions & 0 deletions cpp/include/raft/core/logger-inl.hpp
Original file line number Diff line number Diff line change
@@ -34,8 +34,10 @@
#include <raft/core/detail/callback_sink.hpp>
#include <raft/core/detail/macros.hpp> // RAFT_INLINE_CONDITIONAL

#pragma nv_diag_suppress 128
#include <spdlog/sinks/stdout_color_sinks.h> // NOLINT
#include <spdlog/spdlog.h> // NOLINT
#pragma nv_diag_default 128

namespace raft {

2 changes: 2 additions & 0 deletions cpp/include/raft/core/managed_container_policy.hpp
Original file line number Diff line number Diff line change
@@ -23,7 +23,9 @@
#include <raft/core/resource/device_memory_resource.hpp>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/mr/device/managed_memory_resource.hpp>
#pragma nv_diag_default 128

namespace raft {
/**
2 changes: 2 additions & 0 deletions cpp/include/raft/core/resource/cuda_stream.hpp
Original file line number Diff line number Diff line change
@@ -20,7 +20,9 @@
#include <raft/core/resources.hpp>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#pragma nv_diag_default 128

#include <cuda_runtime.h>

2 changes: 2 additions & 0 deletions cpp/include/raft/core/resource/cusolver_dn_handle.hpp
Original file line number Diff line number Diff line change
@@ -21,7 +21,9 @@
#include <raft/core/resource/resource_types.hpp>
#include <raft/core/resources.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#pragma nv_diag_default 128

#include <cusolverDn.h>

2 changes: 2 additions & 0 deletions cpp/include/raft/core/resource/device_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -20,10 +20,12 @@
#include <raft/core/resources.hpp>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/mr/device/device_memory_resource.hpp>
#include <rmm/mr/device/limiting_resource_adaptor.hpp>
#include <rmm/mr/device/per_device_resource.hpp>
#include <rmm/mr/device/pool_memory_resource.hpp>
#pragma nv_diag_default 128

#include <cstddef>
#include <optional>
3 changes: 3 additions & 0 deletions cpp/include/raft/core/resource/thrust_policy.hpp
Original file line number Diff line number Diff line change
@@ -19,7 +19,10 @@
#include <raft/core/resource/resource_types.hpp>
#include <raft/core/resources.hpp>

#pragma nv_diag_suppress 128
#include <rmm/exec_policy.hpp>
#pragma nv_diag_default 128

namespace raft::resource {
class thrust_policy_resource : public resource {
public:
2 changes: 2 additions & 0 deletions cpp/include/raft/core/stream_view.hpp
Original file line number Diff line number Diff line change
@@ -20,7 +20,9 @@
#ifndef RAFT_DISABLE_CUDA
#include <raft/core/interruptible.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#pragma nv_diag_default 128
#endif

namespace raft {
Original file line number Diff line number Diff line change
@@ -31,7 +31,9 @@
#include <raft/util/cudart_utils.hpp> // getMultiProcessorCount
#include <raft/util/cutlass_utils.cuh> // RAFT_CUTLASS_TRY

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <cuda/semaphore>

2 changes: 2 additions & 0 deletions cpp/include/raft/distance/detail/masked_nn.cuh
Original file line number Diff line number Diff line change
@@ -24,7 +24,9 @@
#include <raft/linalg/contractions.cuh>
#include <raft/util/cuda_utils.cuh>

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <stdint.h>

Original file line number Diff line number Diff line change
@@ -32,7 +32,9 @@
#include <raft/distance/detail/distance_ops/cutlass.cuh>
#include <raft/util/cutlass_utils.cuh>

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <cutlass/cutlass.h>
#include <cutlass/gemm/device/gemm.h>
2 changes: 2 additions & 0 deletions cpp/include/raft/distance/distance-ext.cuh
Original file line number Diff line number Diff line change
@@ -22,7 +22,9 @@
#include <raft/distance/distance_types.hpp> // raft::distance::DistanceType
#include <raft/util/raft_explicit.hpp> // RAFT_EXPLICIT

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp> // rmm::device_uvector
#pragma nv_diag_default 128

#ifdef RAFT_EXPLICIT_INSTANTIATE_ONLY

2 changes: 2 additions & 0 deletions cpp/include/raft/distance/distance-inl.cuh
Original file line number Diff line number Diff line change
@@ -21,7 +21,9 @@
#include <raft/distance/detail/distance.cuh>
#include <raft/distance/distance_types.hpp>

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <type_traits>

2 changes: 2 additions & 0 deletions cpp/include/raft/label/detail/classlabels.cuh
Original file line number Diff line number Diff line change
@@ -21,8 +21,10 @@
#include <raft/util/cuda_utils.cuh>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <cub/cub.cuh>

2 changes: 2 additions & 0 deletions cpp/include/raft/linalg/detail/coalesced_reduction-inl.cuh
Original file line number Diff line number Diff line change
@@ -20,7 +20,9 @@
#include <raft/core/operators.hpp>
#include <raft/util/cuda_utils.cuh>

#pragma nv_diag_suppress 128
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <cub/cub.cuh>

2 changes: 2 additions & 0 deletions cpp/include/raft/linalg/detail/eig.cuh
Original file line number Diff line number Diff line change
@@ -24,9 +24,11 @@
#include <raft/matrix/copy.cuh>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream.hpp>
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <cuda_runtime_api.h>

2 changes: 2 additions & 0 deletions cpp/include/raft/linalg/detail/lstsq.cuh
Original file line number Diff line number Diff line change
@@ -34,9 +34,11 @@
#include <raft/matrix/math.cuh>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

namespace raft {
namespace linalg {
2 changes: 2 additions & 0 deletions cpp/include/raft/linalg/detail/map.cuh
Original file line number Diff line number Diff line change
@@ -25,7 +25,9 @@
#include <raft/util/pow2_utils.cuh>
#include <raft/util/vectorized.cuh>

#pragma nv_diag_suppress 128
#include <rmm/cuda_stream_view.hpp>
#pragma nv_diag_default 128

#include <thrust/tuple.h>

2 changes: 2 additions & 0 deletions cpp/include/raft/linalg/detail/qr.cuh
Original file line number Diff line number Diff line change
@@ -23,8 +23,10 @@
#include <raft/core/resources.hpp>
#include <raft/matrix/triangular.cuh>

#pragma nv_diag_suppress 128
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

#include <algorithm>

2 changes: 2 additions & 0 deletions cpp/include/raft/linalg/detail/svd.cuh
Original file line number Diff line number Diff line change
@@ -34,8 +34,10 @@
#include <raft/util/cuda_utils.cuh>
#include <raft/util/cudart_utils.hpp>

#pragma nv_diag_suppress 128
#include <rmm/device_scalar.hpp>
#include <rmm/device_uvector.hpp>
#pragma nv_diag_default 128

namespace raft {
namespace linalg {
Loading