Skip to content

Remove deprecated headers#2939

Open
aamijar wants to merge 9 commits intorapidsai:mainfrom
aamijar:raft-deprecated-headers
Open

Remove deprecated headers#2939
aamijar wants to merge 9 commits intorapidsai:mainfrom
aamijar:raft-deprecated-headers

Conversation

@aamijar
Copy link
Member

@aamijar aamijar commented Feb 3, 2026 •
edited
Loading

Depends on rapidsai/cuvs#1763. Resolves #2937

This PR does the following:

  1. Removes files with the following message
#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
  1. Removes files with the following message
/**
 * This file is deprecated and will be removed in a future release.
 */
  1. Pulls from correct non-deprecated headers like usingraft/util/cudart_utils.cuh instead of raft/core/cudart_utils.cuh
  2. 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.
  3. 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: 🟢

@aamijar aamijar requested review from a team as code owners February 3, 2026 06:49
@aamijar aamijar self-assigned this Feb 3, 2026
@aamijar aamijar added breaking Breaking change improvement Improvement / enhancement to an existing function labels Feb 3, 2026
@aamijar aamijar changed the title raft-deprecated-headers Remove deprecated headers Feb 3, 2026
This was referenced Feb 3, 2026
Merged
Merged
@aamijar aamijar added Public API Affects cuML PR or issue affects downstream cuML Affects cuVS PR or issue affects downstream cuVS labels Feb 3, 2026
bdice
bdice approved these changes Feb 3, 2026
View reviewed changes
Copy link
Contributor

@bdice bdice left a comment

Choose a reason for hiding this comment

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

Approving CMake changes.

rapids-bot bot pushed a commit to rapidsai/cuvs that referenced this pull request Feb 3, 2026
@aamijar
Update raft headers (#1763)
3a9228c 
Prepares for rapidsai/raft#2939.

This PR updates the following headers:

| old | new |
|-----|-----|
| `#include <raft/core/cudart_utils.hpp>` | `#include <raft/util/cudart_utils.hpp>` |
| `#include <raft/common/nvtx.hpp>` | `#include <raft/core/nvtx.hpp>` |
| `#include <raft/sparse/linalg/masked_matmul.hpp>` | `#include <raft/sparse/linalg/masked_matmul.cuh>` |
| `#include <raft/linalg/gemm.hpp>` | `#include <raft/linalg/gemm.cuh>` |
| `#include <raft/sparse/mst/mst.cuh>` | `#include <raft/sparse/solver/mst.cuh>` |

Authors:
  - Anupam (https://github.com/aamijar)

Approvers:
  - Jinsol Park (https://github.com/jinsolp)
  - Corey J. Nolet (https://github.com/cjnolet)

URL: #1763
benfred pushed a commit to benfred/cuvs that referenced this pull request Feb 10, 2026
@aamijar @benfred
Update raft headers (rapidsai#1763)
fd544da 
Prepares for rapidsai/raft#2939.

This PR updates the following headers:

| old | new |
|-----|-----|
| `#include <raft/core/cudart_utils.hpp>` | `#include <raft/util/cudart_utils.hpp>` |
| `#include <raft/common/nvtx.hpp>` | `#include <raft/core/nvtx.hpp>` |
| `#include <raft/sparse/linalg/masked_matmul.hpp>` | `#include <raft/sparse/linalg/masked_matmul.cuh>` |
| `#include <raft/linalg/gemm.hpp>` | `#include <raft/linalg/gemm.cuh>` |
| `#include <raft/sparse/mst/mst.cuh>` | `#include <raft/sparse/solver/mst.cuh>` |

Authors:
  - Anupam (https://github.com/aamijar)

Approvers:
  - Jinsol Park (https://github.com/jinsolp)
  - Corey J. Nolet (https://github.com/cjnolet)

URL: rapidsai#1763
@cjnolet
Copy link
Member

cjnolet commented Feb 13, 2026

I know this change might seem harmless but let's make sure we test downstream libraries before we merge it.

dantegd
dantegd requested changes Feb 13, 2026
View reviewed changes
Copy link
Member

@dantegd dantegd left a comment

Choose a reason for hiding this comment

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

Just had a comment, leaving a request for change just while we hear about testing downstream dependencies as @cjnolet suggested, would be nice to avoid CI breakages :)

cpp/include/raft/sparse/solver/detail/lanczos.cuh Outdated
#include <raft/matrix/diagonal.cuh>
#include <raft/matrix/gather.cuh>
#include <raft/matrix/matrix.cuh>
// include <raft/matrix/matrix.cuh>
Copy link
Member

@dantegd dantegd Feb 13, 2026

Choose a reason for hiding this comment

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

Need to remove the commented include?

Copy link
Member Author

@aamijar aamijar Feb 13, 2026

Choose a reason for hiding this comment

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

done in f8d851e!

cpp/include/raft/matrix/ratio.cuh
Comment on lines +65 to +67
void ratio(raft::resources const& handle,
raft::device_vector_view<const math_t, idx_t> src,
raft::device_vector_view<math_t, idx_t> dest)
Copy link
Member

@dantegd dantegd Feb 13, 2026

Choose a reason for hiding this comment

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

Nice update to the API :)

This was referenced Feb 13, 2026
Open
Open
Open
Open
@aamijar
Copy link
Member Author

aamijar commented Feb 13, 2026

Just had a comment, leaving a request for change just while we hear about testing downstream dependencies as @cjnolet suggested, would be nice to avoid CI breakages :)

Testing CI on all downstream repos now

@aamijar
Copy link
Member Author

aamijar commented Feb 13, 2026

Glad I tested CI for cugraph and cuopt too, since those are breaking with this change!

(cugraph) https://github.com/rapidsai/cugraph/actions/runs/21995874700/job/63555618060?pr=5429#step:9:4440
(cuopt) https://github.com/NVIDIA/cuopt/actions/runs/21996113135/job/63556997488?pr=865#step:13:1421

@aamijar aamijar added Affects cuGraph PR or issue affects downstream cuGraph Affects cuOpt labels Feb 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dantegd dantegd dantegd requested changes

@bdice bdice bdice approved these changes

@divyegala divyegala divyegala approved these changes

Requested changes must be addressed to merge this pull request.

Assignees

@aamijar aamijar

Labels

Affects cuGraph PR or issue affects downstream cuGraph Affects cuML PR or issue affects downstream cuML Affects cuOpt Affects cuVS PR or issue affects downstream cuVS breaking Breaking change improvement Improvement / enhancement to an existing function Public API

Projects

Vector Search, ML, & Data Mining Release Board
Status: In Progress

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Remove deprecated headers

5 participants

@aamijar @cjnolet @dantegd @bdice @divyegala