Skip to content

Remove deprecated headers#2939

Merged
rapids-bot[bot] merged 10 commits intorapidsai:mainfrom
aamijar:raft-deprecated-headers
Feb 23, 2026
Merged

Remove deprecated headers#2939
rapids-bot[bot] merged 10 commits intorapidsai:mainfrom
aamijar:raft-deprecated-headers

Conversation

@aamijar
Copy link
Copy Markdown
Member

@aamijar aamijar commented Feb 3, 2026

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
@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
@aamijar aamijar moved this to In Progress in Unstructured Data Processing Feb 3, 2026
Copy link
Copy Markdown
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
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
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
Copy Markdown
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.

Copy link
Copy Markdown
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 :)

#include <raft/matrix/diagonal.cuh>
#include <raft/matrix/gather.cuh>
#include <raft/matrix/matrix.cuh>
// include <raft/matrix/matrix.cuh>
Copy link
Copy Markdown
Member

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
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

done in f8d851e!

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
Copy Markdown
Member

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 :)

@aamijar
Copy link
Copy Markdown
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
Copy Markdown
Member Author

aamijar commented Feb 13, 2026

@aamijar aamijar added Affects cuGraph PR or issue affects downstream cuGraph Affects cuOpt labels Feb 13, 2026
rapids-bot bot pushed a commit to NVIDIA/cuopt that referenced this pull request Feb 18, 2026
Testing with rapidsai/raft#2939 and adding fixes.


## Summary by CodeRabbit

* **Chores**
  * Unified include paths for RAFT NVTX and cuSPARSE headers across the codebase.
  * Bumped header copyright years to 2026.

* **Tests**
  * Updated test files to use the new RAFT header paths.

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

Approvers:
  - Hugo Linsenmaier (https://github.com/hlinsen)

URL: #865
rapids-bot bot pushed a commit to rapidsai/cugraph that referenced this pull request Feb 23, 2026
@aamijar
Copy link
Copy Markdown
Member Author

aamijar commented Feb 23, 2026

@dantegd, could you resolve your request for changes if everything has been resolved.
The last downstream PR (cugraph) has been merged now so we should be good to merge this PR.

@aamijar
Copy link
Copy Markdown
Member Author

aamijar commented Feb 23, 2026

/merge

@rapids-bot rapids-bot bot merged commit bda45d1 into rapidsai:main Feb 23, 2026
77 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in Unstructured Data Processing Feb 23, 2026
achirkin added a commit to achirkin/raft that referenced this pull request Feb 24, 2026
Merges Remove deprecated headers (rapidsai#2939). Conflict resolutions:
- rsvd.cuh: Use new mdspan-based raft::matrix::sqrt and reciprocal APIs
  (they have internal dry-run guards); kept cudaMemsetAsync guard
- svd.cuh: Use raft::matrix::weighted_sqrt (has internal dry-run guard)
- matrix.cuh: Accept deletion (deprecated, removed in main)

Co-authored-by: Cursor <cursoragent@cursor.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Status: Done

Development

Successfully merging this pull request may close these issues.

Remove deprecated headers

5 participants