Skip to content

Commit f038722

Browse files
authored
Merge pull request #1603 from pavanvidem/bio-infer-update
bioimage_inference change output format from tif to tiff
2 parents 4a8b556 + 98d01c3 commit f038722

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tools/bioimaging/bioimage_inference.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<description>with PyTorch</description>
33
<macros>
44
<token name="@TOOL_VERSION@">2.4.1</token>
5-
<token name="@VERSION_SUFFIX@">1</token>
5+
<token name="@VERSION_SUFFIX@">2</token>
66
</macros>
77
<creator>
88
<organization name="European Galaxy Team" url="https://galaxyproject.org/eu/" />
@@ -44,7 +44,7 @@
4444
</param>
4545
</inputs>
4646
<outputs>
47-
<data format="tif" name="output_predicted_image" from_work_dir="output_predicted_image.tif" label="Predicted image"></data>
47+
<data format="tiff" name="output_predicted_image" from_work_dir="output_predicted_image.tiff" label="Predicted image"></data>
4848
<data format="npy" name="output_predicted_image_matrix" from_work_dir="output_predicted_image_matrix.npy" label="Predicted image tensor"></data>
4949
</outputs>
5050
<tests>
@@ -53,7 +53,7 @@
5353
<param name="input_image_file" value="input_image_file.tif" location="https://zenodo.org/api/records/6647674/files/sample_input_0.tif/content"/>
5454
<param name="input_image_input_size" value="256,256,1,1"/>
5555
<param name="input_image_input_axes" value="bcyx"/>
56-
<output name="output_predicted_image" ftype="tif">
56+
<output name="output_predicted_image" ftype="tiff">
5757
<assert_contents>
5858
<has_size size="524846" delta="110" />
5959
</assert_contents>
@@ -69,7 +69,7 @@
6969
<param name="input_image_file" value="input_nucleisegboundarymodel.png"/>
7070
<param name="input_image_input_size" value="256,256,1,1"/>
7171
<param name="input_image_input_axes" value="bcyx"/>
72-
<output name="output_predicted_image" ftype="tif">
72+
<output name="output_predicted_image" ftype="tiff">
7373
<assert_contents>
7474
<has_size size="524846" delta="110" />
7575
</assert_contents>
@@ -85,7 +85,7 @@
8585
<param name="input_image_file" value="input_image_file.tif" location="https://uk1s3.embassy.ebi.ac.uk/public-datasets/bioimage.io/emotional-cricket/1.1/files/sample_input_0.tif"/>
8686
<param name="input_image_input_size" value="128,128,100,1"/>
8787
<param name="input_image_input_axes" value="bczyx"/>
88-
<output name="output_predicted_image" ftype="tif">
88+
<output name="output_predicted_image" ftype="tiff">
8989
<assert_contents>
9090
<has_size size="6572778" delta="100" />
9191
</assert_contents>
@@ -101,7 +101,7 @@
101101
<param name="input_image_file" value="input_3d-unet-arabidopsis-apical-stem-cells.png" location="https://uk1s3.embassy.ebi.ac.uk/public-datasets/bioimage.io/emotional-cricket/1.1/files/raw.png"/>
102102
<param name="input_image_input_size" value="128,128,100,1"/>
103103
<param name="input_image_input_axes" value="bczyx"/>
104-
<output name="output_predicted_image" ftype="tif">
104+
<output name="output_predicted_image" ftype="tiff">
105105
<assert_contents>
106106
<has_size size="6572778" delta="100" />
107107
</assert_contents>
@@ -117,7 +117,7 @@
117117
<param name="input_image_file" value="input_platynereisemnucleisegmentationboundarymodel.tif" location="https://uk1s3.embassy.ebi.ac.uk/public-datasets/bioimage.io/organized-badger/1/files/sample_input_0.tif"/>
118118
<param name="input_image_input_size" value="256,256,32,1"/>
119119
<param name="input_image_input_axes" value="bczyx"/>
120-
<output name="output_predicted_image" ftype="tif">
120+
<output name="output_predicted_image" ftype="tiff">
121121
<assert_contents>
122122
<has_size size="16789714" delta="100" />
123123
</assert_contents>
@@ -133,7 +133,7 @@
133133
<param name="input_image_file" value="input_3d-unet-lateral-root-primordia-cells.tif" location="https://uk1s3.embassy.ebi.ac.uk/public-datasets/bioimage.io/thoughtful-turtle/1/files/sample_input_0.tif"/>
134134
<param name="input_image_input_size" value="128,128,100,1"/>
135135
<param name="input_image_input_axes" value="bczyx"/>
136-
<output name="output_predicted_image" ftype="tif">
136+
<output name="output_predicted_image" ftype="tiff">
137137
<assert_contents>
138138
<has_size size="6572778" delta="100" />
139139
</assert_contents>

tools/bioimaging/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,4 @@ def dynamic_resize(image: torch.Tensor, target_shape: tuple):
141141
pred_numpy = pred_data.detach().numpy()
142142

143143
# write predicted TIF image to file
144-
imageio.v3.imwrite("output_predicted_image.tif", pred_numpy, extension=".tif")
144+
imageio.v3.imwrite("output_predicted_image.tiff", pred_numpy, extension=".tiff")

0 commit comments

Comments
 (0)