[Backport 3.2] Fix __query_or CPO
#7267
Merged
+204
−24
Conversation
This file contains hidden or 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
miscco
force-pushed
the
backport_fix_query_or
branch
3 times, most recently
from
061def9 to
9bec5a6
Compare
bernhardmgruber
approved these changes
Jan 16, 2026
miscco
force-pushed
the
backport_fix_query_or
branch
2 times, most recently
from
b2a0d16 to
a11f836
Compare
We want to be able to also handle fallbacks, so add those CPOs
miscco
force-pushed
the
backport_fix_query_or
branch
from
a11f836 to
6d222cb
Compare
bernhardmgruber
approved these changes
Jan 16, 2026
bernhardmgruber
approved these changes
Jan 16, 2026
This comment has been minimized.
This comment has been minimized.
Co-authored-by: Bernhard Manfred Gruber <[email protected]>
Its relatively easy to not properly pass a memory resource
miscco
force-pushed
the
backport_fix_query_or
branch
from
4edb2ec to
0048f78
Compare
bernhardmgruber
approved these changes
Jan 19, 2026
Contributor
bernhardmgruber
left a comment
bernhardmgruber
left a comment
There was a problem hiding this comment.
This LGTM, but I would also like @gevtushenko 's opinion, since he divised the original query_or pattern and my knowledge about it is limited.
| #include <cub/util_namespace.cuh> | ||
|
|
||
| #include <cuda/__functional/address_stability.h> | ||
| #include <cuda/__functional/call_or.h> |
Contributor
There was a problem hiding this comment.
Remark: I think this is not strictly necessary, since there are no other changes in this file.
Alternatively, you can also use call_or in the implementation below.
Contributor
Author
There was a problem hiding this comment.
Yeah that is a merge conflict, because the environment APIs came after 3.2
That said I would like to not run another CI run for this
Contributor
🥳 CI Workflow Results🟩 Finished in 4h 30m: Pass: 100%/134 | Total: 2d 23h | Max: 4h 30m | Hits: 96%/269962See results here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The
__query_orcurrently requires that the query is always of the formenv.query(CPO, args...)However, we also want that to work with types that are their own query, which would satisfy
cpo(env, args...)This is the case for
::cuda::get_stream(::cudaStream_t)and also for our memory resources