From 932807888ca0155e0b36f686f443736346a49239 Mon Sep 17 00:00:00 2001 From: Guillaume Bertrand Date: Mon, 27 May 2024 21:51:36 +0200 Subject: [PATCH 1/2] chore: release 0.2.3 --- bindings/Cargo.lock | 2 +- bindings/pyproject.toml | 2 +- bindings/python/powerboxes/__init__.py | 2 +- bindings/tests/test_speed.py | 1 + powerboxesrs/Cargo.lock | 2 +- powerboxesrs/Cargo.toml | 2 +- powerboxesrs/src/lib.rs | 2 +- powerboxesrs/src/nms.rs | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bindings/Cargo.lock b/bindings/Cargo.lock index 50ee4c7..29c6538 100644 --- a/bindings/Cargo.lock +++ b/bindings/Cargo.lock @@ -255,7 +255,7 @@ dependencies = [ [[package]] name = "powerboxesrs" -version = "0.2.2" +version = "0.2.3" dependencies = [ "ndarray", "num-traits", diff --git a/bindings/pyproject.toml b/bindings/pyproject.toml index 98de5eb..1784831 100644 --- a/bindings/pyproject.toml +++ b/bindings/pyproject.toml @@ -28,7 +28,7 @@ description = "Utility functions to manipulate and compute metrics on boxes" homepage = "https://smirkey.github.io/powerboxes/" documentation = "https://smirkey.github.io/powerboxes/" repository = "https://github.com/Smirkey/powerboxes" -version = "0.2.2" +version = "0.2.3" dependencies = ["numpy"] [tool.maturin] diff --git a/bindings/python/powerboxes/__init__.py b/bindings/python/powerboxes/__init__.py index f9d0e74..db94955 100644 --- a/bindings/python/powerboxes/__init__.py +++ b/bindings/python/powerboxes/__init__.py @@ -37,7 +37,7 @@ "uint32", "uint64", ] -__version__ = "0.2.2" +__version__ = "0.2.3" T = TypeVar( "T", diff --git a/bindings/tests/test_speed.py b/bindings/tests/test_speed.py index 68b7ebe..13084d8 100644 --- a/bindings/tests/test_speed.py +++ b/bindings/tests/test_speed.py @@ -180,6 +180,7 @@ def test_nms(benchmark, dtype, generate_boxes): def test_rtree_nms(benchmark, dtype, generate_boxes): boxes = generate_boxes boxes = boxes.astype(dtype) + print(dtype) benchmark(rtree_nms, boxes, SCORES, 0.5, 0.5) diff --git a/powerboxesrs/Cargo.lock b/powerboxesrs/Cargo.lock index 3714180..6184f24 100644 --- a/powerboxesrs/Cargo.lock +++ b/powerboxesrs/Cargo.lock @@ -463,7 +463,7 @@ dependencies = [ [[package]] name = "powerboxesrs" -version = "0.2.2" +version = "0.2.3" dependencies = [ "codspeed-criterion-compat", "criterion", diff --git a/powerboxesrs/Cargo.toml b/powerboxesrs/Cargo.toml index 221534e..818eb2f 100644 --- a/powerboxesrs/Cargo.toml +++ b/powerboxesrs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "powerboxesrs" -version = "0.2.2" +version = "0.2.3" edition = "2021" license = "MIT" readme = "README.md" diff --git a/powerboxesrs/src/lib.rs b/powerboxesrs/src/lib.rs index 199b457..6f697a2 100644 --- a/powerboxesrs/src/lib.rs +++ b/powerboxesrs/src/lib.rs @@ -11,7 +11,7 @@ //! //! ```toml //! [dependencies] -//! powerboxesrs = "0.2.2" +//! powerboxesrs = "0.2.3" //! ``` //! //! ## Usage diff --git a/powerboxesrs/src/nms.rs b/powerboxesrs/src/nms.rs index 93dbdde..b19327a 100644 --- a/powerboxesrs/src/nms.rs +++ b/powerboxesrs/src/nms.rs @@ -83,7 +83,7 @@ where if y2 > y1 && x2 > x1 { let intersection = (x2 - x1) * (y2 - y1); let intersection = intersection.to_f64().unwrap(); - let intersection = f64::min(intersection, f64::min(area1, area2)); + let intersection = utils::min(intersection, utils::min(area1, area2)); iou = intersection / (area1 + area2 - intersection + utils::EPS); } if iou > iou_threshold { From a5acd4782c964d05ad4424ca6c1a1d8c6184fa18 Mon Sep 17 00:00:00 2001 From: Guillaume Bertrand Date: Mon, 27 May 2024 21:52:17 +0200 Subject: [PATCH 2/2] rm print --- bindings/tests/test_speed.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bindings/tests/test_speed.py b/bindings/tests/test_speed.py index 13084d8..68b7ebe 100644 --- a/bindings/tests/test_speed.py +++ b/bindings/tests/test_speed.py @@ -180,7 +180,6 @@ def test_nms(benchmark, dtype, generate_boxes): def test_rtree_nms(benchmark, dtype, generate_boxes): boxes = generate_boxes boxes = boxes.astype(dtype) - print(dtype) benchmark(rtree_nms, boxes, SCORES, 0.5, 0.5)