-
Notifications
You must be signed in to change notification settings - Fork 201
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
Skip async mr tests when cuda runtime/driver < 11.2 #986
Merged
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
445001e
Skip async mr tests when cuda runtime/driver < 11.2
rongou 7f9e08e
patch to correctly execute all of the tests
rongou 62daf8e
skip other async tests
rongou 8bf1edf
add is_supported() to async mr
rongou b1cbb1f
return nullptr if async is not supported
rongou f6ce7bd
use cudaDeviceGetAttribute
rongou 0470d44
explicit nullptr
rongou 4222061
fix tests for older cuda driver
rongou File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -234,6 +234,10 @@ struct mr_test : public ::testing::TestWithParam<mr_factory> { | |
{ | ||
auto factory = GetParam().factory; | ||
mr = factory(); | ||
if (mr == nullptr) { | ||
GTEST_SKIP() << "Skipping tests since the memory resource is not supported with this CUDA " | ||
<< "driver/runtime version"; | ||
} | ||
} | ||
|
||
std::shared_ptr<rmm::mr::device_memory_resource> mr; ///< Pointer to resource to use in tests | ||
|
@@ -246,7 +250,13 @@ struct mr_allocation_test : public mr_test { | |
/// MR factory functions | ||
inline auto make_cuda() { return std::make_shared<rmm::mr::cuda_memory_resource>(); } | ||
|
||
inline auto make_cuda_async() { return std::make_shared<rmm::mr::cuda_async_memory_resource>(); } | ||
inline auto make_cuda_async() | ||
{ | ||
if (rmm::mr::cuda_async_memory_resource::is_supported()) { | ||
return std::make_shared<rmm::mr::cuda_async_memory_resource>(); | ||
} | ||
return std::shared_ptr<rmm::mr::cuda_async_memory_resource>{}; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a bit subtle since the only difference is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
} | ||
|
||
inline auto make_managed() { return std::make_shared<rmm::mr::managed_memory_resource>(); } | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Putting the
GTEST_SKIP
directly in themake_cuda_async
doesn't work? I'm not sure whatGTEST_SKIP
actually does or what scope it needs to be used in.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a macro that only works in a test method or
SetUp
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I thought it might throw an exception that gtest knows to catch or something.