Skip to content

Commit 909e7a1

Browse files
committed
Fixed input shape for full() function. It cannot be None
1 parent e6a72e9 commit 909e7a1

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

dpnp/random/dpnp_algo_random.pyx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,9 @@ cdef class MT19937:
382382
cdef fptr_dpnp_rng_normal_c_1out_t func
383383
cdef c_dpctl.DPCTLSyclEventRef event_ref
384384

385+
result_shape = utils._object_to_tuple(size)
385386
if scale == 0.0:
386-
return utils.dpnp_descriptor(dpnp.full(size, loc, dtype=dtype))
387+
return utils.dpnp_descriptor(dpnp.full(result_shape, loc, dtype=dtype))
387388

388389
# convert string type names (array.dtype) to C enum DPNPFuncType
389390
param1_type = dpnp_dtype_to_DPNPFuncType(dtype)
@@ -392,7 +393,6 @@ cdef class MT19937:
392393
kernel_data = get_dpnp_function_ptr(DPNP_FN_RNG_NORMAL_EXT, param1_type, param1_type)
393394

394395
# ceate result array with type given by FPTR data
395-
result_shape = utils._object_to_tuple(size)
396396
result = utils.create_output_descriptor(result_shape,
397397
kernel_data.return_type,
398398
None,
@@ -418,8 +418,9 @@ cdef class MT19937:
418418
cdef fptr_dpnp_rng_uniform_c_1out_t func
419419
cdef c_dpctl.DPCTLSyclEventRef event_ref
420420

421+
result_shape = utils._object_to_tuple(size)
421422
if low == high:
422-
return utils.dpnp_descriptor(dpnp.full(size, low, dtype=dtype))
423+
return utils.dpnp_descriptor(dpnp.full(result_shape, low, dtype=dtype))
423424

424425
# convert string type names (array.dtype) to C enum DPNPFuncType
425426
param1_type = dpnp_dtype_to_DPNPFuncType(dtype)
@@ -428,7 +429,6 @@ cdef class MT19937:
428429
kernel_data = get_dpnp_function_ptr(DPNP_FN_RNG_UNIFORM_EXT, param1_type, param1_type)
429430

430431
# ceate result array with type given by FPTR data
431-
result_shape = utils._object_to_tuple(size)
432432
result = utils.create_output_descriptor(result_shape,
433433
kernel_data.return_type,
434434
None,
@@ -991,11 +991,12 @@ cpdef utils.dpnp_descriptor dpnp_rng_negative_binomial(double a, double p, size)
991991
cdef c_dpctl.DPCTLSyclQueueRef q_ref
992992
cdef c_dpctl.DPCTLSyclEventRef event_ref
993993

994+
result_shape = utils._object_to_tuple(size)
994995
if p == 0.0:
995996
filled_val = numpy.iinfo(dtype).min
996-
return utils.dpnp_descriptor(dpnp.full(size, filled_val, dtype=dtype))
997+
return utils.dpnp_descriptor(dpnp.full(result_shape, filled_val, dtype=dtype))
997998
elif p == 1.0:
998-
return utils.dpnp_descriptor(dpnp.full(size, 0, dtype=dtype))
999+
return utils.dpnp_descriptor(dpnp.full(result_shape, 0, dtype=dtype))
9991000
else:
10001001
# convert string type names (array.dtype) to C enum DPNPFuncType
10011002
param1_type = dpnp_dtype_to_DPNPFuncType(dtype)
@@ -1004,7 +1005,6 @@ cpdef utils.dpnp_descriptor dpnp_rng_negative_binomial(double a, double p, size)
10041005
kernel_data = get_dpnp_function_ptr(DPNP_FN_RNG_NEGATIVE_BINOMIAL_EXT, param1_type, param1_type)
10051006

10061007
# ceate result array with type given by FPTR data
1007-
result_shape = utils._object_to_tuple(size)
10081008
result = utils.create_output_descriptor(result_shape, kernel_data.return_type, None)
10091009

10101010
result_sycl_queue = result.get_array().sycl_queue
@@ -1108,8 +1108,9 @@ cpdef utils.dpnp_descriptor dpnp_rng_poisson(double lam, size):
11081108
cdef c_dpctl.DPCTLSyclQueueRef q_ref
11091109
cdef c_dpctl.DPCTLSyclEventRef event_ref
11101110

1111+
result_shape = utils._object_to_tuple(size)
11111112
if lam == 0:
1112-
return utils.dpnp_descriptor(dpnp.full(size, 0, dtype=dtype))
1113+
return utils.dpnp_descriptor(dpnp.full(result_shape, 0, dtype=dtype))
11131114
else:
11141115
# convert string type names (array.dtype) to C enum DPNPFuncType
11151116
param1_type = dpnp_dtype_to_DPNPFuncType(dtype)
@@ -1118,7 +1119,6 @@ cpdef utils.dpnp_descriptor dpnp_rng_poisson(double lam, size):
11181119
kernel_data = get_dpnp_function_ptr(DPNP_FN_RNG_POISSON_EXT, param1_type, param1_type)
11191120

11201121
# ceate result array with type given by FPTR data
1121-
result_shape = utils._object_to_tuple(size)
11221122
result = utils.create_output_descriptor(result_shape, kernel_data.return_type, None)
11231123

11241124
result_sycl_queue = result.get_array().sycl_queue
@@ -1187,8 +1187,9 @@ cpdef utils.dpnp_descriptor dpnp_rng_rayleigh(double scale, size):
11871187
cdef c_dpctl.DPCTLSyclQueueRef q_ref
11881188
cdef c_dpctl.DPCTLSyclEventRef event_ref
11891189

1190+
result_shape = utils._object_to_tuple(size)
11901191
if scale == 0.0:
1191-
return utils.dpnp_descriptor(dpnp.full(size, 0.0, dtype=dtype))
1192+
return utils.dpnp_descriptor(dpnp.full(result_shape, 0.0, dtype=dtype))
11921193
else:
11931194
# convert string type names (array.dtype) to C enum DPNPFuncType
11941195
param1_type = dpnp_dtype_to_DPNPFuncType(dtype)
@@ -1197,7 +1198,6 @@ cpdef utils.dpnp_descriptor dpnp_rng_rayleigh(double scale, size):
11971198
kernel_data = get_dpnp_function_ptr(DPNP_FN_RNG_RAYLEIGH_EXT, param1_type, param1_type)
11981199

11991200
# ceate result array with type given by FPTR data
1200-
result_shape = utils._object_to_tuple(size)
12011201
result = utils.create_output_descriptor(result_shape, kernel_data.return_type, None)
12021202

12031203
result_sycl_queue = result.get_array().sycl_queue
@@ -1348,8 +1348,9 @@ cpdef utils.dpnp_descriptor dpnp_rng_standard_gamma(double shape, size):
13481348
cdef c_dpctl.DPCTLSyclQueueRef q_ref
13491349
cdef c_dpctl.DPCTLSyclEventRef event_ref
13501350

1351+
result_shape = utils._object_to_tuple(size)
13511352
if shape == 0.0:
1352-
return utils.dpnp_descriptor(dpnp.full(size, 0.0, dtype=dtype))
1353+
return utils.dpnp_descriptor(dpnp.full(result_shape, 0.0, dtype=dtype))
13531354
else:
13541355
# convert string type names (array.dtype) to C enum DPNPFuncType
13551356
param1_type = dpnp_dtype_to_DPNPFuncType(dtype)
@@ -1358,7 +1359,6 @@ cpdef utils.dpnp_descriptor dpnp_rng_standard_gamma(double shape, size):
13581359
kernel_data = get_dpnp_function_ptr(DPNP_FN_RNG_STANDARD_GAMMA_EXT, param1_type, param1_type)
13591360

13601361
# ceate result array with type given by FPTR data
1361-
result_shape = utils._object_to_tuple(size)
13621362
result = utils.create_output_descriptor(result_shape, kernel_data.return_type, None)
13631363

13641364
result_sycl_queue = result.get_array().sycl_queue

0 commit comments

Comments
 (0)