Skip to content

Commit

Permalink
Apply GitHUB clang forman
Browse files Browse the repository at this point in the history 
Signed-off-by: Sergey Kopienko <[email protected]>
  • Loading branch information
@SergeyKopienko
SergeyKopienko committed Jun 10, 2024
1 parent 24d3d6d commit 6309293
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 17 deletions.
24 changes: 14 additions & 10 deletions include/oneapi/dpl/pstl/hetero/algorithm_impl_hetero.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -694,25 +694,27 @@ __pattern_any_of(__hetero_tag<_BackendTag>, _ExecutionPolicy&& __exec, _Iterator
// __counting_iterator_t - iterate position (index) in source data
using __counting_iterator_t = oneapi::dpl::counting_iterator<_difference_type>;

using _zipped_data_type = typename std::iterator_traits<decltype(oneapi::dpl::make_zip_iterator(__first, __counting_iterator_t{0}))>::value_type;
using _zipped_data_type = typename std::iterator_traits<decltype(oneapi::dpl::make_zip_iterator(
__first, __counting_iterator_t{0}))>::value_type;

__find_if_binary_reduce_op<_zipped_data_type, /*_IsFirst*/ std::true_type> __reduce_op;
__find_if_unary_transform_op<_zipped_data_type, _Pred> __transform_op{__pred};

using _Functor = unseq_backend::walk_n<_ExecutionPolicy, decltype(__transform_op)>;
using _RepackedTp = __par_backend_hetero::__repacked_tuple_t<_result_type>;

auto __keep_src_data = oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read, _Iterator>();
auto __keep_src_data =
oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read, _Iterator>();
auto __buf_src_data = __keep_src_data(__first, __last);

const __counting_iterator_t __counting_it_first{0}, __counting_it_last{__n};
auto __keep_counting_it = oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read, __counting_iterator_t>();
auto __keep_counting_it =
oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read, __counting_iterator_t>();
auto __buf_counting_it = __keep_counting_it(__counting_it_first, __counting_it_last);

auto res =
oneapi::dpl::__par_backend_hetero::__parallel_transform_reduce<_RepackedTp, std::true_type /*is_commutative*/>(
_BackendTag{}, std::forward<_ExecutionPolicy>(__exec),
__reduce_op, _Functor{__transform_op},
_BackendTag{}, std::forward<_ExecutionPolicy>(__exec), __reduce_op, _Functor{__transform_op},
unseq_backend::__init_value<_RepackedTp>{__init}, // initial value
oneapi::dpl::__ranges::make_zip_view(__buf_src_data.all_view(), __buf_counting_it.all_view()))
.get();
Expand Down Expand Up @@ -781,25 +783,27 @@ __pattern_find_if(__hetero_tag<_BackendTag>, _ExecutionPolicy&& __exec, _Iterato
// __counting_iterator_t - iterate position (index) in source data
using __counting_iterator_t = oneapi::dpl::counting_iterator<_difference_type>;

using _zipped_data_type = typename std::iterator_traits<decltype(oneapi::dpl::make_zip_iterator(__first, __counting_iterator_t{0}))>::value_type;
using _zipped_data_type = typename std::iterator_traits<decltype(oneapi::dpl::make_zip_iterator(
__first, __counting_iterator_t{0}))>::value_type;

__find_if_binary_reduce_op<_zipped_data_type, /*_IsFirst*/ std::true_type> __reduce_op;
__find_if_unary_transform_op<_zipped_data_type, _Pred> __transform_op{__pred};

using _Functor = unseq_backend::walk_n<_ExecutionPolicy, decltype(__transform_op)>;
using _RepackedTp = __par_backend_hetero::__repacked_tuple_t<_result_type>;

auto __keep_src_data = oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read, _Iterator>();
auto __keep_src_data =
oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read, _Iterator>();
auto __buf_src_data = __keep_src_data(__first, __last);

const __counting_iterator_t __counting_it_first{0}, __counting_it_last{__n};
auto __keep_counting_it = oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read, __counting_iterator_t>();
auto __keep_counting_it =
oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read, __counting_iterator_t>();
auto __buf_counting_it = __keep_counting_it(__counting_it_first, __counting_it_last);

auto res =
oneapi::dpl::__par_backend_hetero::__parallel_transform_reduce<_RepackedTp, std::true_type /*is_commutative*/>(
_BackendTag{}, std::forward<_ExecutionPolicy>(__exec),
__reduce_op, _Functor{__transform_op},
_BackendTag{}, std::forward<_ExecutionPolicy>(__exec), __reduce_op, _Functor{__transform_op},
unseq_backend::__init_value<_RepackedTp>{__init}, // initial value
oneapi::dpl::__ranges::make_zip_view(__buf_src_data.all_view(), __buf_counting_it.all_view()))
.get();
Expand Down
11 changes: 4 additions & 7 deletions include/oneapi/dpl/pstl/hetero/dpcpp/parallel_backend_sycl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,6 @@ __parallel_find_or(oneapi::dpl::__internal::__device_backend_tag, _ExecutionPoli
sycl::nd_range</*dim=*/1>(sycl::range</*dim=*/1>(__n_groups * __wgroup_size),
sycl::range</*dim=*/1>(__wgroup_size)),
[=](sycl::nd_item</*dim=*/1> __nd_item) {

__dpl_sycl::__atomic_ref<_AtomicType, sycl::access::address_space::global_space> __found(
*__dpl_sycl::__get_accessor_ptr(__temp_acc));
// Point #A1 - not required
Expand Down Expand Up @@ -1209,11 +1208,10 @@ __parallel_find_or(oneapi::dpl::__internal::__device_backend_tag, _ExecutionPoli
}

// Specialization for __parallel_find_forward_tag, __parallel_find_backward_tag
template <typename _ExecutionPolicy, typename _Brick, typename _BrickTag,
typename... _Ranges>
template <typename _ExecutionPolicy, typename _Brick, typename _BrickTag, typename... _Ranges>
oneapi::dpl::__internal::__difference_t<typename oneapi::dpl::__ranges::__get_first_range_type<_Ranges...>::type>
__parallel_find_or(oneapi::dpl::__internal::__device_backend_tag, _ExecutionPolicy&& __exec, _Brick __f,
_BrickTag, _Ranges&&... __rngs)
__parallel_find_or(oneapi::dpl::__internal::__device_backend_tag, _ExecutionPolicy&& __exec, _Brick __f, _BrickTag,
_Ranges&&... __rngs)
{
using _CustomName = oneapi::dpl::__internal::__policy_kernel_name<_ExecutionPolicy>;
using _AtomicType = typename _BrickTag::_AtomicType;
Expand Down Expand Up @@ -1294,8 +1292,7 @@ __parallel_find_or(oneapi::dpl::__internal::__device_backend_tag, _ExecutionPoli
// Set local atomic value to global atomic
if (__local_idx == 0)
{
for (auto __old = __found.load(); __comp(__found_local.load(), __old);
__old = __found.load())
for (auto __old = __found.load(); __comp(__found_local.load(), __old); __old = __found.load())
{
__found.compare_exchange_strong(__old, __found_local.load());
}
Expand Down

0 comments on commit 6309293

Please sign in to comment.