Skip to content

Commit d890a93

Browse files
authored
Merge 9b1ccc7 into 1b0ce60
2 parents 1b0ce60 + 9b1ccc7 commit d890a93

13 files changed

+252
-194
lines changed

dpnp/dpnp_array.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ def copy(self, order="C", device=None, usm_type=None, sycl_queue=None):
926926
927927
Parameters
928928
----------
929-
order : {"C", "F", "A", "K"}, optional
929+
order : {None, "C", "F", "A", "K"}, optional
930930
Memory layout of the newly output array.
931931
Default: ``"C"``.
932932
device : {None, string, SyclDevice, SyclQueue, Device}, optional

dpnp/dpnp_iface.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ def get_result_array(a, out=None, casting="safe"):
572572
----------
573573
a : {dpnp.ndarray, usm_ndarray}
574574
Input array.
575-
out : {dpnp.ndarray, usm_ndarray}
575+
out : {None, dpnp.ndarray, usm_ndarray}
576576
If provided, value of `a` array will be copied into it
577577
according to ``safe`` casting rule.
578578
It should be of the appropriate shape.
@@ -585,7 +585,7 @@ def get_result_array(a, out=None, casting="safe"):
585585
586586
Returns
587587
-------
588-
out : {dpnp_array}
588+
out : dpnp.ndarray
589589
Return `out` if provided, otherwise return `a`.
590590
591591
"""

dpnp/dpnp_iface_arraycreation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def array(
320320
(``dtype``, ``order``, etc.). For ``False`` it raises a ``ValueError``
321321
exception if a copy can not be avoided.
322322
Default: ``True``.
323-
order : {"C", "F", "A", "K"}, optional
323+
order : {None, "C", "F", "A", "K"}, optional
324324
Memory layout of the newly output array.
325325
Default: ``"K"``.
326326
ndmin : int, optional
@@ -998,7 +998,7 @@ def copy(
998998
Input data, in any form that can be converted to an array. This
999999
includes scalars, lists, lists of tuples, tuples, tuples of tuples,
10001000
tuples of lists, and ndarrays.
1001-
order : {"C", "F", "A", "K"}, optional
1001+
order : {None, "C", "F", "A", "K"}, optional
10021002
Memory layout of the newly output array.
10031003
Default: ``"K"``.
10041004
device : {None, string, SyclDevice, SyclQueue, Device}, optional
@@ -3559,7 +3559,7 @@ def trace(a, offset=0, axis1=0, axis2=1, dtype=None, out=None):
35593559
precision, then the default integer precision is used. Otherwise, the
35603560
precision is the same as that of `a`.
35613561
Default: ``None``.
3562-
out : {dpnp.ndarray, usm_ndarray}, optional
3562+
out : {None, dpnp.ndarray, usm_ndarray}, optional
35633563
Array into which the output is placed. Its type is preserved and it
35643564
must be of the right shape to hold the output.
35653565
Default: ``None``.

dpnp/dpnp_iface_bitwise.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def binary_repr(num, width=None):
150150
Array must have the correct shape and the expected data type.
151151
152152
Default: ``None``.
153-
order : {"C", "F", "A", "K"}, optional
153+
order : {None, "C", "F", "A", "K"}, optional
154154
Memory layout of the newly output array, if parameter `out` is ``None``.
155155
156156
Default: ``"K"``.
@@ -231,7 +231,7 @@ def binary_repr(num, width=None):
231231
Array must have the correct shape and the expected data type.
232232
233233
Default: ``None``.
234-
order : {"C", "F", "A", "K"}, optional
234+
order : {None, "C", "F", "A", "K"}, optional
235235
Memory layout of the newly output array, if parameter `out` is ``None``.
236236
237237
Default: ``"K"``.
@@ -292,7 +292,7 @@ def binary_repr(num, width=None):
292292
Array must have the correct shape and the expected data type.
293293
294294
Default: ``None``.
295-
order : {"C", "F", "A", "K"}, optional
295+
order : {None, "C", "F", "A", "K"}, optional
296296
Memory layout of the newly output array, if parameter `out` is ``None``.
297297
298298
Default: ``"K"``.
@@ -372,7 +372,7 @@ def binary_repr(num, width=None):
372372
Array must have the correct shape and the expected data type.
373373
374374
Default: ``None``.
375-
order : {"C", "F", "A", "K"}, optional
375+
order : {None, "C", "F", "A", "K"}, optional
376376
Memory layout of the newly output array, if parameter `out` is ``None``.
377377
378378
Default: ``"K"``.
@@ -450,7 +450,7 @@ def binary_repr(num, width=None):
450450
Array must have the correct shape and the expected data type.
451451
452452
Default: ``None``.
453-
order : {"C", "F", "A", "K"}, optional
453+
order : {None, "C", "F", "A", "K"}, optional
454454
Memory layout of the newly output array, if parameter `out` is ``None``.
455455
456456
Default: ``"K"``.
@@ -538,7 +538,7 @@ def binary_repr(num, width=None):
538538
Array must have the correct shape and the expected data type.
539539
540540
Default: ``None``.
541-
order : {"C", "F", "A", "K"}, optional
541+
order : {None, "C", "F", "A", "K"}, optional
542542
Memory layout of the newly output array, if parameter `out` is ``None``.
543543
544544
Default: ``"K"``.
@@ -617,7 +617,7 @@ def binary_repr(num, width=None):
617617
Array must have the correct shape and the expected data type.
618618
619619
Default: ``None``.
620-
order : {"C", "F", "A", "K"}, optional
620+
order : {None, "C", "F", "A", "K"}, optional
621621
Memory layout of the newly output array, if parameter `out` is ``None``.
622622
623623
Default: ``"K"``.

dpnp/dpnp_iface_linearalgebra.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ def matmul(
780780
Controls what kind of data casting may occur.
781781
782782
Default: ``"same_kind"``.
783-
order : {"C", "F", "A", "K", None}, optional
783+
order : {None, "C", "F", "A", "K"}, optional
784784
Memory layout of the newly output array, if parameter `out` is ``None``.
785785
786786
Default: ``"K"``.
@@ -960,7 +960,7 @@ def matvec(
960960
Controls what kind of data casting may occur.
961961
962962
Default: ``"same_kind"``.
963-
order : {"C", "F", "A", "K", None}, optional
963+
order : {None, "C", "F", "A", "K"}, optional
964964
Memory layout of the newly output array, if parameter `out` is ``None``.
965965
966966
Default: ``"K"``.
@@ -1335,7 +1335,7 @@ def vecdot(
13351335
Controls what kind of data casting may occur.
13361336
13371337
Default: ``"same_kind"``.
1338-
order : {"C", "F", "A", "K", None}, optional
1338+
order : {None, "C", "F", "A", "K"}, optional
13391339
Memory layout of the newly output array, if parameter `out` is ``None``.
13401340
13411341
Default: ``"K"``.
@@ -1463,7 +1463,7 @@ def vecmat(
14631463
Controls what kind of data casting may occur.
14641464
14651465
Default: ``"same_kind"``.
1466-
order : {"C", "F", "A", "K", None}, optional
1466+
order : {None, "C", "F", "A", "K"}, optional
14671467
Memory layout of the newly output array, if parameter `out` is ``None``.
14681468
14691469
Default: ``"K"``.

0 commit comments

Comments
 (0)