@@ -123,6 +123,12 @@ def test_array_1d(self):
123123 assert_array_equal (a [:10 ], z [:10 ])
124124 assert_array_equal (a [10 :20 ], z [10 :20 ])
125125 assert_array_equal (a [- 10 :], z [- 10 :])
126+ assert_array_equal (a [:10 , ...], z [:10 , ...])
127+ assert_array_equal (a [10 :20 , ...], z [10 :20 , ...])
128+ assert_array_equal (a [- 10 :, ...], z [- 10 :, ...])
129+ assert_array_equal (a [..., :10 ], z [..., :10 ])
130+ assert_array_equal (a [..., 10 :20 ], z [..., 10 :20 ])
131+ assert_array_equal (a [..., - 10 :], z [..., - 10 :])
126132 # ...across chunk boundaries...
127133 assert_array_equal (a [:110 ], z [:110 ])
128134 assert_array_equal (a [190 :310 ], z [190 :310 ])
@@ -135,6 +141,18 @@ def test_array_1d(self):
135141 eq (a [42 ], z [np .int32 (42 )])
136142 eq (a [42 ], z [np .uint64 (42 )])
137143 eq (a [42 ], z [np .uint32 (42 )])
144+ # too many indices
145+ with assert_raises (IndexError ):
146+ z [:, :]
147+ with assert_raises (IndexError ):
148+ z [0 , :]
149+ with assert_raises (IndexError ):
150+ z [:, 0 ]
151+ with assert_raises (IndexError ):
152+ z [0 , 0 ]
153+ # only single ellipsis allowed
154+ with assert_raises (IndexError ):
155+ z [..., ...]
138156
139157 # check partial assignment
140158 b = np .arange (1e5 , 2e5 )
@@ -194,37 +212,84 @@ def test_array_2d(self):
194212 eq (a .nbytes , z .nbytes )
195213 eq (50 , z .nchunks_initialized )
196214
197- # check slicing
215+ # check array-like
198216 assert_array_equal (a , np .array (z ))
217+
218+ # check slicing
219+
220+ # total slice
199221 assert_array_equal (a , z [:])
200222 assert_array_equal (a , z [...])
201223 # noinspection PyTypeChecker
202224 assert_array_equal (a , z [slice (None )])
225+
226+ # slice first dimension
203227 assert_array_equal (a [:10 ], z [:10 ])
204228 assert_array_equal (a [10 :20 ], z [10 :20 ])
205229 assert_array_equal (a [- 10 :], z [- 10 :])
230+ assert_array_equal (a [:10 , :], z [:10 , :])
231+ assert_array_equal (a [10 :20 , :], z [10 :20 , :])
232+ assert_array_equal (a [- 10 :, :], z [- 10 :, :])
233+ assert_array_equal (a [:10 , ...], z [:10 , ...])
234+ assert_array_equal (a [10 :20 , ...], z [10 :20 , ...])
235+ assert_array_equal (a [- 10 :, ...], z [- 10 :, ...])
236+ assert_array_equal (a [:10 , :, ...], z [:10 , :, ...])
237+ assert_array_equal (a [10 :20 , :, ...], z [10 :20 , :, ...])
238+ assert_array_equal (a [- 10 :, :, ...], z [- 10 :, :, ...])
239+
240+ # slice second dimension
206241 assert_array_equal (a [:, :2 ], z [:, :2 ])
207242 assert_array_equal (a [:, 2 :4 ], z [:, 2 :4 ])
208243 assert_array_equal (a [:, - 2 :], z [:, - 2 :])
244+ assert_array_equal (a [..., :2 ], z [..., :2 ])
245+ assert_array_equal (a [..., 2 :4 ], z [..., 2 :4 ])
246+ assert_array_equal (a [..., - 2 :], z [..., - 2 :])
247+ assert_array_equal (a [:, ..., :2 ], z [:, ..., :2 ])
248+ assert_array_equal (a [:, ..., 2 :4 ], z [:, ..., 2 :4 ])
249+ assert_array_equal (a [:, ..., - 2 :], z [:, ..., - 2 :])
250+
251+ # slice both dimensions
209252 assert_array_equal (a [:10 , :2 ], z [:10 , :2 ])
210253 assert_array_equal (a [10 :20 , 2 :4 ], z [10 :20 , 2 :4 ])
211254 assert_array_equal (a [- 10 :, - 2 :], z [- 10 :, - 2 :])
212- # ...across chunk boundaries...
255+
256+ # slicing across chunk boundaries
213257 assert_array_equal (a [:110 ], z [:110 ])
214258 assert_array_equal (a [190 :310 ], z [190 :310 ])
215259 assert_array_equal (a [- 110 :], z [- 110 :])
260+ assert_array_equal (a [:110 , :], z [:110 , :])
261+ assert_array_equal (a [190 :310 , :], z [190 :310 , :])
262+ assert_array_equal (a [- 110 :, :], z [- 110 :, :])
216263 assert_array_equal (a [:, :3 ], z [:, :3 ])
217264 assert_array_equal (a [:, 3 :7 ], z [:, 3 :7 ])
218265 assert_array_equal (a [:, - 3 :], z [:, - 3 :])
219266 assert_array_equal (a [:110 , :3 ], z [:110 , :3 ])
220267 assert_array_equal (a [190 :310 , 3 :7 ], z [190 :310 , 3 :7 ])
221268 assert_array_equal (a [- 110 :, - 3 :], z [- 110 :, - 3 :])
222- # single item
269+
270+ # single row/col/item
223271 assert_array_equal (a [0 ], z [0 ])
224272 assert_array_equal (a [- 1 ], z [- 1 ])
273+ assert_array_equal (a [:, 0 ], z [:, 0 ])
274+ assert_array_equal (a [:, - 1 ], z [:, - 1 ])
225275 eq (a [0 , 0 ], z [0 , 0 ])
226276 eq (a [- 1 , - 1 ], z [- 1 , - 1 ])
227277
278+ # too many indices
279+ with assert_raises (IndexError ):
280+ z [:, :, :]
281+ with assert_raises (IndexError ):
282+ z [0 , :, :]
283+ with assert_raises (IndexError ):
284+ z [:, 0 , :]
285+ with assert_raises (IndexError ):
286+ z [:, :, 0 ]
287+ with assert_raises (IndexError ):
288+ z [0 , 0 , 0 ]
289+ # only single ellipsis allowed
290+ with assert_raises (IndexError ):
291+ z [..., ...]
292+
228293 # check partial assignment
229294 b = np .arange (10000 , 20000 ).reshape ((1000 , 10 ))
230295 z [190 :310 , 3 :7 ] = b [190 :310 , 3 :7 ]
0 commit comments