Skip to content

Commit 35b9c8a

Browse files
committed
[SYCL] Do not rely on inline namespace
Signed-off-by: John Pennycook <[email protected]>
1 parent 7927e7e commit 35b9c8a

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

sycl/include/CL/sycl/intel/group_algorithm.hpp

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ template <typename Group, typename Ptr, class Function>
7373
Function for_each(Group g, Ptr first, Ptr last, Function f) {
7474
#ifdef __SYCL_DEVICE_ONLY__
7575
nd_item<Group::dimensions> it =
76-
::sycl::detail::Builder::getNDItem<Group::dimensions>();
76+
cl::sycl::detail::Builder::getNDItem<Group::dimensions>();
7777
ptrdiff_t offset = it.get_local_linear_id();
7878
ptrdiff_t stride = detail::get_local_linear_range(g);
7979
for (Ptr p = first + offset; p < last; p += stride) {
@@ -91,18 +91,16 @@ Function for_each(Group g, Ptr first, Ptr last, Function f) {
9191
namespace intel {
9292

9393
template <typename T>
94-
using EnableIfIsScalarArithmetic =
95-
::sycl::detail::enable_if_t<::sycl::detail::is_scalar_arithmetic<T>::value,
96-
T>;
94+
using EnableIfIsScalarArithmetic = cl::sycl::detail::enable_if_t<
95+
cl::sycl::detail::is_scalar_arithmetic<T>::value, T>;
9796

9897
template <typename T>
99-
using EnableIfIsVectorArithmetic =
100-
::sycl::detail::enable_if_t<::sycl::detail::is_vector_arithmetic<T>::value,
101-
T>;
98+
using EnableIfIsVectorArithmetic = cl::sycl::detail::enable_if_t<
99+
cl::sycl::detail::is_vector_arithmetic<T>::value, T>;
102100

103101
template <typename Ptr, typename T>
104102
using EnableIfIsPointer =
105-
::sycl::detail::enable_if_t<::sycl::detail::is_pointer<Ptr>::value, T>;
103+
cl::sycl::detail::enable_if_t<cl::sycl::detail::is_pointer<Ptr>::value, T>;
106104

107105
template <typename Group> bool all_of(Group g, bool pred) {
108106
static_assert(detail::is_group<Group>::value,
@@ -488,7 +486,7 @@ exclusive_scan(Group g, InPtr first, InPtr last, OutPtr result, T init,
488486
"Result type of binary_op must match scan accumulation type.");
489487
#ifdef __SYCL_DEVICE_ONLY__
490488
nd_item<Group::dimensions> it =
491-
::sycl::detail::Builder::getNDItem<Group::dimensions>();
489+
cl::sycl::detail::Builder::getNDItem<Group::dimensions>();
492490
ptrdiff_t offset = it.get_local_linear_id();
493491
ptrdiff_t stride = detail::get_local_linear_range(g);
494492
ptrdiff_t N = last - first;
@@ -607,7 +605,7 @@ inclusive_scan(Group g, InPtr first, InPtr last, OutPtr result,
607605
"Result type of binary_op must match scan accumulation type.");
608606
#ifdef __SYCL_DEVICE_ONLY__
609607
nd_item<Group::dimensions> it =
610-
::sycl::detail::Builder::getNDItem<Group::dimensions>();
608+
cl::sycl::detail::Builder::getNDItem<Group::dimensions>();
611609
ptrdiff_t offset = it.get_local_linear_id();
612610
ptrdiff_t stride = detail::get_local_linear_range(g);
613611
ptrdiff_t N = last - first;
@@ -653,7 +651,7 @@ template <typename Group> bool leader(Group g) {
653651
"Group algorithms only support the sycl::group class.");
654652
#ifdef __SYCL_DEVICE_ONLY__
655653
nd_item<Group::dimensions> it =
656-
::sycl::detail::Builder::getNDItem<Group::dimensions>();
654+
cl::sycl::detail::Builder::getNDItem<Group::dimensions>();
657655
typename Group::linear_id_type linear_id = it.get_local_linear_id();
658656
return (linear_id == 0);
659657
#else

0 commit comments

Comments
 (0)