Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

change dim=-1 to dim=1 in bounding_box.py for the purpose of tracing using jit #1022

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
f93b369
make pixel indexes 0-based for bounding box in pascal voc dataset
zimenglan-sysu-512 Nov 25, 2018
45e4ba8
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Nov 29, 2018
86caae2
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Dec 5, 2018
a46bfb9
replacing all instances of torch.distributed.deprecated with torch.di…
zimenglan-sysu-512 Dec 5, 2018
7bbf46f
replacing all instances of torch.distributed.deprecated with torch.di…
zimenglan-sysu-512 Dec 5, 2018
7c8cf41
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Dec 6, 2018
07a0f9c
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Dec 26, 2018
6f09a6f
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Jan 11, 2019
c4e3245
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Jan 15, 2019
baba31f
add GroupNorm
zimenglan-sysu-512 Jan 15, 2019
4877e36
add GroupNorm -- sort out yaml files
zimenglan-sysu-512 Jan 16, 2019
d4ae039
use torch.nn.GroupNorm instead, replace 'use_gn' with 'conv_block' an…
zimenglan-sysu-512 Jan 18, 2019
333864d
modification on 'group_norm' and 'conv_with_kaiming_uniform' function
zimenglan-sysu-512 Jan 18, 2019
58da4d5
modification on yaml files in configs/gn_baselines/ and reduce the am…
zimenglan-sysu-512 Jan 21, 2019
1798e63
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Jan 21, 2019
ecc68c4
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Jan 22, 2019
02a86f3
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Jan 23, 2019
9808a21
use 'kaiming_uniform' to initialize resnet, disable gn after fc layer…
zimenglan-sysu-512 Jan 23, 2019
d1ce06e
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Jan 28, 2019
4de3488
agnostic-regression for bbox
zimenglan-sysu-512 Jan 28, 2019
52be8d7
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Feb 1, 2019
288e16f
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Feb 5, 2019
d91ff2d
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Feb 10, 2019
d177092
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Feb 15, 2019
a52e159
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Feb 15, 2019
f7ad55e
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Feb 19, 2019
483fca8
please set 'STRIDE_IN_1X1' to be 'False' when backbone use GN
zimenglan-sysu-512 Feb 19, 2019
f5786e9
merge from upstream/master
zimenglan-sysu-512 Feb 25, 2019
d2d55f9
add README.md for GN
zimenglan-sysu-512 Feb 26, 2019
fc08cdd
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Mar 6, 2019
db01edb
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Apr 1, 2019
ca7276d
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Apr 18, 2019
eee83fc
add dcn from mmdetection
zimenglan-sysu-512 Apr 19, 2019
1ff6d5b
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Apr 20, 2019
99fc0f3
add documentation for finetuning cityscapes
zimenglan-sysu-512 Apr 20, 2019
fbf3733
add documentation for finetuning cityscapes
zimenglan-sysu-512 Apr 20, 2019
4765e21
add documentation for finetuning cityscapes
zimenglan-sysu-512 Apr 20, 2019
116c360
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Apr 20, 2019
0b12fdb
add 'once_differentiable' for dcn and modify 'configs/cityscapes/READ…
zimenglan-sysu-512 Apr 20, 2019
0dbe61a
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Apr 21, 2019
4147af5
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Apr 25, 2019
1bf6bdc
rectify the 'padding' for 'DFConv2d'
zimenglan-sysu-512 Apr 25, 2019
28aff71
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 May 25, 2019
4d0a527
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Jun 6, 2019
977b36a
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Jun 19, 2019
afb3303
Merge remote-tracking branch 'upstream/master'
zimenglan-sysu-512 Aug 6, 2019
106b94a
change dim=-1 to dim=1 in bounding_box.py for the purpose of tracing …
zimenglan-sysu-512 Aug 6, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions maskrcnn_benchmark/structures/bounding_box.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,24 @@ def convert(self, mode):
# self.mode
xmin, ymin, xmax, ymax = self._split_into_xyxy()
if mode == "xyxy":
bbox = torch.cat((xmin, ymin, xmax, ymax), dim=-1)
bbox = torch.cat((xmin, ymin, xmax, ymax), dim=1)
bbox = BoxList(bbox, self.size, mode=mode)
else:
TO_REMOVE = 1
bbox = torch.cat(
(xmin, ymin, xmax - xmin + TO_REMOVE, ymax - ymin + TO_REMOVE), dim=-1
(xmin, ymin, xmax - xmin + TO_REMOVE, ymax - ymin + TO_REMOVE), dim=1
)
bbox = BoxList(bbox, self.size, mode=mode)
bbox._copy_extra_fields(self)
return bbox

def _split_into_xyxy(self):
if self.mode == "xyxy":
xmin, ymin, xmax, ymax = self.bbox.split(1, dim=-1)
xmin, ymin, xmax, ymax = self.bbox.split(1, dim=1)
return xmin, ymin, xmax, ymax
elif self.mode == "xywh":
TO_REMOVE = 1
xmin, ymin, w, h = self.bbox.split(1, dim=-1)
xmin, ymin, w, h = self.bbox.split(1, dim=1)
return (
xmin,
ymin,
Expand Down Expand Up @@ -115,7 +115,7 @@ def resize(self, size, *args, **kwargs):
scaled_ymin = ymin * ratio_height
scaled_ymax = ymax * ratio_height
scaled_box = torch.cat(
(scaled_xmin, scaled_ymin, scaled_xmax, scaled_ymax), dim=-1
(scaled_xmin, scaled_ymin, scaled_xmax, scaled_ymax), dim=1
)
bbox = BoxList(scaled_box, size, mode="xyxy")
# bbox._copy_extra_fields(self)
Expand Down Expand Up @@ -154,7 +154,7 @@ def transpose(self, method):
transposed_ymax = image_height - ymin

transposed_boxes = torch.cat(
(transposed_xmin, transposed_ymin, transposed_xmax, transposed_ymax), dim=-1
(transposed_xmin, transposed_ymin, transposed_xmax, transposed_ymax), dim=1
)
bbox = BoxList(transposed_boxes, self.size, mode="xyxy")
# bbox._copy_extra_fields(self)
Expand Down Expand Up @@ -182,7 +182,7 @@ def crop(self, box):
is_empty = (cropped_xmin == cropped_xmax) | (cropped_ymin == cropped_ymax)

cropped_box = torch.cat(
(cropped_xmin, cropped_ymin, cropped_xmax, cropped_ymax), dim=-1
(cropped_xmin, cropped_ymin, cropped_xmax, cropped_ymax), dim=1
)
bbox = BoxList(cropped_box, (w, h), mode="xyxy")
# bbox._copy_extra_fields(self)
Expand Down