Skip to content

Commit 224a683

Browse files
Alexander-MakaryevAlexander-Makaryev
authored
code style 30 Dec 2021 (#1099)
1 parent d1a2195 commit 224a683

29 files changed

+349
-227
lines changed

‎dpnp/backend/examples/example11.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ int main(int, char**)
6767
for (size_t i = 0; i < ndim_cases; i++)
6868
{
6969
std::cout << "\nREPRODUCE: DPNPC dpnp_rng_shuffle_c:";
70-
std::cout << "\nDIMS: " << ndim[i] <<std::endl;
70+
std::cout << "\nDIMS: " << ndim[i] << std::endl;
7171
// init array 0, 1, 2, 3, 4, 5, 6, ....
7272
dpnp_arange_c<double>(0, 1, array_1, size);
7373
// print before shuffle
@@ -77,7 +77,7 @@ int main(int, char**)
7777
dpnp_rng_shuffle_c<double>(array_1, itemsize, ndim[i], high_dim_size[i], size);
7878
// print shuffle result
7979
std::cout << "\nSHUFFLE INPUT array:";
80-
print_dpnp_array(array_1, size);
80+
print_dpnp_array(array_1, size);
8181
}
8282
dpnp_memory_free_c(array_1);
8383
}

‎dpnp/backend/include/dpnp_gen_2arg_1type_tbl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282

8383
#endif
8484

85-
MACRO_2ARG_1TYPE_OP(dpnp_bitwise_and_c, input1_elem & input2_elem)
85+
MACRO_2ARG_1TYPE_OP(dpnp_bitwise_and_c, input1_elem& input2_elem)
8686
MACRO_2ARG_1TYPE_OP(dpnp_bitwise_or_c, input1_elem | input2_elem)
8787
MACRO_2ARG_1TYPE_OP(dpnp_bitwise_xor_c, input1_elem ^ input2_elem)
8888
MACRO_2ARG_1TYPE_OP(dpnp_left_shift_c, input1_elem << input2_elem)

‎dpnp/backend/include/dpnp_iface.hpp

Lines changed: 43 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,8 @@ INP_DLLEXPORT void dpnp_count_nonzero_c(void* array1_in, void* result1_out, size
420420
* @param [in] ndim Number of elements in shape.
421421
*/
422422
template <typename _DataType>
423-
INP_DLLEXPORT void
424-
dpnp_partition_c(void* array, void* array2, void* result, const size_t kth, const shape_elem_type* shape, const size_t ndim);
423+
INP_DLLEXPORT void dpnp_partition_c(
424+
void* array, void* array2, void* result, const size_t kth, const shape_elem_type* shape, const size_t ndim);
425425

426426
/**
427427
* @ingroup BACKEND_API
@@ -480,7 +480,7 @@ INP_DLLEXPORT void dpnp_prod_c(void* result_out,
480480
* @param [in] input_strides Strides of first input array.
481481
* @param [in] axis Axis.
482482
* @param [in] naxis Number of elements in axis.
483-
*/
483+
*/
484484
template <typename _DataType>
485485
INP_DLLEXPORT void dpnp_ptp_c(void* result_out,
486486
const size_t result_size,
@@ -494,7 +494,7 @@ INP_DLLEXPORT void dpnp_ptp_c(void* result_out,
494494
const shape_elem_type* input_strides,
495495
const shape_elem_type* axis,
496496
const size_t naxis);
497-
497+
498498
/**
499499
* @ingroup BACKEND_API
500500
* @brief Product of array elements
@@ -688,8 +688,13 @@ INP_DLLEXPORT void
688688
* @param [in] ndim Number of elements in shape.
689689
*/
690690
template <typename _DataType>
691-
INP_DLLEXPORT void dpnp_diag_c(
692-
void* array, void* result, const int k, shape_elem_type* shape, shape_elem_type* res_shape, const size_t ndim, const size_t res_ndim);
691+
INP_DLLEXPORT void dpnp_diag_c(void* array,
692+
void* result,
693+
const int k,
694+
shape_elem_type* shape,
695+
shape_elem_type* res_shape,
696+
const size_t ndim,
697+
const size_t res_ndim);
693698

694699
/**
695700
* @ingroup BACKEND_API
@@ -800,8 +805,8 @@ INP_DLLEXPORT void dpnp_max_c(void* array1_in,
800805
* @param [in] naxis Number of elements in axis.
801806
*/
802807
template <typename _DataType, typename _ResultType>
803-
INP_DLLEXPORT void
804-
dpnp_mean_c(void* array, void* result, const shape_elem_type* shape, size_t ndim, const shape_elem_type* axis, size_t naxis);
808+
INP_DLLEXPORT void dpnp_mean_c(
809+
void* array, void* result, const shape_elem_type* shape, size_t ndim, const shape_elem_type* axis, size_t naxis);
805810

806811
/**
807812
* @ingroup BACKEND_API
@@ -815,8 +820,8 @@ INP_DLLEXPORT void
815820
* @param [in] naxis Number of elements in axis.
816821
*/
817822
template <typename _DataType, typename _ResultType>
818-
INP_DLLEXPORT void
819-
dpnp_median_c(void* array, void* result, const shape_elem_type* shape, size_t ndim, const shape_elem_type* axis, size_t naxis);
823+
INP_DLLEXPORT void dpnp_median_c(
824+
void* array, void* result, const shape_elem_type* shape, size_t ndim, const shape_elem_type* axis, size_t naxis);
820825

821826
/**
822827
* @ingroup BACKEND_API
@@ -886,8 +891,13 @@ INP_DLLEXPORT void dpnp_around_c(const void* input_in, void* result_out, const s
886891
* @param [in] ddof Delta degrees of freedom.
887892
*/
888893
template <typename _DataType, typename _ResultType>
889-
INP_DLLEXPORT void dpnp_std_c(
890-
void* array, void* result, const shape_elem_type* shape, size_t ndim, const shape_elem_type* axis, size_t naxis, size_t ddof);
894+
INP_DLLEXPORT void dpnp_std_c(void* array,
895+
void* result,
896+
const shape_elem_type* shape,
897+
size_t ndim,
898+
const shape_elem_type* axis,
899+
size_t naxis,
900+
size_t ddof);
891901

892902
/**
893903
* @ingroup BACKEND_API
@@ -939,8 +949,13 @@ INP_DLLEXPORT void dpnp_tri_c(void* result, const size_t N, const size_t M, cons
939949
* @param [in] res_ndim Number of elements in res_shape.
940950
*/
941951
template <typename _DataType>
942-
INP_DLLEXPORT void dpnp_tril_c(
943-
void* array, void* result, const int k, shape_elem_type* shape, shape_elem_type* res_shape, const size_t ndim, const size_t res_ndim);
952+
INP_DLLEXPORT void dpnp_tril_c(void* array,
953+
void* result,
954+
const int k,
955+
shape_elem_type* shape,
956+
shape_elem_type* res_shape,
957+
const size_t ndim,
958+
const size_t res_ndim);
944959

945960
/**
946961
* @ingroup BACKEND_API
@@ -955,8 +970,13 @@ INP_DLLEXPORT void dpnp_tril_c(
955970
* @param [in] res_ndim Number of elements in res_shape.
956971
*/
957972
template <typename _DataType>
958-
INP_DLLEXPORT void dpnp_triu_c(
959-
void* array, void* result, const int k, shape_elem_type* shape, shape_elem_type* res_shape, const size_t ndim, const size_t res_ndim);
973+
INP_DLLEXPORT void dpnp_triu_c(void* array,
974+
void* result,
975+
const int k,
976+
shape_elem_type* shape,
977+
shape_elem_type* res_shape,
978+
const size_t ndim,
979+
const size_t res_ndim);
960980

961981
/**
962982
* @ingroup BACKEND_API
@@ -971,8 +991,13 @@ INP_DLLEXPORT void dpnp_triu_c(
971991
* @param [in] ddof Delta degrees of freedom.
972992
*/
973993
template <typename _DataType, typename _ResultType>
974-
INP_DLLEXPORT void dpnp_var_c(
975-
void* array, void* result, const shape_elem_type* shape, size_t ndim, const shape_elem_type* axis, size_t naxis, size_t ddof);
994+
INP_DLLEXPORT void dpnp_var_c(void* array,
995+
void* result,
996+
const shape_elem_type* shape,
997+
size_t ndim,
998+
const shape_elem_type* axis,
999+
size_t naxis,
1000+
size_t ddof);
9761001

9771002
/**
9781003
* @ingroup BACKEND_API

‎dpnp/backend/kernels/dpnp_krnl_arraycreation.cpp

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <iostream>
2727

2828
#include "dpnp_fptr.hpp"
29-
#include "dpnp_utils.hpp"
3029
#include "dpnp_iface.hpp"
30+
#include "dpnp_utils.hpp"
3131
#include "dpnpc_memory_adapter.hpp"
3232
#include "queue_sycl.hpp"
3333

@@ -66,8 +66,13 @@ void dpnp_arange_c(size_t start, size_t step, void* result1, size_t size)
6666
}
6767

6868
template <typename _DataType>
69-
void dpnp_diag_c(
70-
void* v_in, void* result1, const int k, shape_elem_type* shape, shape_elem_type* res_shape, const size_t ndim, const size_t res_ndim)
69+
void dpnp_diag_c(void* v_in,
70+
void* result1,
71+
const int k,
72+
shape_elem_type* shape,
73+
shape_elem_type* res_shape,
74+
const size_t ndim,
75+
const size_t res_ndim)
7176
{
7277
// avoid warning unused variable
7378
(void)res_ndim;
@@ -220,8 +225,8 @@ void dpnp_ptp_c(void* result1_out,
220225
const shape_elem_type* axis,
221226
const size_t naxis)
222227
{
223-
(void) result_strides;
224-
(void) input_strides;
228+
(void)result_strides;
229+
(void)input_strides;
225230

226231
if ((input1_in == nullptr) || (result1_out == nullptr))
227232
{
@@ -244,17 +249,29 @@ void dpnp_ptp_c(void* result1_out,
244249
dpnp_min_c<_DataType>(arr, min_arr, result_size, input_shape, input_ndim, axis, naxis);
245250
dpnp_max_c<_DataType>(arr, max_arr, result_size, input_shape, input_ndim, axis, naxis);
246251

247-
shape_elem_type* _strides = reinterpret_cast<shape_elem_type*>(dpnp_memory_alloc_c(result_ndim * sizeof(shape_elem_type)));
252+
shape_elem_type* _strides =
253+
reinterpret_cast<shape_elem_type*>(dpnp_memory_alloc_c(result_ndim * sizeof(shape_elem_type)));
248254
get_shape_offsets_inkernel(result_shape, result_ndim, _strides);
249255

250-
dpnp_subtract_c<_DataType, _DataType, _DataType>(result, result_size, result_ndim, result_shape, result_strides,
251-
max_arr, result_size, result_ndim, result_shape, _strides,
252-
min_arr, result_size, result_ndim, result_shape, _strides,
256+
dpnp_subtract_c<_DataType, _DataType, _DataType>(result,
257+
result_size,
258+
result_ndim,
259+
result_shape,
260+
result_strides,
261+
max_arr,
262+
result_size,
263+
result_ndim,
264+
result_shape,
265+
_strides,
266+
min_arr,
267+
result_size,
268+
result_ndim,
269+
result_shape,
270+
_strides,
253271
NULL);
254272

255273
dpnp_memory_free_c(min_arr);
256274
dpnp_memory_free_c(max_arr);
257-
258275
}
259276

260277
template <typename _DataType_input, typename _DataType_output>

‎dpnp/backend/kernels/dpnp_krnl_bitwise.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <iostream>
2727

2828
#include "dpnp_fptr.hpp"
29-
#include "dpnp_utils.hpp"
3029
#include "dpnp_iface.hpp"
30+
#include "dpnp_utils.hpp"
3131
#include "dpnpc_memory_adapter.hpp"
3232
#include "queue_sycl.hpp"
3333

@@ -135,7 +135,8 @@ static void func_map_init_bitwise_1arg_1type(func_map_t& fmap)
135135
shape_elem_type* input2_shape_offsets = \
136136
reinterpret_cast<shape_elem_type*>(dpnp_memory_alloc_c(input2_shape_size_in_bytes)); \
137137
get_shape_offsets_inkernel(input2_shape_data, input2_ndim, input2_shape_offsets); \
138-
use_strides = use_strides || !array_equal(input2_strides_data, input2_ndim, input2_shape_offsets, input2_ndim);\
138+
use_strides = \
139+
use_strides || !array_equal(input2_strides_data, input2_ndim, input2_shape_offsets, input2_ndim); \
139140
dpnp_memory_free_c(input2_shape_offsets); \
140141
\
141142
cl::sycl::event event; \
@@ -150,10 +151,8 @@ static void func_map_init_bitwise_1arg_1type(func_map_t& fmap)
150151
size_t input2_id = 0; \
151152
for (size_t i = 0; i < result_ndim; ++i) \
152153
{ \
153-
const size_t output_xyz_id = get_xyz_id_by_id_inkernel(output_id, \
154-
result_strides_data, \
155-
result_ndim, \
156-
i); \
154+
const size_t output_xyz_id = \
155+
get_xyz_id_by_id_inkernel(output_id, result_strides_data, result_ndim, i); \
157156
input1_id += output_xyz_id * input1_strides_data[i]; \
158157
input2_id += output_xyz_id * input2_strides_data[i]; \
159158
} \

0 commit comments

Comments
 (0)