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

[EPIC] RAPIDS Should not need to patch CCCL #1939

Open
1 task
jrhemstad opened this issue Jul 3, 2024 · 4 comments
Open
1 task

[EPIC] RAPIDS Should not need to patch CCCL #1939

jrhemstad opened this issue Jul 3, 2024 · 4 comments

Comments

@jrhemstad
Copy link
Collaborator

jrhemstad commented Jul 3, 2024

RAPIDS currently has to apply a variety of patches to CCCL source code to work around various issues.

This issue is to track eliminating the need for RAPIDS to apply any patches to CCCL source code.

To start, for each patch we need a separate issue created with the following information:

  • Link to patch file
  • Summary of what the patch is for
  • Link to PR that added patch and any other relevant context
  • High level of proposed solution, or TBD

All issues should be added to this task list:

Tasks

@trxcllnt
Copy link
Member

trxcllnt commented Jul 3, 2024

The patches we apply to all RAPIDS libraries:

The patches we apply exclusively to cuDF:

@bdice
Copy link
Contributor

bdice commented Jul 7, 2024

I made some progress here. The patch reverting PR 211 is actually masking a bug in cuSpatial, which I fixed. This patch can be removed from rapids-cmake and cuDF. See these PRs I just opened. They should merge in this order:

  1. Fix multipolygon geometry iterator. rapidsai/cuspatial#1402
  2. Remove CCCL patch for PR 211. rapidsai/cudf#16207
  3. Remove CCCL patch for PR 211. rapidsai/rapids-cmake#640

Next steps would be to investigate the patches for only cuDF, specifically macros to reduce compile time (64 bit dispatch and fewer CUB arch policies).

@bdice bdice mentioned this issue Jul 8, 2024
2 tasks
@jrhemstad
Copy link
Collaborator Author

jrhemstad commented Jul 8, 2024

Next steps would be to investigate the patches for only cuDF, specifically macros to reduce compile time (64 bit dispatch and fewer CUB arch policies).

I just filed: #1958

For fewer CUB arch policies, I'm still a bit confused tbh. My understanding of ChainedPolicy in CUB is that this patch should have no impact on compile time because CUB only instantiates kernels for the architectures you build for. I need @gevtushenko to look at that patch because he knows ChainedPolicy way better than I do.

rapids-bot bot pushed a commit to rapidsai/cudf that referenced this issue Jul 9, 2024
While upgrading CCCL, we ran into a test failure in cuSpatial. We added a patch to revert some changes from CCCL but the root cause was a bug in cuSpatial. I have fixed that bug here: rapidsai/cuspatial#1402

Once that PR is merged, we can remove this CCCL patch.

See also:
- rapids-cmake patch removal: rapidsai/rapids-cmake#640
- Original rapids-cmake patch: rapidsai/rapids-cmake#511
- CCCL epic to remove RAPIDS patches: NVIDIA/cccl#1939

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

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

URL: #16207
rapids-bot bot pushed a commit to rapidsai/rapids-cmake that referenced this issue Jul 9, 2024
While upgrading CCCL, we ran into a test failure in cuSpatial. We added a patch to revert some changes from CCCL but the root cause was a bug in cuSpatial. I have fixed that bug here: rapidsai/cuspatial#1402

Once that PR is merged, we can remove this CCCL patch.

See also:
- #511
- NVIDIA/cccl#1939

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

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

URL: #640
@bdice
Copy link
Contributor

bdice commented Jul 9, 2024

All three PRs above have merged, which should fix up the RAPIDS CCCL devcontainer builds. The remaining cuDF patches should apply cleanly over the current CCCL. To continue removing those cuDF patches, I think #1958 is the next step.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Todo
Development

No branches or pull requests

3 participants