Skip to content

Commit eb2cdf8

Browse files
committed
Remove unnecessary local variables in async and numeric headers
Signed-off-by: Matthew Michel <[email protected]>
1 parent 92f3374 commit eb2cdf8

File tree

2 files changed

+15
-24
lines changed

2 files changed

+15
-24
lines changed

include/oneapi/dpl/internal/async_impl/async_impl_hetero.h

+9-17
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ __pattern_walk1_async(__hetero_tag<_BackendTag>, _ExecutionPolicy&& __exec, _For
4242
oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read_write, _ForwardIterator>();
4343
auto __buf = __keep(__first, __last);
4444

45-
auto __view = __buf.all_view();
46-
4745
auto __future_obj = oneapi::dpl::__par_backend_hetero::__parallel_for(
4846
_BackendTag{}, ::std::forward<_ExecutionPolicy>(__exec),
49-
unseq_backend::walk1_vector_or_scalar<_ExecutionPolicy, _Function, decltype(__view)>{
47+
unseq_backend::walk1_vector_or_scalar<_ExecutionPolicy, _Function, decltype(__buf.all_view())>{
5048
__f, static_cast<std::size_t>(__n)},
51-
__n, __view);
49+
__n, __buf.all_view());
5250
return __future_obj;
5351
}
5452

@@ -69,14 +67,11 @@ __pattern_walk2_async(__hetero_tag<_BackendTag>, _ExecutionPolicy&& __exec, _For
6967
auto __keep2 = oneapi::dpl::__ranges::__get_sycl_range<__acc_mode2, _ForwardIterator2>();
7068
auto __buf2 = __keep2(__first2, __first2 + __n);
7169

72-
auto __view1 = __buf1.all_view();
73-
auto __view2 = __buf2.all_view();
74-
7570
auto __future = oneapi::dpl::__par_backend_hetero::__parallel_for(
7671
_BackendTag{}, ::std::forward<_ExecutionPolicy>(__exec),
77-
unseq_backend::walk2_vectors_or_scalars<_ExecutionPolicy, _Function, decltype(__view1), decltype(__view2)>{
78-
__f, static_cast<std::size_t>(__n)},
79-
__n, __view1, __view2);
72+
unseq_backend::walk2_vectors_or_scalars<_ExecutionPolicy, _Function, decltype(__buf1.all_view()),
73+
decltype(__buf2.all_view())>{__f, static_cast<std::size_t>(__n)},
74+
__n, __buf1.all_view(), __buf2.all_view());
8075

8176
return __future.__make_future(__first2 + __n);
8277
}
@@ -100,15 +95,12 @@ __pattern_walk3_async(__hetero_tag<_BackendTag>, _ExecutionPolicy&& __exec, _For
10095
oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::write, _ForwardIterator3>();
10196
auto __buf3 = __keep3(__first3, __first3 + __n);
10297

103-
auto __view1 = __buf1.all_view();
104-
auto __view2 = __buf2.all_view();
105-
auto __view3 = __buf3.all_view();
106-
10798
auto __future = oneapi::dpl::__par_backend_hetero::__parallel_for(
10899
_BackendTag{}, ::std::forward<_ExecutionPolicy>(__exec),
109-
unseq_backend::walk3_vectors_or_scalars<_ExecutionPolicy, _Function, decltype(__view1), decltype(__view2),
110-
decltype(__view3)>{__f, static_cast<size_t>(__n)},
111-
__n, __view1, __view2, __view3);
100+
unseq_backend::walk3_vectors_or_scalars<_ExecutionPolicy, _Function, decltype(__buf1.all_view()),
101+
decltype(__buf2.all_view()), decltype(__buf3.all_view())>{
102+
__f, static_cast<size_t>(__n)},
103+
__n, __buf1.all_view(), __buf2.all_view(), __buf3.all_view());
112104

113105
return __future.__make_future(__first3 + __n);
114106
}

include/oneapi/dpl/pstl/hetero/numeric_impl_hetero.h

+6-7
Original file line numberDiff line numberDiff line change
@@ -263,14 +263,13 @@ __pattern_adjacent_difference(__hetero_tag<_BackendTag> __tag, _ExecutionPolicy&
263263
oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::write, _ForwardIterator2>();
264264
auto __buf2 = __keep2(__d_first, __d_last);
265265

266-
auto __view1 = __buf1.all_view();
267-
auto __view2 = __buf2.all_view();
266+
using _Function =
267+
unseq_backend::walk_adjacent_difference<_ExecutionPolicy, decltype(__fn), decltype(__buf1.all_view()),
268+
decltype(__buf2.all_view())>;
268269

269-
using _Function = unseq_backend::walk_adjacent_difference<_ExecutionPolicy, decltype(__fn), decltype(__view1),
270-
decltype(__view2)>;
271-
272-
oneapi::dpl::__par_backend_hetero::__parallel_for(
273-
_BackendTag{}, __exec, _Function{__fn, static_cast<std::size_t>(__n)}, __n, __view1, __view2)
270+
oneapi::dpl::__par_backend_hetero::__parallel_for(_BackendTag{}, __exec,
271+
_Function{__fn, static_cast<std::size_t>(__n)}, __n,
272+
__buf1.all_view(), __buf2.all_view())
274273
.__deferrable_wait();
275274
}
276275

0 commit comments

Comments
 (0)