mirrors/rocm_jax
1
0
Fork 0
mirror of https://github.com/ROCm/jax.git synced 2025-04-19 05:16:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

go back to raising TypeError, not ValueError

Browse Source 
Too many downstream tests depended on the exception type, and I'm not in the mood to fix them :)
This commit is contained in:
Matthew Johnson 2023-11-16 13:05:00 -08:00
parent 6299ff8023
commit 0b046fb0f0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jax/_src/numpy/array_methods.py
View File

@ -124,25 +124,25 @@ def _compute_newshape(a: ArrayLike, newshape: Union[DimSize, Shape]) -> Shape:
newshape = core.canonicalize_shape(newshape) # type: ignore[arg-type]
neg1s = [i for i, d in enumerate(newshape) if type(d) is int and d == -1]
if len(neg1s) > 1:
raise ValueError("can only specify one unknown axis size with a `-1` value, "
f"got {orig_newshape}")
raise TypeError("can only specify one unknown axis size with a `-1` value, "
f"got {orig_newshape}")
if neg1s:
i, = neg1s
other_sizes = (*newshape[:i], *newshape[i+1:])
if (all(isinstance(d, int) for d in (*np.shape(a), *other_sizes)) and
np.size(a) % math.prod(other_sizes) != 0):
raise ValueError(f"cannot reshape array of shape {np.shape(a)} (size {np.size(a)}) "
f"into shape {orig_newshape} because the product of "
f"specified axis sizes ({math.prod(other_sizes)}) does "
f"not evenly divide {np.size(a)}")
raise TypeError(f"cannot reshape array of shape {np.shape(a)} (size {np.size(a)}) "
f"into shape {orig_newshape} because the product of "
f"specified axis sizes ({math.prod(other_sizes)}) does "
f"not evenly divide {np.size(a)}")
sz = core.cancel_divide_tracers(np.shape(a), other_sizes)
if sz is not None:
return (*newshape[:i], sz, *newshape[i+1:])
else:
if (all(isinstance(d, int) for d in (*np.shape(a), *newshape)) and
np.size(a) != math.prod(newshape)):
raise ValueError(f"cannot reshape array of shape {np.shape(a)} (size {np.size(a)}) "
f"into shape {orig_newshape} (size {math.prod(newshape)})")
raise TypeError(f"cannot reshape array of shape {np.shape(a)} (size {np.size(a)}) "
f"into shape {orig_newshape} (size {math.prod(newshape)})")
return tuple(-core.divide_shape_sizes(np.shape(a), newshape)
if core.definitely_equal(d, -1) else d for d in newshape)