@@ -449,20 +449,16 @@ def convert_shape(shape: Shape) -> Optional[WeakShape]:
449
449
"""Process a user-provided shape variable into None or a valid shape object."""
450
450
if shape is None :
451
451
return None
452
- if isinstance (shape , int ) or (isinstance (size , TensorVariable ) and shape .ndim == 0 ):
452
+ elif isinstance (shape , int ) or (isinstance (size , TensorVariable ) and shape .ndim == 0 ):
453
453
shape = (shape ,)
454
454
elif isinstance (shape , TensorVariable ) and shape .ndim == 1 :
455
455
shape = tuple (shape )
456
456
elif isinstance (shape , (list , tuple )):
457
457
shape = tuple (shape )
458
458
else :
459
- raise ValueError (
460
- f"The `shape` parameter must be a tuple, TensorVariable, int or list. Actual: { type (shape )} "
461
- )
459
+ raise ValueError (f"The `shape` parameter must be a tuple, TensorVariable, int or list. Actual: { type (shape )} " )
462
460
if isinstance (shape , tuple ) and any (s == Ellipsis for s in shape [:- 1 ]):
463
- raise ValueError (
464
- f"Ellipsis in `shape` may only appear in the last position. Actual: { shape } "
465
- )
461
+ raise ValueError (f"Ellipsis in `shape` may only appear in the last position. Actual: { shape } " )
466
462
return shape
467
463
468
464
@@ -477,9 +473,7 @@ def convert_size(size: Size) -> Optional[StrongSize]:
477
473
elif isinstance (size , (list , tuple )):
478
474
size = tuple (size )
479
475
else :
480
- raise ValueError (
481
- f"The `size` parameter must be a tuple, TensorVariable, int or list. Actual: { type (size )} "
482
- )
476
+ raise ValueError (f"The `size` parameter must be a tuple, TensorVariable, int or list. Actual: { type (size )} " )
483
477
if isinstance (size , tuple ) and Ellipsis in size :
484
478
raise ValueError (f"The `size` parameter cannot contain an Ellipsis. Actual: { size } " )
485
479
return size
0 commit comments