Skip to content

[oneDPL][ranges] A fix for ranges::transform algo - it requires all input and output ranges to be sized. #2096

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[oneDPL][ranges] A fix for ranges::transform algo - it requires all input and output ranges to be sized. #2096

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9607c9
[oneDPL][ranges] + a fix: ranges::transform algo requires the all 3 r…
MikeDvorskiy Mar 4, 2025
44c17de
[oneDPL][ranges] only size_range support, test updated
MikeDvorskiy Mar 7, 2025
31cfe92
++
MikeDvorskiy Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions include/oneapi/dpl/pstl/glue_algorithm_ranges_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,32 +102,28 @@ struct __transform_fn
template<typename _ExecutionPolicy, std::ranges::random_access_range _R1, std::ranges::random_access_range _R2,
std::ranges::random_access_range _OutRange, std::copy_constructible _F, typename _Proj1 = std::identity,
typename _Proj2 = std::identity>
requires oneapi::dpl::is_execution_policy_v<std::remove_cvref_t<_ExecutionPolicy>> && (std::ranges::sized_range<_R1>
|| std::ranges::sized_range<_R2>) && std::ranges::sized_range<_OutRange>
requires oneapi::dpl::is_execution_policy_v<std::remove_cvref_t<_ExecutionPolicy>> && std::ranges::sized_range<_R1>
&& std::ranges::sized_range<_R2> && std::ranges::sized_range<_OutRange>
&& std::indirectly_writable<std::ranges::iterator_t<_OutRange>,
std::indirect_result_t<_F&, std::projected<std::ranges::iterator_t<_R1>, _Proj1>,
std::projected<std::ranges::iterator_t<_R2>, _Proj2>>>
std::indirect_result_t<_F&, std::projected<std::ranges::iterator_t<_R1>, _Proj1>,
std::projected<std::ranges::iterator_t<_R2>, _Proj2>>>

std::ranges::binary_transform_result<std::ranges::borrowed_iterator_t<_R1>, std::ranges::borrowed_iterator_t<_R2>,
std::ranges::borrowed_iterator_t<_OutRange>>
std::ranges::borrowed_iterator_t<_OutRange>>
operator()(_ExecutionPolicy&& __exec, _R1&& __r1, _R2&& __r2, _OutRange&& __out_r, _F __binary_op,
_Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const
{
const auto __dispatch_tag = oneapi::dpl::__ranges::__select_backend(__exec);

using _Size = std::common_type_t<oneapi::dpl::__internal::__range_size_t<_R1>,
oneapi::dpl::__internal::__range_size_t<_R2>, std::ranges::range_size_t<_OutRange>>;
_Size __size = std::ranges::size(__out_r);
if constexpr(std::ranges::sized_range<_R1>)
__size = std::ranges::min(__size, (_Size)std::ranges::size(__r1));
if constexpr(std::ranges::sized_range<_R2>)
__size = std::ranges::min(__size, (_Size)std::ranges::size(__r2));
const _Size __size = std::ranges::min({(_Size)std::ranges::size(__r1), (_Size)std::ranges::size(__r2),
(_Size)std::ranges::size(__out_r)});

//take_view doesn't make unsized range sized, so subrange is used below
oneapi::dpl::__internal::__ranges::__pattern_transform(__dispatch_tag, std::forward<_ExecutionPolicy>(__exec),
std::ranges::subrange(std::ranges::begin(__r1), std::ranges::begin(__r1) + __size),
std::ranges::subrange(std::ranges::begin(__r2), std::ranges::begin(__r2) + __size),
std::ranges::take_view(__out_r, __size), __binary_op, __proj1, __proj2);
oneapi::dpl::__internal::__ranges::__pattern_transform(
__dispatch_tag, std::forward<_ExecutionPolicy>(__exec), std::ranges::take_view(__r1, __size),
std::ranges::take_view(__r2, __size), std::ranges::take_view(__out_r, __size), __binary_op, __proj1,
__proj2);

return {std::ranges::begin(__r1) + __size, std::ranges::begin(__r2) + __size, std::ranges::begin(__out_r) + __size};
}
Expand Down
11 changes: 4 additions & 7 deletions test/parallel_api/ranges/std_ranges_transform.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,12 @@ main()
{
using Size = std::common_type_t<range_size_t<decltype(r_1)>, range_size_t<decltype(r_2)>,
std::ranges::range_size_t<decltype(r_out)>>;
Size size = std::ranges::size(r_out);
if constexpr(std::ranges::sized_range<decltype(r_1)>)
size = std::ranges::min(size, (Size)std::ranges::size(r_1));
if constexpr(std::ranges::sized_range<decltype(r_2)>)
size = std::ranges::min(size, (Size)std::ranges::size(r_2));
Size size = std::ranges::min({(Size)std::ranges::size(r_1), (Size)std::ranges::size(r_2),
(Size)std::ranges::size(r_out)});

auto res = std::ranges::transform(std::ranges::subrange(std::ranges::begin(r_1), std::ranges::begin(r_1) + size),
std::ranges::subrange(std::ranges::begin(r_2), std::ranges::begin(r_2) + size),
std::ranges::take_view(r_out, size).begin(), std::forward<decltype(args)>(args)...);
std::ranges::take_view(r_2, size), std::ranges::take_view(r_out, size).begin(),
std::forward<decltype(args)>(args)...);

using ret_type = std::ranges::binary_transform_result<std::ranges::borrowed_iterator_t<decltype(r_1)>,
std::ranges::borrowed_iterator_t<decltype(r_2)>, std::ranges::borrowed_iterator_t<decltype(r_out)>>;
Expand Down
6 changes: 3 additions & 3 deletions test/parallel_api/ranges/std_ranges_transform_iota.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ main()
#if _ENABLE_STD_RANGES_TESTING
using namespace test_std_ranges;
namespace dpl_ranges = oneapi::dpl::ranges;
const char* err_msg = "Wrong effect algo transform with unsized ranges.";
const char* err_msg = "Wrong effect algo ranges::transform.";

const int n = medium_size;
std::ranges::iota_view view1(0, n); //size range
std::ranges::iota_view view2(0, std::unreachable_sentinel_t{}); //unsized
std::ranges::iota_view view1(0, n);
std::ranges::iota_view view2(0, n);

std::vector<int> res(n), expected(n);
std::ranges::transform(view1, view2, expected.begin(), binary_f, proj, proj);
Expand Down
4 changes: 2 additions & 2 deletions test/parallel_api/ranges/std_ranges_transform_iota_sycl.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ main()
#if _ENABLE_STD_RANGES_TESTING && TEST_DPCPP_BACKEND_PRESENT
using namespace test_std_ranges;
namespace dpl_ranges = oneapi::dpl::ranges;
const char* err_msg = "Wrong effect algo transform with unsized ranges.";
const char* err_msg = "Wrong effect algo ranges::transform.";

const int n = big_size;
std::ranges::iota_view view1(0, n); //size range
std::ranges::iota_view view2(0, std::unreachable_sentinel_t{}); //unsized
std::ranges::iota_view view2(0, n);

std::vector<int> src(n), expected(n);
std::ranges::transform(view1, view2, expected.begin(), binary_f, proj, proj);
Expand Down
Loading