Skip to content

Commit ef8da62

Browse files
codestyle20210924 (#969)
1 parent 87ddfe2 commit ef8da62

22 files changed

+160
-141
lines changed

dpnp/backend/kernels/dpnp_krnl_common.cpp

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,14 @@ template <typename _KernelNameSpecialization1, typename _KernelNameSpecializatio
7777
class dpnp_dot_c_kernel;
7878

7979
template <typename _DataType_output, typename _DataType_input1, typename _DataType_input2>
80-
cl::sycl::event dot(cl::sycl::queue &queue,
81-
_DataType_output *result_out, _DataType_input1 *input1_in, _DataType_input2 *input2_in, size_t input1_strides, size_t input2_strides, size_t size,
82-
const cl::sycl::vector_class<cl::sycl::event> &dependencies = {})
80+
cl::sycl::event dot(cl::sycl::queue& queue,
81+
_DataType_output* result_out,
82+
_DataType_input1* input1_in,
83+
_DataType_input2* input2_in,
84+
size_t input1_strides,
85+
size_t input2_strides,
86+
size_t size,
87+
const cl::sycl::vector_class<cl::sycl::event>& dependencies = {})
8388
{
8489
(void)dependencies;
8590

@@ -100,16 +105,15 @@ cl::sycl::event dot(cl::sycl::queue &queue,
100105
else
101106
{
102107
#if LIBSYCL_VERSION_GREATER(5, 3, 0)
103-
event = queue.submit([&](sycl::handler &cgh)
104-
{
108+
event = queue.submit([&](sycl::handler& cgh) {
105109
cgh.parallel_for(sycl::range<1>{size},
106-
cl::sycl::reduction(result_out,
107-
std::plus<_DataType_output>(),
108-
cl::sycl::property::reduction::initialize_to_identity{}),
109-
[=](cl::sycl::id<1> idx, auto& sum)
110-
{
111-
sum += static_cast <_DataType_output>(input1_in[idx * input1_strides]) * static_cast <_DataType_output>(input2_in[idx * input2_strides]);
112-
});
110+
cl::sycl::reduction(result_out,
111+
std::plus<_DataType_output>(),
112+
cl::sycl::property::reduction::initialize_to_identity{}),
113+
[=](cl::sycl::id<1> idx, auto& sum) {
114+
sum += static_cast<_DataType_output>(input1_in[idx * input1_strides]) *
115+
static_cast<_DataType_output>(input2_in[idx * input2_strides]);
116+
});
113117
});
114118
// for some reason few such kernels cannot work in parallel
115119
// looks like a bug in level0 because with opencl works fine
@@ -190,7 +194,7 @@ void dpnp_dot_c(void* result_out,
190194
{
191195
// there is no support of strides in multiply function
192196
// so result can be wrong if input array has non-standard (c-contiguous) strides
193-
dpnp_multiply_c<_DataType_output, _DataType_input1, _DataType_input2>(result, \
197+
dpnp_multiply_c<_DataType_output, _DataType_input1, _DataType_input2>(result,
194198
input1_in,
195199
input1_size,
196200
input1_shape,
@@ -207,7 +211,8 @@ void dpnp_dot_c(void* result_out,
207211
if ((input1_ndim == 1) && (input2_ndim == 1))
208212
{
209213
assert(input1_size == input2_size);
210-
cl::sycl::event event = dot(DPNP_QUEUE, result, input1, input2, input1_strides[0], input2_strides[0], input1_size);
214+
cl::sycl::event event =
215+
dot(DPNP_QUEUE, result, input1, input2, input1_strides[0], input2_strides[0], input1_size);
211216
event.wait();
212217
return;
213218
}
@@ -225,7 +230,7 @@ void dpnp_dot_c(void* result_out,
225230
}
226231
else
227232
{
228-
for(size_t i = 0; i < ext_input1_ndim; ++i)
233+
for (size_t i = 0; i < ext_input1_ndim; ++i)
229234
{
230235
ext_input1_shape[i] = input1_shape[i];
231236
ext_input1_strides[i] = input1_strides[i];
@@ -243,7 +248,7 @@ void dpnp_dot_c(void* result_out,
243248
}
244249
else
245250
{
246-
for(size_t i = 0; i < ext_input2_ndim; ++i)
251+
for (size_t i = 0; i < ext_input2_ndim; ++i)
247252
{
248253
ext_input2_shape[i] = input2_shape[i];
249254
ext_input2_strides[i] = input2_strides[i];
@@ -258,7 +263,7 @@ void dpnp_dot_c(void* result_out,
258263
}
259264
else
260265
{
261-
for(size_t i = 0; i < ext_result_ndim; ++i)
266+
for (size_t i = 0; i < ext_result_ndim; ++i)
262267
{
263268
ext_result_shape[i] = result_shape[i];
264269
}
@@ -274,21 +279,25 @@ void dpnp_dot_c(void* result_out,
274279
// (looks like there are such another cases)
275280
if ((ext_input1_ndim == 2 && ext_input2_ndim == 2) &&
276281
(ext_input1_strides[0] == 1 || ext_input1_strides[1] == 1) &&
277-
(ext_input2_strides[0] == 1 || ext_input2_strides[1] == 1)
278-
)
282+
(ext_input2_strides[0] == 1 || ext_input2_strides[1] == 1))
279283
{
280284
// there is a difference of behavior with trans and sizes params in previous version of GEMM
281285
// only new version is supported, in case of old version computation goes in common way
282286
#if INTEL_MKL_VERSION >= 20210004
283-
oneapi::mkl::transpose trans1 = ext_input1_strides[0] == 1 ? oneapi::mkl::transpose::trans : oneapi::mkl::transpose::nontrans;
284-
oneapi::mkl::transpose trans2 = ext_input2_strides[0] == 1 ? oneapi::mkl::transpose::trans : oneapi::mkl::transpose::nontrans;
287+
oneapi::mkl::transpose trans1 =
288+
ext_input1_strides[0] == 1 ? oneapi::mkl::transpose::trans : oneapi::mkl::transpose::nontrans;
289+
oneapi::mkl::transpose trans2 =
290+
ext_input2_strides[0] == 1 ? oneapi::mkl::transpose::trans : oneapi::mkl::transpose::nontrans;
285291

286292
const size_t size_m = ext_input1_shape[0];
287293
const size_t size_n = ext_input2_shape[1];
288294
const size_t size_k = ext_input1_shape[1];
289295

290-
const std::int64_t lda = trans1 == oneapi::mkl::transpose::nontrans ? ext_input1_strides[0] : ext_input1_strides[1];
291-
const std::int64_t ldb = trans2 == oneapi::mkl::transpose::nontrans ? ext_input2_strides[0] : ext_input2_strides[1];;
296+
const std::int64_t lda =
297+
trans1 == oneapi::mkl::transpose::nontrans ? ext_input1_strides[0] : ext_input1_strides[1];
298+
const std::int64_t ldb =
299+
trans2 == oneapi::mkl::transpose::nontrans ? ext_input2_strides[0] : ext_input2_strides[1];
300+
;
292301
// defenition of ldc will be another for result with non-standard (c-contiguous) strides
293302
// const std::int64_t ldc = result_strides[0] == 1 ? result_strides[1] : result_strides[0];
294303
const std::int64_t ldc = size_n;
@@ -326,20 +335,20 @@ void dpnp_dot_c(void* result_out,
326335
size_t* result_offsets = new size_t[ext_result_ndim];
327336
get_shape_offsets_inkernel(ext_result_shape, ext_result_ndim, result_offsets);
328337

329-
for(size_t i = 0; i < result_size; ++i)
338+
for (size_t i = 0; i < result_size; ++i)
330339
{
331340
get_xyz_by_id(i, ext_result_ndim, result_offsets, res_coords);
332341

333342
_DataType_output* dot_res = result + i;
334343

335344
_DataType_input1* dot_in1 = input1;
336-
for(size_t j = 0; j < ext_input1_ndim - 1; ++j)
345+
for (size_t j = 0; j < ext_input1_ndim - 1; ++j)
337346
{
338347
dot_in1 = dot_in1 + res_coords[j] * ext_input1_strides[j];
339348
}
340349

341350
_DataType_input2* dot_in2 = input2;
342-
for(size_t j = 0; j < ext_input2_ndim - 2; ++j)
351+
for (size_t j = 0; j < ext_input2_ndim - 2; ++j)
343352
{
344353
dot_in2 = dot_in2 + res_coords[ext_input1_ndim - 1 + j] * ext_input2_strides[j];
345354
}
@@ -357,7 +366,6 @@ void dpnp_dot_c(void* result_out,
357366
delete[] ext_input2_shape;
358367
delete[] ext_input2_strides;
359368
delete[] ext_result_shape;
360-
361369
}
362370

363371
template <typename _DataType, typename _ResultType>

dpnp/backend/kernels/dpnp_krnl_statistics.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ void dpnp_count_nonzero_c(void* array1_in, void* result1_out, size_t size)
163163
_DataType_input* array1 = input1_ptr.get_ptr();
164164
_DataType_output* result1 = result_ptr.get_ptr();
165165

166-
167166
result1[0] = 0;
168167

169168
for (size_t i = 0; i < size; ++i)

dpnp/backend/src/dpnp_utils.hpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@
3434

3535
#include <dpnp_iface_fptr.hpp>
3636

37-
#define LIBSYCL_VERSION_GREATER(major, minor, patch) \
38-
(__LIBSYCL_MAJOR_VERSION > major) \
39-
|| (__LIBSYCL_MAJOR_VERSION == major and __LIBSYCL_MINOR_VERSION > minor) \
40-
|| (__LIBSYCL_MAJOR_VERSION == major and __LIBSYCL_MINOR_VERSION == minor and __LIBSYCL_PATCH_VERSION >= patch)
37+
#define LIBSYCL_VERSION_GREATER(major, minor, patch) \
38+
(__LIBSYCL_MAJOR_VERSION > major) || (__LIBSYCL_MAJOR_VERSION == major and __LIBSYCL_MINOR_VERSION > minor) || \
39+
(__LIBSYCL_MAJOR_VERSION == major and __LIBSYCL_MINOR_VERSION == minor and __LIBSYCL_PATCH_VERSION >= patch)
4140

4241
/**
4342
* @defgroup BACKEND_UTILS Backend C++ library utilities
@@ -93,7 +92,7 @@ void get_xyz_by_id(size_t idx, size_t ndim, const _DataType* offsets, _DataType*
9392
size_t quotient;
9493
size_t remainder = idx;
9594

96-
for(size_t i = 0; i < ndim; ++i)
95+
for (size_t i = 0; i < ndim; ++i)
9796
{
9897
quotient = remainder / offsets[i];
9998
remainder = remainder - quotient * offsets[i];

dpnp/dpnp_algo/dpnp_algo.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ cdef extern from "dpnp_iface.hpp" namespace "QueueOptions": # need this namespa
221221
AUTO_SELECTOR
222222

223223
cdef extern from "constants.hpp":
224-
void dpnp_python_constants_initialize_c(void* py_none, void* py_nan)
224+
void dpnp_python_constants_initialize_c(void * py_none, void * py_nan)
225225

226226
cdef extern from "dpnp_iface.hpp":
227227
void dpnp_queue_initialize_c(QueueOptions selector)

dpnp/dpnp_algo/dpnp_algo.pyx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ include "dpnp_algo_statistics.pyx"
7373
include "dpnp_algo_trigonometric.pyx"
7474

7575

76-
ctypedef void(*fptr_dpnp_arange_t)(size_t, size_t, void * , size_t)
77-
ctypedef void(*fptr_dpnp_astype_t)(const void * , void * , const size_t)
78-
ctypedef void(*fptr_dpnp_flatten_t)(const void * , void * , const size_t)
79-
ctypedef void(*fptr_dpnp_initval_t)(void * , void * , size_t)
76+
ctypedef void(*fptr_dpnp_arange_t)(size_t, size_t, void *, size_t)
77+
ctypedef void(*fptr_dpnp_astype_t)(const void *, void * , const size_t)
78+
ctypedef void(*fptr_dpnp_flatten_t)(const void *, void * , const size_t)
79+
ctypedef void(*fptr_dpnp_initval_t)(void *, void * , size_t)
8080

8181

8282
cpdef utils.dpnp_descriptor dpnp_arange(start, stop, step, dtype):
@@ -190,8 +190,8 @@ cpdef dpnp_queue_initialize():
190190
queue_type = GPU_SELECTOR
191191

192192
dpnp_queue_initialize_c(queue_type)
193-
dpnp_python_constants_initialize_c(<void*> None,
194-
<void*> dpnp.nan)
193+
dpnp_python_constants_initialize_c(< void*> None,
194+
< void * > dpnp.nan)
195195

196196
# TODO:
197197
# choose seed number as is in numpy
@@ -283,7 +283,7 @@ cdef utils.dpnp_descriptor call_fptr_1in_1out(DPNPFuncName fptr_name,
283283
""" get the FPTR data structure """
284284
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(fptr_name, param1_type, param1_type)
285285

286-
result_type = dpnp_DPNPFuncType_to_dtype(< size_t > kernel_data.return_type)
286+
result_type = dpnp_DPNPFuncType_to_dtype( < size_t > kernel_data.return_type)
287287

288288
cdef utils.dpnp_descriptor result
289289

@@ -320,7 +320,7 @@ cdef utils.dpnp_descriptor call_fptr_2in_1out(DPNPFuncName fptr_name,
320320
# get the FPTR data structure
321321
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(fptr_name, x1_c_type, x2_c_type)
322322

323-
result_type = dpnp_DPNPFuncType_to_dtype(< size_t > kernel_data.return_type)
323+
result_type = dpnp_DPNPFuncType_to_dtype( < size_t > kernel_data.return_type)
324324

325325
# Create result array
326326
cdef shape_type_c x1_shape = x1_obj.shape

dpnp/dpnp_algo/dpnp_algo_indexing.pyx

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,28 @@ __all__ += [
5454
"dpnp_triu_indices_from"
5555
]
5656

57-
ctypedef void(*fptr_dpnp_choose_t)(void * , void * , void **, size_t, size_t, size_t)
58-
ctypedef void(*fptr_dpnp_diag_indices)(void*, size_t)
59-
ctypedef void(*custom_indexing_2in_1out_func_ptr_t)(void *, const size_t, void * , void * , size_t)
60-
ctypedef void(*custom_indexing_2in_1out_func_ptr_t_)(void * , const size_t, void * , const size_t, size_t * , size_t * , const size_t)
61-
ctypedef void(*custom_indexing_2in_func_ptr_t)(void *, void * , size_t * , const size_t)
62-
ctypedef void(*custom_indexing_3in_func_ptr_t)(void * , void * , void * , const size_t, const size_t)
63-
ctypedef void(*custom_indexing_3in_with_axis_func_ptr_t)(void * , void * , void * , const size_t, size_t * , const size_t,
57+
ctypedef void(*fptr_dpnp_choose_t)(void * , void * , void ** , size_t, size_t, size_t)
58+
ctypedef void(*fptr_dpnp_diag_indices)(void *, size_t)
59+
ctypedef void(*custom_indexing_2in_1out_func_ptr_t)(void * , const size_t, void * , void * , size_t)
60+
ctypedef void(*custom_indexing_2in_1out_func_ptr_t_)(void *, const size_t, void * , const size_t, size_t * , size_t * , const size_t)
61+
ctypedef void(*custom_indexing_2in_func_ptr_t)(void * , void * , size_t * , const size_t)
62+
ctypedef void(*custom_indexing_3in_func_ptr_t)(void *, void * , void * , const size_t, const size_t)
63+
ctypedef void(*custom_indexing_3in_with_axis_func_ptr_t)(void *, void * , void * , const size_t, size_t * , const size_t,
6464
const size_t, const size_t,)
65-
ctypedef void(*custom_indexing_6in_func_ptr_t)(void *, void * , void * , const size_t, const size_t, const size_t)
66-
ctypedef void(*fptr_dpnp_nonzero_t)(const void * , void * , const size_t, const size_t * , const size_t , const size_t)
65+
ctypedef void(*custom_indexing_6in_func_ptr_t)(void * , void * , void * , const size_t, const size_t, const size_t)
66+
ctypedef void(*fptr_dpnp_nonzero_t)(const void *, void * , const size_t, const size_t * , const size_t , const size_t)
6767

6868

6969
cpdef utils.dpnp_descriptor dpnp_choose(utils.dpnp_descriptor input, list choices1):
70-
cdef vector[void * ] choices
70+
cdef vector[void *] choices
7171
cdef utils.dpnp_descriptor choice
7272
for desc in choices1:
7373
choice = desc
7474
choices.push_back(choice.get_data())
7575

7676
cdef shape_type_c input_shape = input.shape
7777
cdef size_t choice_size = choices1[0].size
78-
78+
7979
cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(input.dtype)
8080

8181
cdef DPNPFuncType param2_type = dpnp_dtype_to_DPNPFuncType(choices1[0].dtype)
@@ -84,7 +84,7 @@ cpdef utils.dpnp_descriptor dpnp_choose(utils.dpnp_descriptor input, list choice
8484

8585
cdef utils.dpnp_descriptor res_array = utils.create_output_descriptor(input_shape, kernel_data.return_type, None)
8686

87-
cdef fptr_dpnp_choose_t func = <fptr_dpnp_choose_t> kernel_data.ptr
87+
cdef fptr_dpnp_choose_t func = <fptr_dpnp_choose_t > kernel_data.ptr
8888

8989
func(res_array.get_data(),
9090
input.get_data(),
@@ -102,9 +102,9 @@ cpdef tuple dpnp_diag_indices(n, ndim):
102102
cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(dpnp.int64)
103103

104104
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_DIAG_INDICES, param1_type, param1_type)
105-
106-
cdef fptr_dpnp_diag_indices func = <fptr_dpnp_diag_indices> kernel_data.ptr
107-
105+
106+
cdef fptr_dpnp_diag_indices func = <fptr_dpnp_diag_indices > kernel_data.ptr
107+
108108
res_list = []
109109
cdef utils.dpnp_descriptor res_arr
110110
cdef shape_type_c result_shape = utils._object_to_tuple(res_size)
@@ -114,7 +114,7 @@ cpdef tuple dpnp_diag_indices(n, ndim):
114114
func(res_arr.get_data(), res_size)
115115

116116
res_list.append(res_arr.get_pyobj())
117-
117+
118118
return tuple(res_list)
119119

120120
cpdef utils.dpnp_descriptor dpnp_diagonal(dpnp_descriptor input, offset=0):
@@ -321,7 +321,7 @@ cpdef utils.dpnp_descriptor dpnp_select(list condlist, list choicelist, default)
321321

322322
cpdef utils.dpnp_descriptor dpnp_take(utils.dpnp_descriptor input, utils.dpnp_descriptor indices):
323323
cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(input.dtype)
324-
324+
325325
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_TAKE, param1_type, param1_type)
326326

327327
cdef utils.dpnp_descriptor result = utils.create_output_descriptor(indices.shape, kernel_data.return_type, None)

dpnp/dpnp_algo/dpnp_algo_linearalgebra.pyx

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ __all__ += [
4444

4545

4646
# C function pointer to the C library template functions
47-
ctypedef void(*fptr_2in_1out_shapes_t)(void *, void * , void * , size_t * , size_t * , size_t * , size_t)
48-
ctypedef void(*fptr_2in_1out_dot_t)(void * , const size_t, const size_t, const long * , const long * ,
49-
void * , const size_t, const size_t, const long * , const long * ,
50-
void * , const size_t, const size_t, const long * , const long * )
47+
ctypedef void(*fptr_2in_1out_shapes_t)(void * , void * , void * , size_t * , size_t * , size_t * , size_t)
48+
ctypedef void(*fptr_2in_1out_dot_t)(void *, const size_t, const size_t, const long * , const long * ,
49+
void *, const size_t, const size_t, const long * , const long * ,
50+
void *, const size_t, const size_t, const long * , const long * )
5151

5252
cdef shape_type_c strides_to_vector(strides, shape) except *:
5353
cdef shape_type_c res
@@ -80,9 +80,9 @@ cpdef utils.dpnp_descriptor dpnp_dot(utils.dpnp_descriptor in_array1, utils.dpnp
8080
result_shape = shape1
8181
elif ndim1 == 1 and ndim2 == 1:
8282
result_shape = ()
83-
elif ndim1 == 1: # ndim2 > 1
83+
elif ndim1 == 1: # ndim2 > 1
8484
result_shape = shape2[:-1]
85-
elif ndim2 == 1: # ndim1 > 1
85+
elif ndim2 == 1: # ndim1 > 1
8686
result_shape = shape1[:-1]
8787
else:
8888
if ndim1 == 1:
@@ -177,7 +177,8 @@ cpdef utils.dpnp_descriptor dpnp_inner(dpnp_descriptor array1, dpnp_descriptor a
177177
# do inner product
178178
result.get_pyobj()[numpy.unravel_index(idx1, result.shape)] = 0
179179
for idx2 in range(array1.shape[-1]):
180-
result.get_pyobj()[numpy.unravel_index(idx1, result.shape)] += array1.get_pyobj()[numpy.unravel_index(array1_lin_index_base + idx2, array1.shape)] * array2.get_pyobj()[numpy.unravel_index(array2_lin_index_base + idx2, array2.shape)]
180+
result.get_pyobj()[numpy.unravel_index(idx1, result.shape)] += array1.get_pyobj()[numpy.unravel_index(
181+
array1_lin_index_base + idx2, array1.shape)] * array2.get_pyobj()[numpy.unravel_index(array2_lin_index_base + idx2, array2.shape)]
181182

182183
return result
183184

@@ -280,18 +281,18 @@ cpdef utils.dpnp_descriptor dpnp_matmul(utils.dpnp_descriptor in_array1, utils.d
280281
func(result.get_data(),
281282
result.size,
282283
result.ndim,
283-
NULL, # result_shape
284-
NULL, # result_strides
284+
NULL, # result_shape
285+
NULL, # result_strides
285286
in_array1.get_data(),
286287
in_array1.size,
287288
in_array1.ndim,
288289
shape1.data(),
289-
NULL, # in_array1_strides
290+
NULL, # in_array1_strides
290291
in_array2.get_data(),
291292
in_array2.size,
292293
in_array2.ndim,
293294
shape2.data(),
294-
NULL) # in_array2_strides
295+
NULL) # in_array2_strides
295296

296297
return result
297298

dpnp/dpnp_container.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ def create_output_container(shape, type):
8181
""" Create DPNP array """
8282
result = dparray(shape, dtype=type)
8383

84-
return result
84+
return result
8585

8686

87-
def container_copy(dst_obj, src_obj, dst_idx = 0):
87+
def container_copy(dst_obj, src_obj, dst_idx=0):
8888
"""
8989
Copy values to `dst` by iterating element by element in `input_obj`
9090
"""

dpnp/dpnp_iface.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ def astype(x1, dtype, order='K', casting='unsafe', subok=True, copy=True):
169169

170170
return call_origin(numpy.ndarray.astype, x1, dtype, order=order, casting=casting, subok=subok, copy=copy)
171171

172+
172173
def convert_single_elem_array_to_scalar(obj, keepdims=False):
173174
"""
174175
Convert array with single element to scalar

0 commit comments

Comments
 (0)