Skip to content

Commit 14ac6c8

Browse files
committed
Try fixing formatting and compilation issues
1 parent a9eab90 commit 14ac6c8

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ sort_async(_ExecutionPolicy&& __exec, _Iterator __first, _Iterator __last, _Comp
9797

9898
wait_for_all(std::forward<_Events>(__dependencies)...);
9999

100-
return oneapi::dpl::__internal::__pattern_stable_sort_async(
101-
__dispatch_tag, std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp);
100+
return oneapi::dpl::__internal::__pattern_stable_sort_async(__dispatch_tag, std::forward<_ExecutionPolicy>(__exec),
101+
__first, __last, __comp);
102102
}
103103

104104
template <class _ExecutionPolicy, class _RandomAccessIterator, class... _Events,

include/oneapi/dpl/pstl/hetero/dpcpp/parallel_backend_sycl.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2205,9 +2205,9 @@ struct __is_radix_sort_usable_for_type
22052205
{
22062206
static constexpr bool value =
22072207
#if _ONEDPL_USE_RADIX_SORT
2208-
(::std::is_arithmetic_v<_T> || ::std::is_same_v<sycl::half, _T>) &&
2209-
(__internal::__is_comp_ascending<::std::decay_t<_Compare>>::value ||
2210-
__internal::__is_comp_descending<::std::decay_t<_Compare>>::value);
2208+
(std::is_arithmetic_v<_T> || std::is_same_v<sycl::half, _T>) &&
2209+
(__internal::__is_comp_ascending<std::decay_t<_Compare>>::value ||
2210+
__internal::__is_comp_descending<std::decay_t<_Compare>>::value);
22112211
#else
22122212
false;
22132213
#endif // _ONEDPL_USE_RADIX_SORT
@@ -2216,26 +2216,26 @@ struct __is_radix_sort_usable_for_type
22162216
#if _ONEDPL_USE_RADIX_SORT
22172217
template <
22182218
typename _ExecutionPolicy, typename _Range, typename _Compare, typename _Proj,
2219-
::std::enable_if_t<
2219+
std::enable_if_t<
22202220
__is_radix_sort_usable_for_type<oneapi::dpl::__internal::__key_t<_Proj, _Range>, _Compare>::value, int> = 0>
22212221
__future<sycl::event>
22222222
__parallel_stable_sort(oneapi::dpl::__internal::__device_backend_tag __backend_tag, _ExecutionPolicy&& __exec,
22232223
_Range&& __rng, _Compare, _Proj __proj)
22242224
{
2225-
return __parallel_radix_sort<__internal::__is_comp_ascending<::std::decay_t<_Compare>>::value>(
2226-
__backend_tag, ::std::forward<_ExecutionPolicy>(__exec), ::std::forward<_Range>(__rng), __proj);
2225+
return __parallel_radix_sort<__internal::__is_comp_ascending<std::decay_t<_Compare>>::value>(
2226+
__backend_tag, std::forward<_ExecutionPolicy>(__exec), std::forward<_Range>(__rng), __proj);
22272227
}
22282228
#endif // _ONEDPL_USE_RADIX_SORT
22292229

22302230
template <
22312231
typename _ExecutionPolicy, typename _Range, typename _Compare, typename _Proj,
2232-
::std::enable_if_t<
2232+
std::enable_if_t<
22332233
!__is_radix_sort_usable_for_type<oneapi::dpl::__internal::__key_t<_Proj, _Range>, _Compare>::value, int> = 0>
22342234
__future<sycl::event, std::unique_ptr<__result_and_scratch_storage_base>>
22352235
__parallel_stable_sort(oneapi::dpl::__internal::__device_backend_tag __backend_tag, _ExecutionPolicy&& __exec,
22362236
_Range&& __rng, _Compare __comp, _Proj __proj)
22372237
{
2238-
return __parallel_sort_impl(__backend_tag, ::std::forward<_ExecutionPolicy>(__exec), ::std::forward<_Range>(__rng),
2238+
return __parallel_sort_impl(__backend_tag, std::forward<_ExecutionPolicy>(__exec), std::forward<_Range>(__rng),
22392239
oneapi::dpl::__internal::__compare<_Compare, _Proj>{__comp, __proj});
22402240
}
22412241

@@ -2256,7 +2256,7 @@ __parallel_partial_sort(oneapi::dpl::__internal::__device_backend_tag __backend_
22562256
auto __keep = oneapi::dpl::__ranges::__get_sycl_range<__par_backend_hetero::access_mode::read_write, _Iterator>();
22572257
auto __buf = __keep(__first, __last);
22582258

2259-
return __parallel_partial_sort_impl(__backend_tag, ::std::forward<_ExecutionPolicy>(__exec), __buf.all_view(),
2259+
return __parallel_partial_sort_impl(__backend_tag, std::forward<_ExecutionPolicy>(__exec), __buf.all_view(),
22602260
__partial_merge_kernel<decltype(__mid_idx)>{__mid_idx}, __comp);
22612261
}
22622262

include/oneapi/dpl/pstl/hetero/dpcpp/parallel_backend_sycl_merge.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,8 @@ struct __parallel_merge_submitter_large<_OutSizeLimit, _IdType, _CustomName,
450450
__event = run_parallel_merge(__event, __q, __rng1, __rng2, __rng3, __comp, __nd_range_params,
451451
*__p_base_diagonals_sp_global_storage);
452452

453-
return __future{std::move(__event), std::unique_ptr<__result_and_scratch_storage_base>{
454-
__p_base_diagonals_sp_global_storage}};
453+
return __future{std::move(__event),
454+
std::unique_ptr<__result_and_scratch_storage_base>{__p_base_diagonals_sp_global_storage}};
455455
}
456456
};
457457

include/oneapi/dpl/pstl/hetero/dpcpp/parallel_backend_sycl_merge_sort.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ __merge_sort(sycl::queue& __q, _Range&& __rng, _Compare __comp, _LeafSorter& __l
724724
__event_sort = __merge_sort_copy_back_submitter<_CopyBackKernel>()(__q, __rng, __temp_buf, __event_sort);
725725
}
726726

727-
return __future{std::move(__event_sort), std::move(__temp_sp_storages)};
727+
return __future{std::move(__event_sort), std::make_tuple(std::move(__temp_sp_storages))};
728728
}
729729

730730
template <typename _CustomName, typename _IndexT, typename _Range, typename _Compare>

include/oneapi/dpl/pstl/hetero/dpcpp/parallel_backend_sycl_utils.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,8 @@ class __future : private std::tuple<_Args...>
770770
}
771771

772772
public:
773-
__future(_Event __e, _Args... __args) : std::tuple<_Args...>(__args...), __my_event(__e) {}
773+
__future(_Event __e, _Args&... __args) : std::tuple<_Args...>(__args...), __my_event(__e) {}
774+
__future(_Event __e, _Args&&... __args) : std::tuple<_Args...>(std::move(__args)...), __my_event(__e) {}
774775
__future(_Event __e, std::tuple<_Args...> __t) : std::tuple<_Args...>(__t), __my_event(__e) {}
775776

776777
auto

0 commit comments

Comments
 (0)