Skip to content

Commit bda45d1

Browse files
authored
Remove deprecated headers (#2939)
Depends on rapidsai/cuvs#1763. Resolves #2937 This PR does the following: 1. Removes files with the following message ```cpp #ifndef RAFT_HIDE_DEPRECATION_WARNINGS #pragma message(__FILE__ \ " is deprecated and will be removed in a future release." \ " Please use the raft/sparse/solver version instead.") #endif ``` 2. Removes files with the following message ```cpp /** * This file is deprecated and will be removed in a future release. */ ``` 3. Pulls from correct non-deprecated headers like using`raft/util/cudart_utils.cuh` instead of `raft/core/cudart_utils.cuh` 4. Pulls correct functionality from non-deprecated headers like using `raft/linalg/matrix_vector.cuh` instead of `raft/matrix/math.cuh`. This requires using the newer mdspan based apis. 5. Consolidates `gemm.cuh` and `gemm.hpp` into just `gemm.cuh` **Update:** There were a couple of fixes included in this PR that I have decoupled. Instead those fixes should be merged in #2940. This will allow us to unravel the merging sequence better to avoid breaking changes altogether. Still marking this PR as breaking for awareness purposes. After merging #2940, the cuml side and cuvs side can be updated to use the non-deprecated apis. Then we can merge this raft PR to remove the deprecated and unused headers. **Update:** There are a couple of breaking changes that affect cugraph and cuopt, so we will need to merge fixes for those first. **Merging sequence:** #2940 -> rapidsai/cuvs#1763 -> rapidsai/cuml#7752 -> rapidsai/cuml#7797 -> rapidsai/cugraph#5429 -> NVIDIA/cuopt#865 -> #2939 **Downstream libraries CI status:** cuvs: 🟢 cuml: 🟢 cugraph: 🟢 cuopt: 🟢 Authors: - Anupam (https://github.com/aamijar) Approvers: - Bradley Dice (https://github.com/bdice) - Divye Gala (https://github.com/divyegala) - Dante Gama Dessavre (https://github.com/dantegd) URL: #2939
1 parent fb53729 commit bda45d1

61 files changed

Lines changed: 226 additions & 1394 deletions

Some content is hidden

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

cpp/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -450,13 +450,6 @@ install(
450450
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
451451
)
452452

453-
# Temporary install of raft.hpp while the file is removed
454-
install(
455-
FILES include/raft.hpp
456-
COMPONENT raft
457-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/raft
458-
)
459-
460453
install(
461454
FILES ${CMAKE_CURRENT_BINARY_DIR}/include/raft/version_config.hpp
462455
COMPONENT raft

cpp/bench/prims/core/copy.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2023-2025, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2023-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#include <common/benchmark.hpp>
66

77
#include <raft/core/copy.cuh>
8-
#include <raft/core/cudart_utils.hpp>
98
#include <raft/core/device_mdarray.hpp>
109
#include <raft/core/device_resources.hpp>
1110
#include <raft/core/host_mdarray.hpp>
1211
#include <raft/core/mdspan_types.hpp>
1312
#include <raft/core/memory_type.hpp>
13+
#include <raft/util/cudart_utils.hpp>
1414

1515
#include <cuda/std/mdspan>
1616

cpp/include/raft.hpp

Lines changed: 0 additions & 27 deletions
This file was deleted.

cpp/include/raft/common/cub_wrappers.cuh

Lines changed: 0 additions & 23 deletions
This file was deleted.

cpp/include/raft/common/device_loads_stores.cuh

Lines changed: 0 additions & 22 deletions
This file was deleted.

cpp/include/raft/common/nvtx.hpp

Lines changed: 0 additions & 13 deletions
This file was deleted.

cpp/include/raft/common/scatter.cuh

Lines changed: 0 additions & 22 deletions
This file was deleted.

cpp/include/raft/common/seive.hpp

Lines changed: 0 additions & 22 deletions
This file was deleted.

cpp/include/raft/comms/comms.hpp

Lines changed: 0 additions & 12 deletions
This file was deleted.

cpp/include/raft/comms/comms_test.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2021-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

66
#pragma once
77

8-
#include <raft/comms/comms.hpp>
98
#include <raft/comms/detail/test.hpp>
9+
#include <raft/core/comms.hpp>
1010
#include <raft/core/resources.hpp>
1111

1212
namespace raft {

0 commit comments

Comments
 (0)