Skip to content

Use cpp subdirectory for RMM.#827

Merged
rapids-bot[bot] merged 9 commits intorapidsai:branch-25.06from
bdice:rmm-cpp-subdir
Apr 15, 2025
Merged

Use cpp subdirectory for RMM.#827
rapids-bot[bot] merged 9 commits intorapidsai:branch-25.06from
bdice:rmm-cpp-subdir

Conversation

@bdice
Copy link
Copy Markdown
Contributor

@bdice bdice commented Apr 15, 2025

Description

Updates for rapidsai/rmm#1883.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.
  • The cmake-format.json is up to date with these changes.
  • I have added new files under rapids-cmake/
    • I have added include guards (include_guard(GLOBAL))
    • I have added the associated docs/ rst file and update the api.rst

@bdice bdice requested a review from a team as a code owner April 15, 2025 16:43
@robertmaynard
Copy link
Copy Markdown
Contributor

We need to make this conditional based on the version returned from the json information.

We can have something like SPARK using latest rapids-cmake but pinned to a rmm/cudf before the cpp directory existed.

@bdice
Copy link
Copy Markdown
Contributor Author

bdice commented Apr 15, 2025

@robertmaynard Do you mean we need to check this across releases, or within the 25.06 release? Do users expect it is allowed to mix rapids-cmake 25.06 with RMM 25.04?

@robertmaynard
Copy link
Copy Markdown
Contributor

Do users expect it is allowed to mix rapids-cmake 25.06 with RMM 25.04?

Yes. If we want to drop support for pre src directory versions of rmm we can add a deprecatation notice in 25.06 and remove in 25.08 or 25.10

@KyleFromNVIDIA
Copy link
Copy Markdown
Member

KyleFromNVIDIA commented Apr 15, 2025

The cpm_generate_pins-format-patches and cpm_generate_pins-override failures are due to @bdice's fork of RMM not having the v22.02.00 tag. Those errors will go away once we go back to using mainline RMM (or if @bdice adds that tag to his fork). Still looking at the other failures.

@KyleFromNVIDIA KyleFromNVIDIA added improvement Improves an existing functionality non-breaking Introduces a non-breaking change labels Apr 15, 2025
@KyleFromNVIDIA
Copy link
Copy Markdown
Member

Looks like my commit fixed all the remaining test failures. CI is effectively clean now.

Co-authored-by: Kyle Edwards <kyedwards@nvidia.com>
@KyleFromNVIDIA
Copy link
Copy Markdown
Member

/merge

@rapids-bot rapids-bot bot merged commit 3c0c391 into rapidsai:branch-25.06 Apr 15, 2025
13 checks passed
@bdice bdice mentioned this pull request May 1, 2025
7 tasks
rapids-bot bot pushed a commit that referenced this pull request May 1, 2025
Follow-up to remove behavior deprecated in #827.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Robert Maynard (https://github.com/robertmaynard)

URL: #832
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

improvement Improves an existing functionality non-breaking Introduces a non-breaking change

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants