Commit bd0da1f
authored
Add proper exception handling for nested lists in
This PR fixes #2972.
Passing a nested sequence as `repeats` to `dpnp.repeat` (e.g.
`np.repeat(x, [[4]])`) raised an unclear `TypeError` instead of a
meaningful error:
```python
>>> import dpnp as np
>>> x = np.array([3])
>>> np.repeat(x, [[4]])
TypeError: '<' not supported between instances of 'list' and 'int'
```
The sequence branch of `dpnp.tensor.repeat` special-cased a length-1
sequence by taking `repeats[0]` and comparing it to `0`, which fails
when that element is itself a list. It also had no dimensionality guard,
so a multi-element nested sequence could slip through as a 2-D array —
unlike the `usm_ndarray` branch, which already rejects `ndim > 1`.
The fix converts the sequence to an array up front and rejects a
dimensionality greater than 1, aligning with NumPy, which raises a
`ValueError` in this case:
```python
>>> np.repeat(x, [[4]])
ValueError: `repeats` sequence must be 0- or 1-dimensional, got 2 dimensions
```
The scalar fast path (`_repeat_by_scalar`) is preserved for the size-1
case.dpnp.repeat (#3024)1 parent 7a2714b commit bd0da1f
5 files changed
Lines changed: 64 additions & 52 deletions
File tree
- dpnp
- tensor
- tests
- tensor
- third_party/cupy/manipulation_tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
86 | | - | |
| 86 | + | |
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2800 | 2800 | | |
2801 | 2801 | | |
2802 | 2802 | | |
2803 | | - | |
| 2803 | + | |
2804 | 2804 | | |
2805 | 2805 | | |
2806 | 2806 | | |
2807 | 2807 | | |
2808 | 2808 | | |
2809 | 2809 | | |
2810 | | - | |
| 2810 | + | |
| 2811 | + | |
2811 | 2812 | | |
2812 | 2813 | | |
2813 | 2814 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
576 | 576 | | |
577 | 577 | | |
578 | 578 | | |
579 | | - | |
| 579 | + | |
| 580 | + | |
580 | 581 | | |
581 | 582 | | |
582 | 583 | | |
| |||
663 | 664 | | |
664 | 665 | | |
665 | 666 | | |
666 | | - | |
667 | | - | |
668 | | - | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
669 | 677 | | |
670 | 678 | | |
671 | | - | |
672 | 679 | | |
673 | | - | |
| 680 | + | |
674 | 681 | | |
675 | 682 | | |
676 | 683 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1464 | 1464 | | |
1465 | 1465 | | |
1466 | 1466 | | |
| 1467 | + | |
| 1468 | + | |
| 1469 | + | |
| 1470 | + | |
| 1471 | + | |
| 1472 | + | |
| 1473 | + | |
| 1474 | + | |
1467 | 1475 | | |
1468 | 1476 | | |
1469 | 1477 | | |
| |||
Lines changed: 39 additions & 43 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
1 | 3 | | |
2 | 4 | | |
3 | 5 | | |
| |||
29 | 31 | | |
30 | 32 | | |
31 | 33 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
| 34 | + | |
37 | 35 | | |
38 | 36 | | |
39 | 37 | | |
| |||
48 | 46 | | |
49 | 47 | | |
50 | 48 | | |
51 | | - | |
| 49 | + | |
52 | 50 | | |
53 | 51 | | |
54 | 52 | | |
| |||
60 | 58 | | |
61 | 59 | | |
62 | 60 | | |
63 | | - | |
64 | | - | |
| 61 | + | |
65 | 62 | | |
66 | 63 | | |
67 | 64 | | |
| |||
77 | 74 | | |
78 | 75 | | |
79 | 76 | | |
80 | | - | |
| 77 | + | |
81 | 78 | | |
82 | 79 | | |
83 | 80 | | |
| |||
191 | 188 | | |
192 | 189 | | |
193 | 190 | | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
226 | 191 | | |
227 | 192 | | |
228 | 193 | | |
| |||
293 | 258 | | |
294 | 259 | | |
295 | 260 | | |
296 | | - | |
297 | 261 | | |
298 | | - | |
| 262 | + | |
299 | 263 | | |
300 | 264 | | |
301 | 265 | | |
| |||
310 | 274 | | |
311 | 275 | | |
312 | 276 | | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
313 | 309 | | |
314 | 310 | | |
315 | 311 | | |
| |||
0 commit comments