@@ -414,20 +414,20 @@ def _write_sample_data(input_paths, output_paths, input_axes, output_axes, pixel
414
414
def write_im (path , im , axes , pixel_size = None ):
415
415
assert tifffile is not None , "need tifffile for writing deepimagej config"
416
416
assert len (axes ) == im .ndim , f"{ len (axes ), {im .ndim }} "
417
- assert im .ndim in (4 , 5 )
417
+ assert im .ndim in (4 , 5 ), f" { im . ndim } "
418
418
419
419
# convert the image to expects (Z)CYX axis order
420
- if im .ndim == 3 :
421
- assert set (axes ) == {"b" , "x" , "y" , "c" }
420
+ if im .ndim == 4 :
421
+ assert set (axes ) == {"b" , "x" , "y" , "c" }, f" { axes } "
422
422
axes_ij = "cyxb"
423
423
else :
424
- assert set (axes ) == {"b" , "x" , "y" , "z" , "c" }
424
+ assert set (axes ) == {"b" , "x" , "y" , "z" , "c" }, f" { axes } "
425
425
axes_ij = "zcyxb"
426
426
427
427
axis_permutation = tuple (axes .index (ax ) for ax in axes_ij )
428
428
im = im .transpose (axis_permutation )
429
429
# expand to TZCYXS
430
- if len (axes_ij ) == 2 : # add singleton t and z axis
430
+ if len (axes_ij ) == 4 : # add singleton t and z axis
431
431
im = im [None , None ]
432
432
else : # add singeton z axis
433
433
im = im [None ]
@@ -823,10 +823,8 @@ def build_model(
823
823
# add the deepimagej config if specified
824
824
if add_deepimagej_config :
825
825
if sample_inputs is None :
826
- input_axes_ij = [inp .axes [1 :] for inp in inputs ]
827
- output_axes_ij = [out .axes [1 :] for out in outputs ]
828
826
sample_inputs , sample_outputs = _write_sample_data (
829
- test_inputs , test_outputs , input_axes_ij , output_axes_ij , pixel_sizes , root
827
+ test_inputs , test_outputs , input_axes , output_axes , pixel_sizes , root
830
828
)
831
829
# deepimagej expect tifs as sample data
832
830
assert all (os .path .splitext (path )[1 ] in (".tif" , ".tiff" ) for path in sample_inputs )
0 commit comments