From 6572d1006beb02941c5a068fc1ec82245171fd6d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 29 Sep 2024 15:15:33 +0000 Subject: [PATCH 1/2] Update pyclesperanto to 0.13.3 --- pyclesperanto/_tier1.py | 46 +++++++++++++++++++------------------- pyclesperanto/_tier2.py | 28 +++++++++++------------ pyclesperanto/_tier3.py | 6 ++--- pyclesperanto/_tier4.py | 47 +++++++++++++++++++++++++++++++-------- pyclesperanto/_tier5.py | 2 +- pyclesperanto/_tier6.py | 8 +++---- pyclesperanto/_tier7.py | 10 ++++----- pyclesperanto/_tier8.py | 2 +- pyclesperanto/_version.py | 2 +- src/wrapper/tier4_.cpp | 12 ++++++---- 10 files changed, 98 insertions(+), 65 deletions(-) diff --git a/pyclesperanto/_tier1.py b/pyclesperanto/_tier1.py index 63ca1cab..d2636ef7 100644 --- a/pyclesperanto/_tier1.py +++ b/pyclesperanto/_tier1.py @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/pyclesperanto/_tier2.py b/pyclesperanto/_tier2.py index 99e2c0b0..4c052d0f 100644 --- a/pyclesperanto/_tier2.py +++ b/pyclesperanto/_tier2.py @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/pyclesperanto/_tier3.py b/pyclesperanto/_tier3.py index 396444d2..5031c207 100644 --- a/pyclesperanto/_tier3.py +++ b/pyclesperanto/_tier3.py @@ -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, @@ -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, @@ -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, diff --git a/pyclesperanto/_tier4.py b/pyclesperanto/_tier4.py index 340f2ccf..61e3085c 100644 --- a/pyclesperanto/_tier4.py +++ b/pyclesperanto/_tier4.py @@ -163,6 +163,35 @@ def threshold_otsu( """ return clic._threshold_otsu(device, input_image, output_image) +@plugin_function(categories=["label measurement", "map", "in assistant"]) +def pixel_count_map( + input_image: Image, + output_image: Optional[Image] =None, + device: Optional[Device] =None +) -> Image: + """Takes a label map, determines the number of pixels per label and replaces every + label with the that number. This results in a parametric image expressing area + or volume. + + Parameters + ---------- + input_image: Image + Label image to measure + output_image: Optional[Image] (= None) + Parametric image computed + device: Optional[Device] (= None) + Device to perform the operation on. + + Returns + ------- + Image + + References + ---------- + [1] https://clij.github.io/clij2-docs/reference_pixelCountMap + """ + return clic._pixel_count_map(device, input_image, output_image) + @plugin_function(categories=["label measurement", "map", "in assistant"]) def label_pixel_count_map( input_image: Image, @@ -192,7 +221,7 @@ def label_pixel_count_map( """ return clic._label_pixel_count_map(device, input_image, output_image) -@plugin_function(categories=["bia-bob-suggestion"]) +@plugin_function def centroids_of_labels( input_image: Image, output_image: Optional[Image] =None, @@ -226,7 +255,7 @@ def centroids_of_labels( return clic._centroids_of_labels(device, input_image, output_image, withBG) @plugin_function(categories=["label processing", "combine"]) -def remove_labels_with_values_out_of_range( +def remove_labels_with_map_values_out_of_range( input_image: Image, values: Image, output_image: Optional[Image] =None, @@ -260,10 +289,10 @@ def remove_labels_with_values_out_of_range( ---------- [1] https://clij.github.io/clij2-docs/reference_excludeLabelsWithValuesOutOfRange """ - return clic._remove_labels_with_values_out_of_range(device, input_image, values, output_image, float(min_value), float(max_value)) + return clic._remove_labels_with_map_values_out_of_range(device, input_image, values, output_image, float(min_value), float(max_value)) @plugin_function(categories=["label processing", "combine"]) -def remove_labels_with_values_within_range( +def remove_labels_with_map_values_within_range( input_image: Image, values: Image, output_image: Optional[Image] =None, @@ -297,10 +326,10 @@ def remove_labels_with_values_within_range( ---------- [1] https://clij.github.io/clij2-docs/reference_excludeLabelsWithValuesWithinRange """ - return clic._remove_labels_with_values_within_range(device, input_image, values, output_image, float(min_value), float(max_value)) + return clic._remove_labels_with_map_values_within_range(device, input_image, values, output_image, float(min_value), float(max_value)) @plugin_function(categories=["label processing", "combine"]) -def exclude_labels_with_values_out_of_range( +def exclude_labels_with_map_values_out_of_range( input_image: Image, values: Image, output_image: Optional[Image] =None, @@ -334,10 +363,10 @@ def exclude_labels_with_values_out_of_range( ---------- [1] https://clij.github.io/clij2-docs/reference_excludeLabelsWithValuesOutOfRange """ - return clic._exclude_labels_with_values_out_of_range(device, input_image, values, output_image, float(min_value_range), float(max_value_range)) + return clic._exclude_labels_with_map_values_out_of_range(device, input_image, values, output_image, float(min_value_range), float(max_value_range)) @plugin_function(categories=["label processing", "combine"]) -def exclude_labels_with_values_within_range( +def exclude_labels_with_map_values_within_range( input_image: Image, values: Image, output_image: Optional[Image] =None, @@ -371,7 +400,7 @@ def exclude_labels_with_values_within_range( ---------- [1] https://clij.github.io/clij2-docs/reference_excludeLabelsWithValuesWithinRange """ - return clic._exclude_labels_with_values_within_range(device, input_image, values, output_image, float(min_value_range), float(max_value_range)) + return clic._exclude_labels_with_map_values_within_range(device, input_image, values, output_image, float(min_value_range), float(max_value_range)) @plugin_function(categories=["label processing", "in assistant", "map"]) def extension_ratio_map( diff --git a/pyclesperanto/_tier5.py b/pyclesperanto/_tier5.py index 12e78d81..a029e621 100644 --- a/pyclesperanto/_tier5.py +++ b/pyclesperanto/_tier5.py @@ -71,7 +71,7 @@ def combine_labels( """ return clic._combine_labels(device, input_image0, input_image1, output_image) -@plugin_function(categories=["label", "in assistant", "bia-bob-suggestion"]) +@plugin_function(categories=["label", "in assistant"]) def connected_components_labeling( input_image: Image, output_image: Optional[Image] =None, diff --git a/pyclesperanto/_tier6.py b/pyclesperanto/_tier6.py index f49357e8..0b5c2da6 100644 --- a/pyclesperanto/_tier6.py +++ b/pyclesperanto/_tier6.py @@ -74,7 +74,7 @@ def erode_labels( """ return clic._erode_labels(device, input_image, output_image, int(radius), relabel) -@plugin_function(categories=["label", "in assistant", "bia-bob-suggestion"]) +@plugin_function(categories=["label", "in assistant"]) def gauss_otsu_labeling( input_image0: Image, output_image: Optional[Image] =None, @@ -109,7 +109,7 @@ def gauss_otsu_labeling( """ return clic._gauss_otsu_labeling(device, input_image0, output_image, float(outline_sigma)) -@plugin_function(categories=["label", "bia-bob-suggestion"]) +@plugin_function(categories=["label"]) def masked_voronoi_labeling( input_image: Image, mask: Image, @@ -200,7 +200,7 @@ def remove_small_labels( """ return clic._remove_small_labels(device, input_image, output_image, float(min_size)) -@plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"]) +@plugin_function(categories=["label processing", "in assistant"]) def exclude_small_labels( input_image: Image, output_image: Optional[Image] =None, @@ -260,7 +260,7 @@ def remove_large_labels( """ return clic._remove_large_labels(device, input_image, output_image, float(max_size)) -@plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"]) +@plugin_function(categories=["label processing", "in assistant"]) def exclude_large_labels( input_image: Image, output_image: Optional[Image] =None, diff --git a/pyclesperanto/_tier7.py b/pyclesperanto/_tier7.py index 8124fb5c..b9b49f0c 100644 --- a/pyclesperanto/_tier7.py +++ b/pyclesperanto/_tier7.py @@ -49,7 +49,7 @@ def affine_transform( """ return clic._affine_transform(device, input_image, output_image, transform_matrix, interpolate, resize) -@plugin_function(categories=["label", "in assistant", "bia-bob-suggestion"]) +@plugin_function(categories=["label", "in assistant"]) def eroded_otsu_labeling( input_image: Image, output_image: Optional[Image] =None, @@ -91,7 +91,7 @@ def eroded_otsu_labeling( """ return clic._eroded_otsu_labeling(device, input_image, output_image, int(number_of_erosions), float(outline_sigma)) -@plugin_function(categories=["transform", "in assistant", "bia-bob-suggestion"]) +@plugin_function(categories=["transform", "in assistant"]) def rigid_transform( input_image: Image, output_image: Optional[Image] =None, @@ -262,7 +262,7 @@ def translate( """ return clic._translate(device, input_image, output_image, float(translate_x), float(translate_y), float(translate_z), interpolate) -@plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"]) +@plugin_function(categories=["label processing", "in assistant"]) def closing_labels( input_image: Image, output_image: Optional[Image] =None, @@ -292,7 +292,7 @@ def closing_labels( """ return clic._closing_labels(device, input_image, output_image, int(radius)) -@plugin_function +@plugin_function(categories=["label processing", "in assistant"]) def erode_connected_labels( input_image: Image, output_image: Optional[Image] =None, @@ -320,7 +320,7 @@ def erode_connected_labels( """ return clic._erode_connected_labels(device, input_image, output_image, int(radius)) -@plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"]) +@plugin_function(categories=["label processing", "in assistant"]) def opening_labels( input_image: Image, output_image: Optional[Image] =None, diff --git a/pyclesperanto/_tier8.py b/pyclesperanto/_tier8.py index cd2169ed..85b62701 100644 --- a/pyclesperanto/_tier8.py +++ b/pyclesperanto/_tier8.py @@ -43,7 +43,7 @@ def smooth_labels( """ return clic._smooth_labels(device, input_image, output_image, int(radius)) -@plugin_function +@plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"]) def smooth_connected_labels( input_image: Image, output_image: Optional[Image] =None, diff --git a/pyclesperanto/_version.py b/pyclesperanto/_version.py index 7174f89f..15a6eb07 100644 --- a/pyclesperanto/_version.py +++ b/pyclesperanto/_version.py @@ -1,3 +1,3 @@ VERSION = "0.13.1" -CLIC_VERSION = "0.13.1" +CLIC_VERSION = "0.13.3" COMMON_ALIAS = "cle" diff --git a/src/wrapper/tier4_.cpp b/src/wrapper/tier4_.cpp index 161fe3a3..0ab6520c 100644 --- a/src/wrapper/tier4_.cpp +++ b/src/wrapper/tier4_.cpp @@ -26,6 +26,10 @@ m.def("_label_bounding_box", &cle::tier4::label_bounding_box_func, "Call cle::ti py::return_value_policy::take_ownership, py::arg("device"), py::arg("src"), py::arg("dst")); + m.def("_pixel_count_map", &cle::tier4::pixel_count_map_func, "Call cle::tier4::pixel_count_map_func from C++ CLIc.", + py::return_value_policy::take_ownership, + py::arg("device"), py::arg("src"), py::arg("dst")); + m.def("_label_pixel_count_map", &cle::tier4::label_pixel_count_map_func, "Call cle::tier4::label_pixel_count_map_func from C++ CLIc.", py::return_value_policy::take_ownership, py::arg("device"), py::arg("src"), py::arg("dst")); @@ -34,19 +38,19 @@ m.def("_label_bounding_box", &cle::tier4::label_bounding_box_func, "Call cle::ti py::return_value_policy::take_ownership, py::arg("device"), py::arg("src"), py::arg("dst"), py::arg("withBG")); - m.def("_remove_labels_with_values_out_of_range", &cle::tier4::remove_labels_with_values_out_of_range_func, "Call cle::tier4::remove_labels_with_values_out_of_range_func from C++ CLIc.", + m.def("_remove_labels_with_map_values_out_of_range", &cle::tier4::remove_labels_with_map_values_out_of_range_func, "Call cle::tier4::remove_labels_with_map_values_out_of_range_func from C++ CLIc.", py::return_value_policy::take_ownership, py::arg("device"), py::arg("src"), py::arg("values"), py::arg("dst"), py::arg("min_value"), py::arg("max_value")); - m.def("_remove_labels_with_values_within_range", &cle::tier4::remove_labels_with_values_within_range_func, "Call cle::tier4::remove_labels_with_values_within_range_func from C++ CLIc.", + m.def("_remove_labels_with_map_values_within_range", &cle::tier4::remove_labels_with_map_values_within_range_func, "Call cle::tier4::remove_labels_with_map_values_within_range_func from C++ CLIc.", py::return_value_policy::take_ownership, py::arg("device"), py::arg("src"), py::arg("values"), py::arg("dst"), py::arg("min_value"), py::arg("max_value")); - m.def("_exclude_labels_with_values_out_of_range", &cle::tier4::exclude_labels_with_values_out_of_range_func, "Call cle::tier4::exclude_labels_with_values_out_of_range_func from C++ CLIc.", + m.def("_exclude_labels_with_map_values_out_of_range", &cle::tier4::exclude_labels_with_map_values_out_of_range_func, "Call cle::tier4::exclude_labels_with_map_values_out_of_range_func from C++ CLIc.", py::return_value_policy::take_ownership, py::arg("device"), py::arg("src"), py::arg("values"), py::arg("dst"), py::arg("min_value_range"), py::arg("max_value_range")); - m.def("_exclude_labels_with_values_within_range", &cle::tier4::exclude_labels_with_values_within_range_func, "Call cle::tier4::exclude_labels_with_values_within_range_func from C++ CLIc.", + m.def("_exclude_labels_with_map_values_within_range", &cle::tier4::exclude_labels_with_map_values_within_range_func, "Call cle::tier4::exclude_labels_with_map_values_within_range_func from C++ CLIc.", py::return_value_policy::take_ownership, py::arg("device"), py::arg("src"), py::arg("values"), py::arg("dst"), py::arg("min_value_range"), py::arg("max_value_range")); From 52097f5d222231ed4bd99552f02d9956639f8cc9 Mon Sep 17 00:00:00 2001 From: Stephane Rigaud Date: Sun, 29 Sep 2024 18:17:45 +0300 Subject: [PATCH 2/2] bump version to 0.13.3 --- pyclesperanto/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyclesperanto/_version.py b/pyclesperanto/_version.py index 15a6eb07..79d130db 100644 --- a/pyclesperanto/_version.py +++ b/pyclesperanto/_version.py @@ -1,3 +1,3 @@ -VERSION = "0.13.1" +VERSION = "0.13.3" CLIC_VERSION = "0.13.3" COMMON_ALIAS = "cle"