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

Add missing rmm includes #590

Merged
merged 3 commits into from
Jul 14, 2022
Merged

Conversation

harrism
Copy link
Member

@harrism harrism commented Jul 13, 2022

A recent change to libcudf removed a forward declaration and/or RMM header includes, and cuSpatial was errantly relying on these to get the definitions of device_memory_resource and get_current_device_resource().

This PR fixes that by adding missing includes of rmm/mr/device/per_device_resource.hpp in several files. It also generally cleans up include ordering and spacing, and adds a few missing copyright headers.

@harrism harrism requested a review from a team as a code owner July 13, 2022 23:36
@github-actions github-actions bot added the libcuspatial Relates to the cuSpatial C++ library label Jul 13, 2022
@harrism harrism self-assigned this Jul 13, 2022
@harrism harrism requested review from isVoid and removed request for zhangjianting and jrhemstad July 13, 2022 23:37
@harrism harrism added 3 - Ready for Review Ready for review by team bug Something isn't working non-breaking Non-breaking change labels Jul 13, 2022
Copy link
Contributor

@isVoid isVoid left a comment

Choose a reason for hiding this comment

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

One minor comments. Can merge once CI passes.

@@ -16,8 +16,9 @@

#pragma once

#include <cuda.h>
//#include <cuda.h>
Copy link
Contributor

Choose a reason for hiding this comment

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

We should remove this because it's redundant of cuda_runtime_api.h?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, I was testing commenting it out and forgot to remove it. Yes, will remove.

@harrism
Copy link
Member Author

harrism commented Jul 14, 2022

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 4ad60d3 into rapidsai:branch-22.08 Jul 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3 - Ready for Review Ready for review by team bug Something isn't working libcuspatial Relates to the cuSpatial C++ library non-breaking Non-breaking change
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants