Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Saim momin12 tools/cellpose #1505

Closed
wants to merge 9 commits into from
34 changes: 17 additions & 17 deletions tools/cellpose/cellpose.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<tool id="cellpose" name="Run generalist cell and nucleus segmentation" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="22.05">
<tool id="cellpose" name="Run generalist cell and nucleus segmentation" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="23.02">
<description>with Cellpose</description>
<macros>
<token name="@TOOL_VERSION@">3.0.10</token>
<token name="@VERSION_SUFFIX@">0</token>
<token name="@VERSION_SUFFIX@">1</token>
<xml name="channel">
<option value="0" selected="true">grayscale/None</option>
<option value="1">red</option>
Expand Down Expand Up @@ -76,66 +76,66 @@
<param name="model_type" value="cyto"/>
<param name="chan" value="2"/>
<param name="chan2" value="3"/>
<output name="cp_mask" file="img02_cp_masks_cyto.tif" compare="sim_size" delta_frac="0.1"/>
<output name="cp_segm" file="img02_cp_segm_cyto.png" compare="sim_size" delta_frac="0.1"/>
<output name="cp_mask" file="img02_cp_masks_cyto.tif" compare="image_diff"/>
<output name="cp_segm" file="img02_cp_segm_cyto.png" compare="image_diff"/>
</test>
<test expect_num_outputs="2">
<param name="img_in" value="img02.png"/>
<param name="model_type" value="cyto2"/>
<param name="chan" value="2"/>
<param name="chan2" value="3"/>
<output name="cp_mask" file="img02_cp_masks_cyto2.tif" compare="sim_size" delta_frac="0.1"/>
<output name="cp_segm" file="img02_cp_segm_cyto2.png" compare="sim_size" delta_frac="0.1"/>
<output name="cp_mask" file="img02_cp_masks_cyto2.tif" compare="image_diff"/>
<output name="cp_segm" file="img02_cp_segm_cyto2.png" compare="image_diff"/>
</test>
<test expect_num_outputs="2">
<param name="img_in" value="img02.png"/>
<param name="model_type" value="cyto3"/>
<param name="chan" value="2"/>
<param name="chan2" value="3"/>
<output name="cp_mask" file="img02_cp_masks_cyto3.tif" compare="sim_size" delta_frac="0.1"/>
<output name="cp_segm" file="img02_cp_segm_cyto3.png" compare="sim_size" delta_frac="0.1"/>
<output name="cp_mask" file="img02_cp_masks_cyto3.tif" compare="image_diff"/>
<output name="cp_segm" file="img02_cp_segm_cyto3.png" compare="image_diff"/>
</test>
<test expect_num_outputs="2">
<param name="img_in" value="img02.png"/>
<param name="model_type" value="nuclei"/>
<param name="chan" value="2"/>
<param name="chan2" value="3"/>
<output name="cp_mask" file="img02_cp_masks_nuclei.tif" compare="sim_size" delta_frac="0.1"/>
<output name="cp_segm" file="img02_cp_segm_nuclei.png" compare="sim_size" delta_frac="0.1"/>
<output name="cp_mask" file="img02_cp_masks_nuclei.tif" compare="image_diff"/>
<output name="cp_segm" file="img02_cp_segm_nuclei.png" compare="image_diff"/>
</test>
<test expect_num_outputs="2">
<param name="img_in" value="img02.png"/>
<param name="model_type" value="cyto"/>
<param name="chan" value="2"/>
<param name="chan2" value="1"/>
<output name="cp_mask" file="img02_cp_masks_chan.tif" compare="sim_size" delta_frac="0.1"/>
<output name="cp_segm" file="img02_cp_segm_chan.png" compare="sim_size" delta_frac="0.1"/>
<output name="cp_mask" file="img02_cp_masks_chan.tif" compare="image_diff"/>
<output name="cp_segm" file="img02_cp_segm_chan.png" compare="image_diff"/>
</test>
<test expect_num_outputs="2">
<param name="img_in" value="img02.png"/>
<param name="model_type" value="cyto"/>
<param name="chan" value="2"/>
<param name="chan2" value="3"/>
<param name="diameter" value="50"/>
<output name="cp_mask" file="img02_cp_masks_diameter.tif" compare="sim_size" delta_frac="0.1"/>
<output name="cp_segm" file="img02_cp_segm_diameter.png" compare="sim_size" delta_frac="0.1"/>
<output name="cp_mask" file="img02_cp_masks_diameter.tif" compare="image_diff"/>
<output name="cp_segm" file="img02_cp_segm_diameter.png" compare="image_diff"/>
</test>
<test expect_num_outputs="2">
<param name="img_in" value="img02.png"/>
<param name="use_gpu" value="true"/>
<param name="model_type" value="cyto"/>
<param name="chan" value="2"/>
<param name="chan2" value="3"/>
<output name="cp_mask" file="img02_cp_masks_gpu.tif" compare="sim_size" delta_frac="0.1"/>
<output name="cp_segm" file="img02_cp_segm_gpu.png" compare="sim_size" delta_frac="0.1"/>
<output name="cp_mask" file="img02_cp_masks_gpu.tif" compare="image_diff"/>
<output name="cp_segm" file="img02_cp_segm_gpu.png" compare="image_diff"/>
</test>
<test expect_num_outputs="1">
<param name="img_in" value="img02.png"/>
<param name="model_type" value="cyto"/>
<param name="chan" value="2"/>
<param name="chan2" value="3"/>
<param name="show_segmentation" value="false"/>
<output name="cp_mask" file="img02_cp_masks_cyto.tif" compare="sim_size" delta_frac="0.1"/>
<output name="cp_mask" file="img02_cp_masks_cyto.tif" compare="image_diff"/>
</test>
</tests>
<help>
Expand Down
Binary file modified tools/cellpose/test-data/img02_cp_masks_chan.tif
Binary file not shown.
Binary file modified tools/cellpose/test-data/img02_cp_masks_cyto.tif
Binary file not shown.
Binary file modified tools/cellpose/test-data/img02_cp_masks_cyto2.tif
Binary file not shown.
Binary file modified tools/cellpose/test-data/img02_cp_masks_cyto3.tif
Binary file not shown.
Binary file modified tools/cellpose/test-data/img02_cp_masks_diameter.tif
Binary file not shown.
Binary file modified tools/cellpose/test-data/img02_cp_masks_gpu.tif
Binary file not shown.
Binary file modified tools/cellpose/test-data/img02_cp_masks_nuclei.tif
Binary file not shown.
Binary file modified tools/cellpose/test-data/img02_cp_segm_chan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tools/cellpose/test-data/img02_cp_segm_cyto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tools/cellpose/test-data/img02_cp_segm_cyto2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tools/cellpose/test-data/img02_cp_segm_cyto3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tools/cellpose/test-data/img02_cp_segm_diameter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tools/cellpose/test-data/img02_cp_segm_gpu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tools/cellpose/test-data/img02_cp_segm_nuclei.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading