Merge pull request #289 from clEsperanto/update-clic-0.15.1

Update to [email protected]
clEsperanto · Nov 14, 2024 · 282ff74 · 282ff74
2 parents ed885f7 + 6cfbc00
commit 282ff74
Show file tree

Hide file tree

Showing 25 changed files with 2,128 additions and 2,170 deletions.
diff --git a/pyclesperanto/_tier1.py b/pyclesperanto/_tier1.py
diff --git a/pyclesperanto/_tier2.py b/pyclesperanto/_tier2.py
diff --git a/pyclesperanto/_tier3.py b/pyclesperanto/_tier3.py
diff --git a/pyclesperanto/_tier4.py b/pyclesperanto/_tier4.py
diff --git a/pyclesperanto/_tier5.py b/pyclesperanto/_tier5.py
@@ -12,22 +12,23 @@
 from ._core import Device
 from ._decorators import plugin_function
 
-clic = importlib.import_module("._pyclesperanto", package="pyclesperanto")
-
+clic = importlib.import_module('._pyclesperanto', package='pyclesperanto')
 
 @plugin_function(categories=["combine"])
 def array_equal(
-    input_image0: Image, input_image1: Image, device: Optional[Device] = None
+    input_image0: Image,
+    input_image1: Image,
+    device: Optional[Device] =None
 ) -> bool:
     """Compares if all pixels of two images are identical. If shape of the images or
     any pixel are different, returns False. True otherwise This function is supposed
     to work similarly like its counterpart in numpy [1].
 
     Parameters
     ----------
-    input_image0: Image
+    input_image0: Image 
         First array to compare
-    input_image1: Image
+    input_image1: Image 
         Second array to compare
     device: Optional[Device] (= None)
         Device to perform the operation on.
@@ -42,30 +43,22 @@ def array_equal(
     """
     return clic._array_equal(device, input_image0, input_image1)
 
-
-@plugin_function(
-    categories=[
-        "label processing",
-        "combine labels",
-        "in assistant",
-        "bia-bob-suggestion",
-    ]
-)
+@plugin_function(categories=["label processing", "combine labels", "in assistant", "bia-bob-suggestion"])
 def combine_labels(
     input_image0: Image,
     input_image1: Image,
-    output_image: Optional[Image] = None,
-    device: Optional[Device] = None,
+    output_image: Optional[Image] =None,
+    device: Optional[Device] =None
 ) -> Image:
     """Combines two label images by adding labels of a given label image to another.
     Labels in the second image overwrite labels in the first passed image.
     Afterwards, labels are relabeled sequentially.
 
     Parameters
     ----------
-    input_image0: Image
+    input_image0: Image 
         label image to add labels to.
-    input_image1: Image
+    input_image1: Image 
         label image to add labels from.
     output_image: Optional[Image] (= None)
         Output label image.
@@ -78,20 +71,19 @@ def combine_labels(
     """
     return clic._combine_labels(device, input_image0, input_image1, output_image)
 
-
 @plugin_function(categories=["label", "in assistant"])
 def connected_components_labeling(
     input_image: Image,
-    output_image: Optional[Image] = None,
-    connectivity: str = "box",
-    device: Optional[Device] = None,
+    output_image: Optional[Image] =None,
+    connectivity: str ='box',
+    device: Optional[Device] =None
 ) -> Image:
     """Performs connected components analysis inspecting the box neighborhood of every
     pixel to a binary image and generates a label map.
 
     Parameters
     ----------
-    input_image: Image
+    input_image: Image 
         Binary image to label.
     output_image: Optional[Image] (= None)
         Output label image.
@@ -108,24 +100,21 @@ def connected_components_labeling(
     ----------
     [1] https://clij.github.io/clij2-docs/reference_connectedComponentsLabelingBox
     """
-    return clic._connected_components_labeling(
-        device, input_image, output_image, str(connectivity)
-    )
-
+    return clic._connected_components_labeling(device, input_image, output_image, str(connectivity))
 
 @plugin_function(categories=["label", "in assistant", "bia-bob-suggestion"])
 def connected_component_labeling(
     input_image: Image,
-    output_image: Optional[Image] = None,
-    connectivity: str = "box",
-    device: Optional[Device] = None,
+    output_image: Optional[Image] =None,
+    connectivity: str ='box',
+    device: Optional[Device] =None
 ) -> Image:
     """Performs connected components analysis inspecting the box neighborhood of every
     pixel to a binary image and generates a label map.
 
     Parameters
     ----------
-    input_image: Image
+    input_image: Image 
         Binary image to label.
     output_image: Optional[Image] (= None)
         Output label image.
@@ -142,22 +131,19 @@ def connected_component_labeling(
     ----------
     [1] https://clij.github.io/clij2-docs/reference_connectedComponentsLabelingBox
     """
-    return clic._connected_component_labeling(
-        device, input_image, output_image, str(connectivity)
-    )
-
+    return clic._connected_component_labeling(device, input_image, output_image, str(connectivity))
 
 @plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"])
 def reduce_labels_to_centroids(
     input_image: Image,
-    output_image: Optional[Image] = None,
-    device: Optional[Device] = None,
+    output_image: Optional[Image] =None,
+    device: Optional[Device] =None
 ) -> Image:
     """Take a label map and reduce each label to its centroid.
 
     Parameters
     ----------
-    input_image: Image
+    input_image: Image 
         Label image to reduce.
     output_image: Optional[Image] (= None)
         Output label image with centroids.
@@ -174,20 +160,19 @@ def reduce_labels_to_centroids(
     """
     return clic._reduce_labels_to_centroids(device, input_image, output_image)
 
-
 @plugin_function(categories=["label processing", "in assistant"])
 def filter_label_by_size(
     input_image: Image,
-    output_image: Optional[Image] = None,
-    minimum_size: float = 0,
-    maximum_size: float = 100,
-    device: Optional[Device] = None,
+    output_image: Optional[Image] =None,
+    minimum_size: float =0,
+    maximum_size: float =100,
+    device: Optional[Device] =None
 ) -> Image:
     """Filter labelled objects outside of the min/max size range value.
 
     Parameters
     ----------
-    input_image: Image
+    input_image: Image 
         Input label image.
     output_image: Optional[Image] (= None)
         Output label image.
@@ -206,24 +191,21 @@ def filter_label_by_size(
     ----------
     [1] https://clij.github.io/clij2-docs/reference_excludeLabelsOutsideSizeRange
     """
-    return clic._filter_label_by_size(
-        device, input_image, output_image, float(minimum_size), float(maximum_size)
-    )
-
+    return clic._filter_label_by_size(device, input_image, output_image, float(minimum_size), float(maximum_size))
 
 @plugin_function(categories=["label processing", "in assistant"])
 def exclude_labels_outside_size_range(
     input_image: Image,
-    output_image: Optional[Image] = None,
-    minimum_size: float = 0,
-    maximum_size: float = 100,
-    device: Optional[Device] = None,
+    output_image: Optional[Image] =None,
+    minimum_size: float =0,
+    maximum_size: float =100,
+    device: Optional[Device] =None
 ) -> Image:
     """Filter labelled objects outside of the min/max size range value.
 
     Parameters
     ----------
-    input_image: Image
+    input_image: Image 
         Input label image.
     output_image: Optional[Image] (= None)
         Output label image.
@@ -242,6 +224,4 @@ def exclude_labels_outside_size_range(
     ----------
     [1] https://clij.github.io/clij2-docs/reference_excludeLabelsOutsideSizeRange
     """
-    return clic._exclude_labels_outside_size_range(
-        device, input_image, output_image, float(minimum_size), float(maximum_size)
-    )
+    return clic._exclude_labels_outside_size_range(device, input_image, output_image, float(minimum_size), float(maximum_size))