Skip to content

Commit 3d69185

Browse files
Alexander-MakaryevAlexander-Makaryev
authored
Replace using of namespace cl::sycl:: with sycl:: (#1110)
* Replace using of namespace cl::sycl:: with sycl:: * aligning indentations
1 parent d769cce commit 3d69185

26 files changed

Lines changed: 308 additions & 309 deletions

‎dpnp/backend/examples/example10.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void test_mkl_random_normal(
7777
double dev_time_used = 0.0;
7878
double sum_dev_time_used = 0.0;
7979

80-
cl::sycl::queue queue{cl::sycl::gpu_selector()};
80+
sycl::queue queue{sycl::gpu_selector()};
8181

8282
double* result = reinterpret_cast<double*>(malloc_shared(size * sizeof(double), queue));
8383
if (result == nullptr)

‎dpnp/backend/include/dpnp_gen_1arg_1type_tbl.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@
7676
MACRO_1ARG_1TYPE_OP(dpnp_conjugate_c, std::conj(input_elem), DPNP_QUEUE.submit(kernel_func))
7777
MACRO_1ARG_1TYPE_OP(dpnp_copy_c, input_elem, DPNP_QUEUE.submit(kernel_func))
7878
MACRO_1ARG_1TYPE_OP(dpnp_erf_c,
79-
cl::sycl::erf((double)input_elem),
79+
sycl::erf((double)input_elem),
8080
oneapi::mkl::vm::erf(DPNP_QUEUE, input1_size, input1_data, result)) // no sycl::erf for int and long
8181
MACRO_1ARG_1TYPE_OP(dpnp_negative_c, -input_elem, DPNP_QUEUE.submit(kernel_func))
8282
MACRO_1ARG_1TYPE_OP(dpnp_recip_c,
8383
_DataType(1) / input_elem,
84-
DPNP_QUEUE.submit(kernel_func)) // error: no member named 'recip' in namespace 'cl::sycl'
84+
DPNP_QUEUE.submit(kernel_func)) // error: no member named 'recip' in namespace 'sycl'
8585
MACRO_1ARG_1TYPE_OP(dpnp_sign_c,
86-
cl::sycl::sign((double)input_elem),
86+
sycl::sign((double)input_elem),
8787
DPNP_QUEUE.submit(kernel_func)) // no sycl::sign for int and long
8888
MACRO_1ARG_1TYPE_OP(dpnp_square_c,
8989
input_elem* input_elem,

‎dpnp/backend/include/dpnp_gen_1arg_2type_tbl.hpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -74,83 +74,83 @@
7474
#endif
7575

7676
MACRO_1ARG_2TYPES_OP(dpnp_acos_c,
77-
cl::sycl::acos(input_elem),
77+
sycl::acos(input_elem),
7878
oneapi::mkl::vm::acos(DPNP_QUEUE, input1_size, input1_data, result))
7979
MACRO_1ARG_2TYPES_OP(dpnp_acosh_c,
80-
cl::sycl::acosh(input_elem),
80+
sycl::acosh(input_elem),
8181
oneapi::mkl::vm::acosh(DPNP_QUEUE, input1_size, input1_data, result))
8282
MACRO_1ARG_2TYPES_OP(dpnp_asin_c,
83-
cl::sycl::asin(input_elem),
83+
sycl::asin(input_elem),
8484
oneapi::mkl::vm::asin(DPNP_QUEUE, input1_size, input1_data, result))
8585
MACRO_1ARG_2TYPES_OP(dpnp_asinh_c,
86-
cl::sycl::asinh(input_elem),
86+
sycl::asinh(input_elem),
8787
oneapi::mkl::vm::asinh(DPNP_QUEUE, input1_size, input1_data, result))
8888
MACRO_1ARG_2TYPES_OP(dpnp_atan_c,
89-
cl::sycl::atan(input_elem),
89+
sycl::atan(input_elem),
9090
oneapi::mkl::vm::atan(DPNP_QUEUE, input1_size, input1_data, result))
9191
MACRO_1ARG_2TYPES_OP(dpnp_atanh_c,
92-
cl::sycl::atanh(input_elem),
92+
sycl::atanh(input_elem),
9393
oneapi::mkl::vm::atanh(DPNP_QUEUE, input1_size, input1_data, result))
9494
MACRO_1ARG_2TYPES_OP(dpnp_cbrt_c,
95-
cl::sycl::cbrt(input_elem),
95+
sycl::cbrt(input_elem),
9696
oneapi::mkl::vm::cbrt(DPNP_QUEUE, input1_size, input1_data, result))
9797
MACRO_1ARG_2TYPES_OP(dpnp_ceil_c,
98-
cl::sycl::ceil(input_elem),
98+
sycl::ceil(input_elem),
9999
oneapi::mkl::vm::ceil(DPNP_QUEUE, input1_size, input1_data, result))
100100
MACRO_1ARG_2TYPES_OP(dpnp_copyto_c, input_elem, DPNP_QUEUE.submit(kernel_func))
101101
MACRO_1ARG_2TYPES_OP(dpnp_cos_c,
102-
cl::sycl::cos(input_elem),
102+
sycl::cos(input_elem),
103103
oneapi::mkl::vm::cos(DPNP_QUEUE, input1_size, input1_data, result))
104104
MACRO_1ARG_2TYPES_OP(dpnp_cosh_c,
105-
cl::sycl::cosh(input_elem),
105+
sycl::cosh(input_elem),
106106
oneapi::mkl::vm::cosh(DPNP_QUEUE, input1_size, input1_data, result))
107-
MACRO_1ARG_2TYPES_OP(dpnp_degrees_c, cl::sycl::degrees(input_elem), DPNP_QUEUE.submit(kernel_func))
107+
MACRO_1ARG_2TYPES_OP(dpnp_degrees_c, sycl::degrees(input_elem), DPNP_QUEUE.submit(kernel_func))
108108
MACRO_1ARG_2TYPES_OP(dpnp_ediff1d_c, input1_data[output_id + 1] - input_elem, DPNP_QUEUE.submit(kernel_func))
109109
MACRO_1ARG_2TYPES_OP(dpnp_exp2_c,
110-
cl::sycl::exp2(input_elem),
110+
sycl::exp2(input_elem),
111111
oneapi::mkl::vm::exp2(DPNP_QUEUE, input1_size, input1_data, result))
112112
MACRO_1ARG_2TYPES_OP(dpnp_exp_c,
113-
cl::sycl::exp(input_elem),
113+
sycl::exp(input_elem),
114114
oneapi::mkl::vm::exp(DPNP_QUEUE, input1_size, input1_data, result))
115115
MACRO_1ARG_2TYPES_OP(dpnp_expm1_c,
116-
cl::sycl::expm1(input_elem),
116+
sycl::expm1(input_elem),
117117
oneapi::mkl::vm::expm1(DPNP_QUEUE, input1_size, input1_data, result))
118118
MACRO_1ARG_2TYPES_OP(dpnp_fabs_c,
119-
cl::sycl::fabs(input_elem),
119+
sycl::fabs(input_elem),
120120
oneapi::mkl::vm::abs(DPNP_QUEUE, input1_size, input1_data, result))
121121
MACRO_1ARG_2TYPES_OP(dpnp_floor_c,
122-
cl::sycl::floor(input_elem),
122+
sycl::floor(input_elem),
123123
oneapi::mkl::vm::floor(DPNP_QUEUE, input1_size, input1_data, result))
124124
MACRO_1ARG_2TYPES_OP(dpnp_log10_c,
125-
cl::sycl::log10(input_elem),
125+
sycl::log10(input_elem),
126126
oneapi::mkl::vm::log10(DPNP_QUEUE, input1_size, input1_data, result))
127127
MACRO_1ARG_2TYPES_OP(dpnp_log1p_c,
128-
cl::sycl::log1p(input_elem),
128+
sycl::log1p(input_elem),
129129
oneapi::mkl::vm::log1p(DPNP_QUEUE, input1_size, input1_data, result))
130130
MACRO_1ARG_2TYPES_OP(dpnp_log2_c,
131-
cl::sycl::log2(input_elem),
131+
sycl::log2(input_elem),
132132
oneapi::mkl::vm::log2(DPNP_QUEUE, input1_size, input1_data, result))
133133
MACRO_1ARG_2TYPES_OP(dpnp_log_c,
134-
cl::sycl::log(input_elem),
134+
sycl::log(input_elem),
135135
oneapi::mkl::vm::ln(DPNP_QUEUE, input1_size, input1_data, result))
136-
MACRO_1ARG_2TYPES_OP(dpnp_radians_c, cl::sycl::radians(input_elem), DPNP_QUEUE.submit(kernel_func))
136+
MACRO_1ARG_2TYPES_OP(dpnp_radians_c, sycl::radians(input_elem), DPNP_QUEUE.submit(kernel_func))
137137
MACRO_1ARG_2TYPES_OP(dpnp_sin_c,
138-
cl::sycl::sin(input_elem),
138+
sycl::sin(input_elem),
139139
oneapi::mkl::vm::sin(DPNP_QUEUE, input1_size, input1_data, result))
140140
MACRO_1ARG_2TYPES_OP(dpnp_sinh_c,
141-
cl::sycl::sinh(input_elem),
141+
sycl::sinh(input_elem),
142142
oneapi::mkl::vm::sinh(DPNP_QUEUE, input1_size, input1_data, result))
143143
MACRO_1ARG_2TYPES_OP(dpnp_sqrt_c,
144-
cl::sycl::sqrt(input_elem),
144+
sycl::sqrt(input_elem),
145145
oneapi::mkl::vm::sqrt(DPNP_QUEUE, input1_size, input1_data, result))
146146
MACRO_1ARG_2TYPES_OP(dpnp_tan_c,
147-
cl::sycl::tan(input_elem),
147+
sycl::tan(input_elem),
148148
oneapi::mkl::vm::tan(DPNP_QUEUE, input1_size, input1_data, result))
149149
MACRO_1ARG_2TYPES_OP(dpnp_tanh_c,
150-
cl::sycl::tanh(input_elem),
150+
sycl::tanh(input_elem),
151151
oneapi::mkl::vm::tanh(DPNP_QUEUE, input1_size, input1_data, result))
152152
MACRO_1ARG_2TYPES_OP(dpnp_trunc_c,
153-
cl::sycl::trunc(input_elem),
153+
sycl::trunc(input_elem),
154154
oneapi::mkl::vm::trunc(DPNP_QUEUE, input1_size, input1_data, result))
155155

156156
#undef MACRO_1ARG_2TYPES_OP

‎dpnp/backend/include/dpnp_gen_2arg_3type_tbl.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,22 @@
8484
#endif
8585

8686
MACRO_2ARG_3TYPES_OP(dpnp_add_c, input1_elem + input2_elem, oneapi::mkl::vm::add)
87-
MACRO_2ARG_3TYPES_OP(dpnp_arctan2_c, cl::sycl::atan2((double)input1_elem, (double)input2_elem), oneapi::mkl::vm::atan2)
87+
MACRO_2ARG_3TYPES_OP(dpnp_arctan2_c, sycl::atan2((double)input1_elem, (double)input2_elem), oneapi::mkl::vm::atan2)
8888
MACRO_2ARG_3TYPES_OP(dpnp_copysign_c,
89-
cl::sycl::copysign((double)input1_elem, (double)input2_elem),
89+
sycl::copysign((double)input1_elem, (double)input2_elem),
9090
oneapi::mkl::vm::copysign)
9191
MACRO_2ARG_3TYPES_OP(dpnp_divide_c, input1_elem / input2_elem, oneapi::mkl::vm::div)
92-
MACRO_2ARG_3TYPES_OP(dpnp_fmod_c, cl::sycl::fmod((double)input1_elem, (double)input2_elem), oneapi::mkl::vm::fmod)
93-
MACRO_2ARG_3TYPES_OP(dpnp_hypot_c, cl::sycl::hypot((double)input1_elem, (double)input2_elem), oneapi::mkl::vm::hypot)
94-
MACRO_2ARG_3TYPES_OP(dpnp_maximum_c, cl::sycl::max(input1_elem, input2_elem), oneapi::mkl::vm::fmax)
95-
MACRO_2ARG_3TYPES_OP(dpnp_minimum_c, cl::sycl::min(input1_elem, input2_elem), oneapi::mkl::vm::fmin)
92+
MACRO_2ARG_3TYPES_OP(dpnp_fmod_c, sycl::fmod((double)input1_elem, (double)input2_elem), oneapi::mkl::vm::fmod)
93+
MACRO_2ARG_3TYPES_OP(dpnp_hypot_c, sycl::hypot((double)input1_elem, (double)input2_elem), oneapi::mkl::vm::hypot)
94+
MACRO_2ARG_3TYPES_OP(dpnp_maximum_c, sycl::max(input1_elem, input2_elem), oneapi::mkl::vm::fmax)
95+
MACRO_2ARG_3TYPES_OP(dpnp_minimum_c, sycl::min(input1_elem, input2_elem), oneapi::mkl::vm::fmin)
9696

9797
// "multiply" needs to be standalone kernel (not autogenerated) due to complex algorithm. This is not an element wise.
9898
// pytest "tests/third_party/cupy/creation_tests/test_ranges.py::TestMgrid::test_mgrid3"
9999
// requires multiplication shape1[10] with shape2[10,1] and result expected as shape[10,10]
100100
MACRO_2ARG_3TYPES_OP(dpnp_multiply_c, input1_elem* input2_elem, oneapi::mkl::vm::mul)
101101

102-
MACRO_2ARG_3TYPES_OP(dpnp_power_c, cl::sycl::pow((double)input1_elem, (double)input2_elem), oneapi::mkl::vm::pow)
102+
MACRO_2ARG_3TYPES_OP(dpnp_power_c, sycl::pow((double)input1_elem, (double)input2_elem), oneapi::mkl::vm::pow)
103103
MACRO_2ARG_3TYPES_OP(dpnp_subtract_c, input1_elem - input2_elem, oneapi::mkl::vm::sub)
104104

105105
#undef MACRO_2ARG_3TYPES_OP

‎dpnp/backend/kernels/dpnp_krnl_arraycreation.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ void dpnp_arange_c(size_t start, size_t step, void* result1, size_t size)
4545
return;
4646
}
4747

48-
cl::sycl::event event;
48+
sycl::event event;
4949

5050
_DataType* result = reinterpret_cast<_DataType*>(result1);
5151

52-
cl::sycl::range<1> gws(size);
53-
auto kernel_parallel_for_func = [=](cl::sycl::id<1> global_id) {
52+
sycl::range<1> gws(size);
53+
auto kernel_parallel_for_func = [=](sycl::id<1> global_id) {
5454
size_t i = global_id[0];
5555

5656
result[i] = start + i * step;
5757
};
5858

59-
auto kernel_func = [&](cl::sycl::handler& cgh) {
59+
auto kernel_func = [&](sycl::handler& cgh) {
6060
cgh.parallel_for<class dpnp_arange_c_kernel<_DataType>>(gws, kernel_parallel_for_func);
6161
};
6262

@@ -174,18 +174,18 @@ void dpnp_identity_c(void* result1, const size_t n)
174174
return;
175175
}
176176

177-
cl::sycl::event event;
177+
sycl::event event;
178178

179179
_DataType* result = reinterpret_cast<_DataType*>(result1);
180180

181-
cl::sycl::range<2> gws(n, n);
182-
auto kernel_parallel_for_func = [=](cl::sycl::id<2> global_id) {
181+
sycl::range<2> gws(n, n);
182+
auto kernel_parallel_for_func = [=](sycl::id<2> global_id) {
183183
size_t i = global_id[0];
184184
size_t j = global_id[1];
185185
result[i * n + j] = i == j;
186186
};
187187

188-
auto kernel_func = [&](cl::sycl::handler& cgh) {
188+
auto kernel_func = [&](sycl::handler& cgh) {
189189
cgh.parallel_for<class dpnp_identity_c_kernel<_DataType>>(gws, kernel_parallel_for_func);
190190
};
191191

@@ -351,7 +351,7 @@ void dpnp_trace_c(const void* array1_in, void* result_in, const shape_elem_type*
351351
const _DataType* input = input1_ptr.get_ptr();
352352
_ResultType* result = reinterpret_cast<_ResultType*>(result_in);
353353

354-
cl::sycl::range<1> gws(size);
354+
sycl::range<1> gws(size);
355355
auto kernel_parallel_for_func = [=](auto index) {
356356
size_t i = index[0];
357357
_ResultType acc = _ResultType(0);
@@ -364,7 +364,7 @@ void dpnp_trace_c(const void* array1_in, void* result_in, const shape_elem_type*
364364
result[i] = acc;
365365
};
366366

367-
auto kernel_func = [&](cl::sycl::handler& cgh) {
367+
auto kernel_func = [&](sycl::handler& cgh) {
368368
cgh.parallel_for<class dpnp_trace_c_kernel<_DataType, _ResultType>>(gws, kernel_parallel_for_func);
369369
};
370370

@@ -378,7 +378,7 @@ class dpnp_tri_c_kernel;
378378
template <typename _DataType>
379379
void dpnp_tri_c(void* result1, const size_t N, const size_t M, const int k)
380380
{
381-
cl::sycl::event event;
381+
sycl::event event;
382382

383383
if (!result1 || !N || !M)
384384
{
@@ -388,8 +388,8 @@ void dpnp_tri_c(void* result1, const size_t N, const size_t M, const int k)
388388
_DataType* result = reinterpret_cast<_DataType*>(result1);
389389

390390
size_t idx = N * M;
391-
cl::sycl::range<1> gws(idx);
392-
auto kernel_parallel_for_func = [=](cl::sycl::id<1> global_id) {
391+
sycl::range<1> gws(idx);
392+
auto kernel_parallel_for_func = [=](sycl::id<1> global_id) {
393393
size_t ind = global_id[0];
394394
size_t i = ind / M;
395395
size_t j = ind % M;
@@ -408,7 +408,7 @@ void dpnp_tri_c(void* result1, const size_t N, const size_t M, const int k)
408408
}
409409
};
410410

411-
auto kernel_func = [&](cl::sycl::handler& cgh) {
411+
auto kernel_func = [&](sycl::handler& cgh) {
412412
cgh.parallel_for<class dpnp_tri_c_kernel<_DataType>>(gws, kernel_parallel_for_func);
413413
};
414414

‎dpnp/backend/kernels/dpnp_krnl_bitwise.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@ class dpnp_invert_c_kernel;
3737
template <typename _DataType>
3838
void dpnp_invert_c(void* array1_in, void* result1, size_t size)
3939
{
40-
cl::sycl::event event;
40+
sycl::event event;
4141
DPNPC_ptr_adapter<_DataType> input1_ptr(array1_in, size);
4242
_DataType* array1 = input1_ptr.get_ptr();
4343
_DataType* result = reinterpret_cast<_DataType*>(result1);
4444

45-
cl::sycl::range<1> gws(size);
46-
auto kernel_parallel_for_func = [=](cl::sycl::id<1> global_id) {
45+
sycl::range<1> gws(size);
46+
auto kernel_parallel_for_func = [=](sycl::id<1> global_id) {
4747
size_t i = global_id[0]; /*for (size_t i = 0; i < size; ++i)*/
4848
{
4949
_DataType input_elem1 = array1[i];
5050
result[i] = ~input_elem1;
5151
}
5252
};
5353

54-
auto kernel_func = [&](cl::sycl::handler& cgh) {
54+
auto kernel_func = [&](sycl::handler& cgh) {
5555
cgh.parallel_for<class dpnp_invert_c_kernel<_DataType>>(gws, kernel_parallel_for_func);
5656
};
5757

@@ -139,12 +139,12 @@ static void func_map_init_bitwise_1arg_1type(func_map_t& fmap)
139139
use_strides || !array_equal(input2_strides_data, input2_ndim, input2_shape_offsets, input2_ndim); \
140140
dpnp_memory_free_c(input2_shape_offsets); \
141141
\
142-
cl::sycl::event event; \
143-
cl::sycl::range<1> gws(result_size); \
142+
sycl::event event; \
143+
sycl::range<1> gws(result_size); \
144144
\
145145
if (use_strides) \
146146
{ \
147-
auto kernel_parallel_for_func = [=](cl::sycl::id<1> global_id) { \
147+
auto kernel_parallel_for_func = [=](sycl::id<1> global_id) { \
148148
const size_t output_id = global_id[0]; /*for (size_t i = 0; i < result_size; ++i)*/ \
149149
{ \
150150
size_t input1_id = 0; \
@@ -162,21 +162,21 @@ static void func_map_init_bitwise_1arg_1type(func_map_t& fmap)
162162
result[output_id] = __operation__; \
163163
} \
164164
}; \
165-
auto kernel_func = [&](cl::sycl::handler& cgh) { \
165+
auto kernel_func = [&](sycl::handler& cgh) { \
166166
cgh.parallel_for<class __name__##_strides_kernel<_DataType>>(gws, kernel_parallel_for_func); \
167167
}; \
168168
event = DPNP_QUEUE.submit(kernel_func); \
169169
event.wait(); \
170170
} \
171171
else \
172172
{ \
173-
auto kernel_parallel_for_func = [=](cl::sycl::id<1> global_id) { \
173+
auto kernel_parallel_for_func = [=](sycl::id<1> global_id) { \
174174
size_t i = global_id[0]; /*for (size_t i = 0; i < result_size; ++i)*/ \
175175
const _DataType input1_elem = (input1_size == 1) ? input1_data[0] : input1_data[i]; \
176176
const _DataType input2_elem = (input2_size == 1) ? input2_data[0] : input2_data[i]; \
177177
result[i] = __operation__; \
178178
}; \
179-
auto kernel_func = [&](cl::sycl::handler& cgh) { \
179+
auto kernel_func = [&](sycl::handler& cgh) { \
180180
cgh.parallel_for<class __name__##_kernel<_DataType>>(gws, kernel_parallel_for_func); \
181181
}; \
182182
event = DPNP_QUEUE.submit(kernel_func); \

0 commit comments

Comments
 (0)