-
Notifications
You must be signed in to change notification settings - Fork 7k
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
Add rotated bounding box formats #8841
Conversation
Test Plan: Run unit tests: `pytest test/test_ops.py -vvv -k TestBoxConvert`
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/vision/8841
Note: Links to docs will display an error until the docs builds have been completed. ❌ 5 New Failures, 4 PendingAs of commit 4001973 with merge base f709766 ( NEW FAILURES - The following jobs have failed:
This comment was automatically generated by Dr. CI and updates every 15 minutes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot for the PR @AntoineSimoulin ! I made some small comments below, I have higher-level points to discuss, let's sync! :)
@@ -17,15 +17,25 @@ class BoundingBoxFormat(Enum): | |||
* ``XYXY`` | |||
* ``XYWH`` | |||
* ``CXCYWH`` | |||
* ``XYXYR``: rotated boxes represented via corners, x1, y1 being top left and x2, y2 being bottom right. r is rotation angle in degrees. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to make it more explicit
* ``XYXYR``: rotated boxes represented via corners, x1, y1 being top left and x2, y2 being bottom right. r is rotation angle in degrees. | |
* ``XYXYR``: rotated boxes represented via corners, x1, y1 being top left and x2, y2 being bottom right. r is rotation angle in degrees in [0, 360). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this case the rotation angle do not necessarily have to be in the [0, 360). The format would work for negative rotations angle or even angles beyond 360 degrees.
test/test_ops.py
Outdated
@@ -1288,6 +1288,38 @@ def test_bbox_same(self): | |||
assert_equal(ops.box_convert(box_tensor, in_fmt="xywh", out_fmt="xywh"), exp_xyxy) | |||
assert_equal(ops.box_convert(box_tensor, in_fmt="cxcywh", out_fmt="cxcywh"), exp_xyxy) | |||
|
|||
def test_rotated_bbox_same(self): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this kind of check is already taken care of in
vision/test/test_transforms_v2.py
Lines 3521 to 3531 in 06a925c
@pytest.mark.parametrize("format", list(tv_tensors.BoundingBoxFormat)) | |
@pytest.mark.parametrize("inplace", [False, True]) | |
def test_kernel_noop(self, format, inplace): | |
input = make_bounding_boxes(format=format).as_subclass(torch.Tensor) | |
input_version = input._version | |
output = F.convert_bounding_box_format(input, old_format=format, new_format=format, inplace=inplace) | |
assert output is input | |
assert output.data_ptr() == input.data_ptr() | |
assert output._version == input_version |
test/test_ops.py
Outdated
|
||
assert exp_xywhr.size() == torch.Size([6, 5]) | ||
box_xywhr = ops.box_convert(box_tensor, in_fmt="xyxyr", out_fmt="xywhr") | ||
assert torch.allclose(box_xywhr, exp_xywhr) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's use torch.testing.assert_close()
instead of torch.allclose
, as it's more robust and provides better messages.
That being said, could we use assert_equal()
here, since we're expecting integer-valued tensors? Is it because of the r
column?
Co-authored-by: Nicolas Hug <contact@nicolas-hug.com>
Test Plan: `pytest test/test_transforms_v2.py -vvv -k "TestConvertBoundingBoxFormat"`
Summary: Remove `test_rotated_bbox_same` test
ModificationsThe following commits address the modifications discussed offline:
TestingPlease execute the following unit tests to verify the modifications: pytest test/test_ops.py -vvv -k TestBoxConvert
pytest test/test_transforms_v2.py -vvv -k "TestConvertBoundingBoxFormat" Notes
|
Summary: Fix failing tests for `TestConvertBoundingBoxFormat::test_correctness` and `TestConvertBoundingBoxFormat::test_strings` Test Plan: ```bash pytest test/test_transforms_v2.py -vvv -k "TestConvertBoundingBoxFormat" ... 87 passed, 32 skipped, 6964 deselected in 1.59s ``` Please note that the following tests `test/test_transforms_v2.py::TestConvertBoundingBoxFormat::test_correctness` were failing for previous format "CXCYWH", "XYXY" and "XYWH" for specific generated boxes. ```python old_format = tv_tensors.BoundingBoxFormat.CXCYWH new_format = tv_tensors.BoundingBoxFormat.XYXY dtype = torch.int64 fn_type = "functional" device = torch.device("cpu") # bounding_boxes = make_bounding_boxes(format=old_format, dtype=dtype, device=device) bounding_boxes = tv_tensors.BoundingBoxes([[ 5, 6, 10, 13]], format=tv_tensors.BoundingBoxFormat.CXCYWH, canvas_size=(17, 11)) if fn_type == "functional": fn = functools.partial(F.convert_bounding_box_format, new_format=new_format) else: fn = transforms.ConvertBoundingBoxFormat(format=new_format) actual = fn(bounding_boxes) expected = _reference_convert_bounding_box_format(bounding_boxes, new_format) assert_equal(actual, expected) ```
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the great PR @AntoineSimoulin .
I made some comments below, the main one relates to exposing XYXYXYXY in the transforms. Other than that, this looks great.
The CI shows a bunch of failing tests, but they're unrelated to this PR (I need to fix those separately....). We'll only care about the transforms_v2.py
and test_ops.py
tests.
The lint
failure is real though: try using pre-commit
to fix the formatting (https://github.com/pytorch/vision/blob/main/CONTRIBUTING.md#pre-commit-hooks)
You should only need to pip install pre-commit
and then run pre-commit run --all-files
old_new_formats = list(itertools.permutations(SUPPORTED_BOX_FORMATS, 2)) | ||
old_new_formats += list(itertools.permutations(NEW_BOX_FORMATS, 2)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that eventually, we'll want this to become old_new_formats = list(itertools.permutations(SUPPORTED_BOX_FORMATS + NEW_BOX_FORMATS, 2))
i.e. we'll probably also want to enable the kinf of rotated format <--> non-rotated format
conversions. But this can come later and for this PR, we can keep things as-is.
test/test_transforms_v2.py
Outdated
old_new_formats = list(itertools.permutations(iter(tv_tensors.BoundingBoxFormat), 2)) | ||
old_new_formats = list(itertools.permutations(SUPPORTED_BOX_FORMATS, 2)) | ||
old_new_formats += list(itertools.permutations(NEW_BOX_FORMATS, 2)) | ||
# old_new_formats = list(itertools.permutations(NEW_BOX_FORMATS, 2)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: remove this line
test/test_transforms_v2.py
Outdated
# In the future, this global variable will be replaced with `list(tv_tensors.BoundingBoxFormat)` | ||
# to support all available formats. | ||
SUPPORTED_BOX_FORMATS = [tv_tensors.BoundingBoxFormat[x] for x in ["XYXY", "XYWH", "CXCYWH"]] | ||
NEW_BOX_FORMATS = [tv_tensors.BoundingBoxFormat[x] for x in ["XYWHR", "CXCYWHR"]] # XYXYR |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's try to add XYXYXYXY
as well here (see my other comment)
torchvision/ops/boxes.py
Outdated
boxes (Tensor[N, 4]): boxes which will be converted. | ||
in_fmt (str): Input format of given boxes. Supported formats are ['xyxy', 'xywh', 'cxcywh']. | ||
out_fmt (str): Output format of given boxes. Supported formats are ['xyxy', 'xywh', 'cxcywh'] | ||
boxes (Tensor[N, K]): boxes which will be converted. K is the number of coordinates (4 for unrotated bounding boxes or 5 for rotated bounding boxes) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can be 8 too
Summary: Run `pre-commit run --all-files` to fix linting issues
ModificationsThe following commits address the modifications discussed offline:
TestingPlease execute the following unit tests to verify the modifications: pytest test/test_ops.py -vvv -k TestBoxConvert
pytest test/test_transforms_v2.py -vvv -k "TestConvertBoundingBoxFormat" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot @AntoineSimoulin . I just have a minor comment below, but we can address that in a follow-up PR.
I'll merge this when the CI is green(ish)!
elif new_format == BoundingBoxFormat.CXCYWHR: | ||
bounding_boxes = _xywhr_to_cxcywhr(bounding_boxes, inplace) | ||
elif new_format == BoundingBoxFormat.XYXYXYXY: | ||
bounding_boxes = _xywhr_to_xyxyxyxy(bounding_boxes, inplace) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that the existing conversion logic is such that converting a non-rotated format to a rotated format would effectively be a no-op (and vice-versa). For example:
from torchvision.tv_tensors import BoundingBoxes
from torchvision.transforms.v2 import functional as F
bboxes = BoundingBoxes(
[[0, 0, 10, 10]],
format="XYXY",
canvas_size=(50, 50)
)
out = F.convert_bounding_box_format(bboxes, new_format="XYWHR")
print(out)
This gives
BoundingBoxes([[ 0, 0, 10, 10]], format=BoundingBoxFormat.XYWHR, canvas_size=(50, 50))
which is obviously wrong. I think we should just raise an error when converting non-rorated formats to rotated formats (and the other way around too).
Note that in box_convert
, the main logic is slightly different, so this is handled natively.
Hey @NicolasHug! You merged this PR, but no labels were added. |
This PR is part of a series of contributions aiming to add rotated boxes to torchvision. This first contribution aims at modifying the definition of bounding boxes in torchvision. We operate the two following modifications:
Extend
BoundingBoxFormat
for rotated boxesWe add four multiple allowed formats in
BoundingBoxFormat
. The formats "xyxyr", "xywhr", "cxcywhr" simply extend the non-rotated counterparts by adding a 5th coordinate to the bounding box,r
, the rotation angle with respect to the box center by|r|
degrees counter clock wise in the image plan. The last format "xyxyxyxy" represents a box with 4 corners.Potential limitations:
BoundingBoxes
instead of creating a newRoratedBoundingBoxes
class. The reason is to simplify the possible input types for transforms and avoid having two different paths for transformations. For instance keeping a singlehorizontal_flip_bounding_boxes
and_horizontal_flip_bounding_boxes_dispatch
instead of creating a new functionhorizontal_flip_rotated_bounding_boxes
;generalized_box_iou_loss
. However, please note these functions do not expect aBoundingBox
as input, but atorch.Tensor[N, 4]
ortorch.Tensor[4]
. So there is no direct incompatibility.Add conversion functions for rotated boxes
We add 10 pairwise conversion functions in "_box_convert.py" to allow converting rotated bounding boxes between all four new formats. We also modified the logic in
box_convert
to support all possible conversion directions.Potential limitations:
Testing
Please run unit tests for the modifications with:
pytest test/test_ops.py -vvv -k TestBoxConvert
Next steps
Next modifications will aim at updating transforms functions (e.g.
horizontal_flip_bounding_boxes
), and adding utility functions specific to rotated boxes (e.g.rotated_box_area
,_rotated_box_inter_union
,rotated_box_iou
).cc @vfdev-5