Unify return type of oneapi::dpl::__Internal::__ranges::__pattern_minmax_element
#2496
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -1244,7 +1244,7 @@ __pattern_min_element_impl(_BackendTag __tag, _ExecutionPolicy&& __exec, _Range& | |||||
| { | ||||||
| assert(oneapi::dpl::__ranges::__size(__rng) > 0); | ||||||
|
|
||||||
| using _IteratorValueType = oneapi::dpl::__internal::__value_t<_Range>; | ||||||
| using _IndexValueType = oneapi::dpl::__internal::__difference_t<_Range>; | ||||||
| using _ReduceValueType = oneapi::dpl::__internal::tuple<_IndexValueType, _IteratorValueType>; | ||||||
|
|
||||||
|
|
@@ -1312,14 +1312,21 @@ __pattern_min(__hetero_tag<_BackendTag>, _ExecutionPolicy&& __exec, _R&& __r, _C | |||||
| // minmax_element | ||||||
| //------------------------------------------------------------------------ | ||||||
|
|
||||||
| template <typename _Range> | ||||||
| using __range_index_and_value = | ||||||
| std::pair<oneapi::dpl::__internal::__difference_t<_Range>, oneapi::dpl::__internal::__value_t<_Range>>; | ||||||
|
|
||||||
| template <typename _Range> | ||||||
| using __pattern_minmax_element_impl_return_t = | ||||||
| std::pair<__range_index_and_value<_Range>, __range_index_and_value<_Range>>; | ||||||
|
|
||||||
| template <typename _BackendTag, typename _ExecutionPolicy, typename _Range, typename _Compare> | ||||||
| __pattern_minmax_element_impl_return_t<_Range> | ||||||
| __pattern_minmax_element_impl(_BackendTag, _ExecutionPolicy&& __exec, _Range&& __rng, _Compare __comp) | ||||||
| { | ||||||
| assert(oneapi::dpl::__ranges::__size(__rng) > 0); | ||||||
|
|
||||||
| using _IteratorValueType = oneapi::dpl::__internal::__value_t<_Range>; | ||||||
| using _IndexValueType = oneapi::dpl::__internal::__difference_t<_Range>; | ||||||
| using _ReduceValueType = | ||||||
| oneapi::dpl::__internal::tuple<_IndexValueType, _IndexValueType, _IteratorValueType, _IteratorValueType>; | ||||||
|
|
@@ -1333,48 +1340,52 @@ __pattern_minmax_element_impl(_BackendTag, _ExecutionPolicy&& __exec, _Range&& _ | |||||
| // a `tuple` of `difference_type`, not the `difference_type` itself. | ||||||
| oneapi::dpl::__internal::__pattern_minmax_element_transform_fn<_ReduceValueType> __transform_fn; | ||||||
|
|
||||||
| const auto& [__idx_min, __idx_max, __val_min, __val_max] = | ||||||
| oneapi::dpl::__par_backend_hetero::__parallel_transform_reduce<_ReduceValueType, | ||||||
| ::std::false_type /*is_commutative*/>( | ||||||
| _BackendTag{}, ::std::forward<_ExecutionPolicy>(__exec), __reduce_fn, __transform_fn, | ||||||
| unseq_backend::__no_init_value{}, // no initial value | ||||||
| oneapi::dpl::__ranges::__get_subscription_view(std::forward<_Range>(__rng))) | ||||||
| .get(); | ||||||
|
|
||||||
| return {{__idx_min, __val_min}, {__idx_max, __val_max}}; | ||||||
| } | ||||||
|
|
||||||
| template <typename _BackendTag, typename _ExecutionPolicy, typename _Range, typename _Compare> | ||||||
| std::pair<oneapi::dpl::__ranges::__iterator_t<_Range>, oneapi::dpl::__ranges::__iterator_t<_Range>> | ||||||
| __pattern_minmax_element(__hetero_tag<_BackendTag>, _ExecutionPolicy&& __exec, _Range&& __rng, _Compare __comp) | ||||||
| { | ||||||
| auto __begin = oneapi::dpl::__ranges::__begin(__rng); | ||||||
|
|
||||||
| //If size == 1, result is the zero-indexed element. If size == 0, result is 0. | ||||||
| if (oneapi::dpl::__ranges::__size(__rng) < 2) | ||||||
| return {__begin, __begin}; | ||||||
|
|
||||||
| __pattern_minmax_element_impl_return_t<_Range> __res = | ||||||
| __pattern_minmax_element_impl(_BackendTag{}, std::forward<_ExecutionPolicy>(__exec), __rng, __comp); | ||||||
|
|
||||||
| return {__begin + __res.first.first, __begin + __res.second.first}; | ||||||
| } | ||||||
|
|
||||||
| #if _ONEDPL_CPP20_RANGES_PRESENT | ||||||
| template <typename _BackendTag, typename _ExecutionPolicy, typename _R, typename _Proj, typename _Comp> | ||||||
| std::pair<std::ranges::iterator_t<_R>, std::ranges::iterator_t<_R>> | ||||||
|
There was a problem hiding this comment. The return type should use
Suggested change
Copilot uses AI. Check for mistakes. There was a problem hiding this comment. Declined. As far as we apply the result of this function like in template <typename _ExecutionPolicy, typename _Range, typename _Compare>
oneapi::dpl::__internal::__enable_if_execution_policy<
_ExecutionPolicy,
::std::pair<oneapi::dpl::__internal::__difference_t<_Range>, oneapi::dpl::__internal::__difference_t<_Range>>>
minmax_element(_ExecutionPolicy&& __exec, _Range&& __rng, _Compare __comp)
{
const auto __dispatch_tag = oneapi::dpl::__ranges::__select_backend(__exec, __rng);
auto __begin = __rng.begin();
auto [__it_min, __it_max] = oneapi::dpl::__internal::__ranges::__pattern_minmax_element(
__dispatch_tag, std::forward<_ExecutionPolicy>(__exec), views::all_read(__rng), __comp);
return {std::distance(__begin, __it_min), std::distance(__begin, __it_max)};
}we can't return Also this implementation of
SergeyKopienko marked this conversation as resolved.
Show resolved
Hide resolved
SergeyKopienko marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| __pattern_minmax_element(__hetero_tag<_BackendTag> __tag, _ExecutionPolicy&& __exec, _R&& __r, _Comp __comp, | ||||||
| _Proj __proj) | ||||||
| { | ||||||
| oneapi::dpl::__internal::__binary_op<_Comp, _Proj, _Proj> __comp_2{__comp, __proj, __proj}; | ||||||
|
|
||||||
| auto __r_begin = __r.begin(); | ||||||
|
|
||||||
| auto __view = oneapi::dpl::__ranges::views::all_read(__r); | ||||||
| auto __v_begin = __view.begin(); | ||||||
| using __v_iterator_t = decltype(__v_begin); | ||||||
|
|
||||||
| std::pair<__v_iterator_t, __v_iterator_t> __res = oneapi::dpl::__internal::__ranges::__pattern_minmax_element( | ||||||
| __tag, std::forward<_ExecutionPolicy>(__exec), __view, __comp_2); | ||||||
|
|
||||||
| return {__r_begin + std::ranges::distance(__v_begin, __res.first), | ||||||
| __r_begin + std::ranges::distance(__v_begin, __res.second)}; | ||||||
| } | ||||||
|
|
||||||
| template <typename _BackendTag, typename _ExecutionPolicy, typename _R, typename _Proj, typename _Comp> | ||||||
|
|
@@ -1383,14 +1394,10 @@ __pattern_minmax(__hetero_tag<_BackendTag>, _ExecutionPolicy&& __exec, _R&& __r, | |||||
| { | ||||||
| oneapi::dpl::__internal::__binary_op<_Comp, _Proj, _Proj> __comp_2{__comp, __proj, __proj}; | ||||||
|
|
||||||
| __pattern_minmax_element_impl_return_t<_R> __res = __pattern_minmax_element_impl( | ||||||
| _BackendTag{}, std::forward<_ExecutionPolicy>(__exec), std::forward<_R>(__r), __comp_2); | ||||||
|
|
||||||
| return {__res.first.second, __res.second.second}; | ||||||
| } | ||||||
|
|
||||||
| template <typename _BackendTag, typename _ExecutionPolicy, typename _R1, typename _R2, typename _Pred, typename _Proj1, | ||||||
|
|
||||||
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
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.
This version of
minmax_elementis a part of experimental API which can accept a SYCl buffer. In that caseviews::all_readreturns a placeholder accessor.SYCL spec tells:
"... a placeholder accessor is not yet bound to a command group. Before such an accessor can be used in a command, it must be bound by calling handler::require(). Passing a placeholder accessor as an argument to a command without first being bound to a command group with handler::require() will result in undefined behavior."
So, a result of
accessor::begin()call is undefined behavior.