Skip to content

Commit 5b2494d

Browse files
authored
Merge branch 'master' into dpctl-where-reductions-out-kw
2 parents 6e568fc + d7082ad commit 5b2494d

15 files changed

+2097
-119
lines changed

.github/workflows/conda-package.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ env:
4040
third_party/cupy/linalg_tests/test_norms.py
4141
third_party/cupy/linalg_tests/test_product.py
4242
third_party/cupy/linalg_tests/test_solve.py
43+
third_party/cupy/linalg_tests/test_einsum.py
4344
third_party/cupy/logic_tests/test_comparison.py
4445
third_party/cupy/logic_tests/test_truth.py
4546
third_party/cupy/manipulation_tests/test_basic.py

doc/known_words.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ broadcastable
55
broadcasted
66
byteorder
77
Cholesky
8+
combinatorially
89
conda
10+
cubically
911
Decompositions
1012
dimensionality
1113
docstring
@@ -22,6 +24,7 @@ finfo
2224
finiteness
2325
Fortran
2426
Frobenius
27+
Hadamard
2528
Hypergeometric
2629
iinfo
2730
Infs

dpnp/dpnp_array.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,12 +582,14 @@ def astype(self, dtype, order="K", casting="unsafe", subok=True, copy=True):
582582
If it is False and no cast happens, then this method returns the array itself.
583583
Otherwise, a copy is returned.
584584
casting : {'no', 'equiv', 'safe', 'same_kind', 'unsafe'}, optional
585-
Controls what kind of data casting may occur. Defaults to 'unsafe' for backwards compatibility.
585+
Controls what kind of data casting may occur.
586+
Defaults to ``'unsafe'`` for backwards compatibility.
586587
587588
- 'no' means the data types should not be cast at all.
588589
- 'equiv' means only byte-order changes are allowed.
589590
- 'safe' means only casts which can preserve values are allowed.
590-
- 'same_kind' means only safe casts or casts within a kind, like float64 to float32, are allowed.
591+
- 'same_kind' means only safe casts or casts within a kind, like
592+
float64 to float32, are allowed.
591593
- 'unsafe' means any data conversions may be done.
592594
593595
copy : {bool}, optional

dpnp/dpnp_iface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ def check_supported_arrays_type(*arrays, scalar_type=False, all_scalars=False):
331331
f"An array must be any of supported type, but got {type(a)}"
332332
)
333333

334-
if len(arrays) > 1 and not (all_scalars or any_is_array):
334+
if len(arrays) > 0 and not (all_scalars or any_is_array):
335335
raise TypeError(
336336
"At least one input must be of supported array type, "
337337
"but got all scalars."

0 commit comments

Comments
 (0)