Skip to content

Commit 0f370ae

Browse files
authored
Merge branch 'master' into fix-test-for-dpnp.append
2 parents f3b691c + 6ee4cb5 commit 0f370ae

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

doc/reference/manipulation.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ Transpose-like operations
3737
:nosignatures:
3838

3939
dpnp.moveaxis
40-
dpnp.roll
4140
dpnp.rollaxis
4241
dpnp.swapaxes
4342
dpnp.ndarray.T
4443
dpnp.transpose
44+
dpnp.permute_dims
45+
dpnp.matrix_transpose (Array API compatible)
4546

4647

4748
Changing number of dimensions
@@ -69,9 +70,8 @@ Changing kind of array
6970
:nosignatures:
7071

7172
dpnp.asarray
72-
dpnp.asnumpy
7373
dpnp.asanyarray
74-
dpnp.asmatrix
74+
dpnp.asnumpy
7575
dpnp.asfarray
7676
dpnp.asfortranarray
7777
dpnp.ascontiguousarray
@@ -87,13 +87,14 @@ Joining arrays
8787
:nosignatures:
8888

8989
dpnp.concatenate
90+
dpnp.concat
9091
dpnp.stack
9192
dpnp.block
9293
dpnp.vstack
9394
dpnp.hstack
95+
dpnp.dstack
9496
dpnp.column_stack
9597
dpnp.row_stack
96-
dpnp.dstack
9798

9899

99100
Splitting arrays
@@ -108,6 +109,7 @@ Splitting arrays
108109
dpnp.dsplit
109110
dpnp.hsplit
110111
dpnp.vsplit
112+
dpnp.unstack
111113

112114

113115
Tiling arrays
@@ -132,8 +134,8 @@ Adding and removing elements
132134
dpnp.insert
133135
dpnp.append
134136
dpnp.resize
135-
dpnp.unique
136137
dpnp.trim_zeros
138+
dpnp.unique
137139
dpnp.pad
138140

139141

@@ -147,6 +149,5 @@ Rearranging elements
147149
dpnp.flip
148150
dpnp.fliplr
149151
dpnp.flipud
150-
dpnp.reshape
151152
dpnp.roll
152153
dpnp.rot90

dpnp/dpnp_iface_mathematical.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ def _gradient_num_diff_2nd_order_interior(
224224
# fix the shape for broadcasting
225225
shape = [1] * ndim
226226
shape[axis] = -1
227-
# TODO: use shape.setter once dpctl#1699 is resolved
228-
# a.shape = b.shape = c.shape = shape
227+
229228
a = a.reshape(shape)
230229
b = b.reshape(shape)
231230
c = c.reshape(shape)

tests/third_party/cupy/core_tests/test_ndarray.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,8 @@ def test_shape_set(self, xp):
272272
return xp.array(arr.shape)
273273

274274
@pytest.mark.skip(
275-
"dpctl-1699: shape setter does not work with negative shape"
275+
"dpctl-1699: shape setter does not work with negative shape "
276+
"(no plan to support that)"
276277
)
277278
@testing.numpy_cupy_array_equal()
278279
def test_shape_set_infer(self, xp):

0 commit comments

Comments
 (0)