Skip to content

Commit

Permalink
Merge pull request #252 from clEsperanto/update-clic-0.13.3
Browse files Browse the repository at this point in the history
  • Loading branch information
StRigaud authored Sep 29, 2024
2 parents 335dcd5 + 52097f5 commit 90b0c1b
Show file tree
Hide file tree
Showing 10 changed files with 99 additions and 66 deletions.
46 changes: 23 additions & 23 deletions pyclesperanto/_tier1.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

clic = importlib.import_module('._pyclesperanto', package='pyclesperanto')

@plugin_function(categories=["filter", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "in assistant"])
def absolute(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -110,7 +110,7 @@ def add_image_and_scalar(
"""
return clic._add_image_and_scalar(device, input_image, output_image, float(scalar))

@plugin_function(categories=["combine", "binary processing", "in assistant", "combine labels", "label processing", "bia-bob-suggestion"])
@plugin_function(categories=["combine", "binary processing", "in assistant", "combine labels", "label processing"])
def binary_and(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -200,7 +200,7 @@ def binary_not(
"""
return clic._binary_not(device, input_image, output_image)

@plugin_function(categories=["combine", "binary processing", "in assistant", "combine labels", "label processing", "bia-bob-suggestion"])
@plugin_function(categories=["combine", "binary processing", "in assistant", "combine labels", "label processing"])
def binary_or(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -233,7 +233,7 @@ def binary_or(
"""
return clic._binary_or(device, input_image0, input_image1, output_image)

@plugin_function(categories=["combine", "binary processing", "in assistant", "combine labels", "label processing", "bia-bob-suggestion"])
@plugin_function(categories=["combine", "binary processing", "in assistant", "combine labels", "label processing"])
def binary_subtract(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -263,7 +263,7 @@ def binary_subtract(
"""
return clic._binary_subtract(device, input_image0, input_image1, output_image)

@plugin_function(categories=["combine", "binary processing", "in assistant", "combine labels", "label processing", "bia-bob-suggestion"])
@plugin_function(categories=["combine", "binary processing", "in assistant", "combine labels", "label processing"])
def binary_xor(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -665,7 +665,7 @@ def dilate_box(
"""
return clic._dilate_box(device, input_image, output_image)

@plugin_function(categories=["binary processing", "bia-bob-suggestion"])
@plugin_function(categories=["binary processing"])
def dilate_sphere(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -695,7 +695,7 @@ def dilate_sphere(
"""
return clic._dilate_sphere(device, input_image, output_image)

@plugin_function(categories=["binary processing", "bia-bob-suggestion"])
@plugin_function(categories=["binary processing"])
def dilate(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -880,7 +880,7 @@ def erode_box(
"""
return clic._erode_box(device, input_image, output_image)

@plugin_function(categories=["binary processing", "bia-bob-suggestion"])
@plugin_function(categories=["binary processing"])
def erode_sphere(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -910,7 +910,7 @@ def erode_sphere(
"""
return clic._erode_sphere(device, input_image, output_image)

@plugin_function(categories=["binary processing", "bia-bob-suggestion"])
@plugin_function(categories=["binary processing"])
def erode(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -1047,7 +1047,7 @@ def gaussian_blur(
"""
return clic._gaussian_blur(device, input_image, output_image, float(sigma_x), float(sigma_y), float(sigma_z))

@plugin_function(categories=["bia-bob-suggestion"])
@plugin_function
def generate_distance_matrix(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -1333,7 +1333,7 @@ def hessian_eigenvalues(
"""
return clic._hessian_eigenvalues(device, input_image, small_eigenvalue, middle_eigenvalue, large_eigenvalue)

@plugin_function(categories=["filter", "edge detection", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "edge detection", "in assistant"])
def laplace_box(
input_image: Image,
output_image: Optional[Image] =None,
Expand All @@ -1360,7 +1360,7 @@ def laplace_box(
"""
return clic._laplace_box(device, input_image, output_image)

@plugin_function(categories=["filter", "edge detection", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "edge detection"])
def laplace_diamond(
input_image: Image,
output_image: Optional[Image] =None,
Expand All @@ -1387,7 +1387,7 @@ def laplace_diamond(
"""
return clic._laplace_diamond(device, input_image, output_image)

@plugin_function(categories=["filter", "edge detection", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "edge detection"])
def laplace(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -1472,7 +1472,7 @@ def logarithm(
"""
return clic._logarithm(device, input_image, output_image)

@plugin_function(categories=["bia-bob-suggestion"])
@plugin_function
def mask(
input_image: Image,
mask: Image,
Expand Down Expand Up @@ -1505,7 +1505,7 @@ def mask(
"""
return clic._mask(device, input_image, mask, output_image)

@plugin_function(categories=["bia-bob-suggestion"])
@plugin_function
def mask_label(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -1541,7 +1541,7 @@ def mask_label(
"""
return clic._mask_label(device, input_image0, input_image1, output_image, float(label))

@plugin_function(categories=["filter", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "in assistant"])
def maximum_image_and_scalar(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -1572,7 +1572,7 @@ def maximum_image_and_scalar(
"""
return clic._maximum_image_and_scalar(device, input_image, output_image, float(scalar))

@plugin_function(categories=["combine", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["combine", "in assistant"])
def maximum_images(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -1837,7 +1837,7 @@ def mean_sphere(
"""
return clic._mean_sphere(device, input_image, output_image, int(radius_x), int(radius_y), int(radius_z))

@plugin_function(categories=["filter", "denoise", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "denoise", "in assistant"])
def mean(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -2370,7 +2370,7 @@ def mode_sphere(
"""
return clic._mode_sphere(device, input_image, output_image, int(radius_x), int(radius_y), int(radius_z))

@plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["label processing", "in assistant"])
def mode(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -2410,7 +2410,7 @@ def mode(
"""
return clic._mode(device, input_image, output_image, int(radius_x), int(radius_y), int(radius_z), str(connectivity))

@plugin_function(categories=["combine", "bia-bob-suggestion"])
@plugin_function(categories=["combine"])
def modulo_images(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -3083,7 +3083,7 @@ def range(
"""
return clic._range(device, input_image, output_image, start_x, stop_x, step_x, start_y, stop_y, step_y, start_z, stop_z, step_z)

@plugin_function(categories=["bia-bob-suggestion"])
@plugin_function
def read_values_from_positions(
input_image: Image,
list: Image,
Expand Down Expand Up @@ -3209,7 +3209,7 @@ def replace_intensity(
"""
return clic._replace_intensity(device, input_image, output_image, float(scalar0), float(scalar1))

@plugin_function(categories=["bia-bob-suggestion"])
@plugin_function
def replace_intensities(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -4218,7 +4218,7 @@ def variance_box(
"""
return clic._variance_box(device, input_image, output_image, int(radius_x), int(radius_y), int(radius_z))

@plugin_function(categories=["filter", "edge detection", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "edge detection", "in assistant"])
def variance_sphere(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down
28 changes: 14 additions & 14 deletions pyclesperanto/_tier2.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

clic = importlib.import_module('._pyclesperanto', package='pyclesperanto')

@plugin_function(categories=["combine", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["combine", "in assistant"])
def absolute_difference(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -112,7 +112,7 @@ def bottom_hat_box(
"""
return clic._bottom_hat_box(device, input_image, output_image, int(radius_x), int(radius_y), int(radius_z))

@plugin_function(categories=["filter", "background removal", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "background removal", "in assistant"])
def bottom_hat_sphere(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -148,7 +148,7 @@ def bottom_hat_sphere(
"""
return clic._bottom_hat_sphere(device, input_image, output_image, float(radius_x), float(radius_y), float(radius_z))

@plugin_function(categories=["filter", "background removal", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "background removal", "in assistant"])
def bottom_hat(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -288,7 +288,7 @@ def closing_sphere(
"""
return clic._closing_sphere(device, input_image, output_image, int(radius_x), int(radius_y), int(radius_z))

@plugin_function(categories=["filter", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "in assistant"])
def closing(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -414,7 +414,7 @@ def concatenate_along_z(
"""
return clic._concatenate_along_z(device, input_image0, input_image1, output_image)

@plugin_function(categories=["bia-bob-suggestion"])
@plugin_function
def count_touching_neighbors(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -474,7 +474,7 @@ def crop_border(
"""
return clic._crop_border(device, input_image, output_image, int(border_size))

@plugin_function(categories=["filter", "background removal", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "background removal", "in assistant"])
def divide_by_gaussian_background(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -741,7 +741,7 @@ def difference_of_gaussian(
"""
return clic._difference_of_gaussian(device, input_image, output_image, float(sigma1_x), float(sigma1_y), float(sigma1_z), float(sigma2_x), float(sigma2_y), float(sigma2_z))

@plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["label processing", "in assistant"])
def extend_labeling_via_voronoi(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -798,7 +798,7 @@ def invert(
"""
return clic._invert(device, input_image, output_image)

@plugin_function(categories=["label", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["label", "in assistant"])
def label_spots(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -961,7 +961,7 @@ def opening_box(
"""
return clic._opening_box(device, input_image, output_image, int(radius_x), int(radius_y), int(radius_z))

@plugin_function(categories=["filter", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "in assistant"])
def opening_sphere(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -994,7 +994,7 @@ def opening_sphere(
"""
return clic._opening_sphere(device, input_image, output_image, float(radius_x), float(radius_y), float(radius_z))

@plugin_function(categories=["filter", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "in assistant"])
def opening(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -1132,7 +1132,7 @@ def square(
"""
return clic._square(device, input_image, output_image)

@plugin_function(categories=["combine", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["combine", "in assistant"])
def squared_difference(
input_image0: Image,
input_image1: Image,
Expand Down Expand Up @@ -1200,7 +1200,7 @@ def standard_deviation_box(
"""
return clic._standard_deviation_box(device, input_image, output_image, int(radius_x), int(radius_y), int(radius_z))

@plugin_function(categories=["filter", "edge detection", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "edge detection", "in assistant"])
def standard_deviation_sphere(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -1238,7 +1238,7 @@ def standard_deviation_sphere(
"""
return clic._standard_deviation_sphere(device, input_image, output_image, int(radius_x), int(radius_y), int(radius_z))

@plugin_function(categories=["filter", "edge detection", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "edge detection", "in assistant"])
def standard_deviation(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -1512,7 +1512,7 @@ def top_hat_sphere(
"""
return clic._top_hat_sphere(device, input_image, output_image, float(radius_x), float(radius_y), float(radius_z))

@plugin_function(categories=["filter", "background removal", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["filter", "background removal", "in assistant"])
def top_hat(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down
6 changes: 3 additions & 3 deletions pyclesperanto/_tier3.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def remove_labels_on_edges(
"""
return clic._remove_labels_on_edges(device, input_image, output_image, exclude_x, exclude_y, exclude_z)

@plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"])
@plugin_function(categories=["label processing", "in assistant"])
def exclude_labels_on_edges(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -298,7 +298,7 @@ def generate_binary_overlap_matrix(
"""
return clic._generate_binary_overlap_matrix(device, input_image0, input_image1, output_image)

@plugin_function(categories=["bia-bob-suggestion"])
@plugin_function
def generate_touch_matrix(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down Expand Up @@ -411,7 +411,7 @@ def jaccard_index(
"""
return clic._jaccard_index(device, input_image0, input_image1)

@plugin_function(categories=["bia-bob-suggestion"])
@plugin_function
def labelled_spots_to_pointlist(
input_image: Image,
output_image: Optional[Image] =None,
Expand Down
Loading

0 comments on commit 90b0c1b

Please sign in to comment.