-
Notifications
You must be signed in to change notification settings - Fork 908
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
Use cuda::proclaim_return_type on device lambdas. #14577
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
62d8a69
Use cuda::proclaim_return_type on device lambdas.
bdice 5df3d39
Apply suggestions from code review.
bdice 7f79602
Merge remote-tracking branch 'upstream/branch-24.02' into proclaim_re…
bdice edf4370
Revert accidental removal of cuda::proclaim_return_type.
bdice 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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -478,7 +478,10 @@ class mutable_column_view : public detail::column_view_base { | |||||
public: | ||||||
mutable_column_view() = default; | ||||||
|
||||||
~mutable_column_view() = default; | ||||||
~mutable_column_view(){ | ||||||
// Needed so that the first instance of the implicit destructor for any TU isn't 'constructed' | ||||||
// from a host+device function marking the implicit version also as host+device | ||||||
}; | ||||||
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 will trigger IDE warning.
Suggested change
|
||||||
|
||||||
mutable_column_view(mutable_column_view const&) = default; ///< Copy constructor | ||||||
mutable_column_view(mutable_column_view&&) = default; ///< Move constructor | ||||||
|
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 |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* | ||
* Copyright (c) 2023, NVIDIA CORPORATION. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#pragma once | ||
|
||
/** | ||
* @brief A casting functor wrapping another functor. | ||
* @file | ||
*/ | ||
|
||
#include <cudf/types.hpp> | ||
|
||
#include <cuda/functional> | ||
|
||
#include <type_traits> | ||
#include <utility> | ||
|
||
namespace cudf { | ||
namespace detail { | ||
|
||
/** | ||
* @brief Functor that casts another functor's result to a specified type. | ||
* | ||
* CUB 2.0.0 reductions require that the binary operator returns the same type | ||
* as the initial value type, so we wrap binary operators with this when used | ||
* by CUB. | ||
*/ | ||
template <typename ResultType, typename F> | ||
struct cast_functor_fn { | ||
F f; | ||
|
||
template <typename... Ts> | ||
CUDF_HOST_DEVICE inline ResultType operator()(Ts&&... args) | ||
{ | ||
return static_cast<ResultType>(f(std::forward<Ts>(args)...)); | ||
} | ||
}; | ||
|
||
/** | ||
* @brief Function creating a casting functor. | ||
*/ | ||
template <typename ResultType, typename F> | ||
inline cast_functor_fn<ResultType, std::decay_t<F>> cast_functor(F&& f) | ||
{ | ||
return cast_functor_fn<ResultType, std::decay_t<F>>{std::forward<F>(f)}; | ||
} | ||
|
||
} // namespace detail | ||
|
||
} // namespace cudf |
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
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
Oops, something went wrong.
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.
wat :D
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.
That's a comment we acquired with help from @robertmaynard. I was suffering from inexplicable compilation problems and this fixed it.