Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
transformers
Commits
ca2ef7df
Unverified
Commit
ca2ef7df
authored
Oct 22, 2021
by
Deepanshu verma
Committed by
GitHub
Oct 21, 2021
Browse files
Changed asserts to ValueError (#14091)
parent
7888914e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
17 deletions
+16
-17
src/transformers/models/detr/feature_extraction_detr.py
src/transformers/models/detr/feature_extraction_detr.py
+16
-17
No files found.
src/transformers/models/detr/feature_extraction_detr.py
View file @
ca2ef7df
...
@@ -511,7 +511,8 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
...
@@ -511,7 +511,8 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
valid_annotations
=
True
valid_annotations
=
True
else
:
else
:
if
isinstance
(
annotations
,
(
list
,
tuple
)):
if
isinstance
(
annotations
,
(
list
,
tuple
)):
assert
len
(
images
)
==
len
(
annotations
),
"There must be as many annotations as there are images"
if
len
(
images
)
!=
len
(
annotations
):
raise
ValueError
(
"There must be as many annotations as there are images"
)
if
isinstance
(
annotations
[
0
],
Dict
):
if
isinstance
(
annotations
[
0
],
Dict
):
if
self
.
format
==
"coco_detection"
:
if
self
.
format
==
"coco_detection"
:
if
isinstance
(
annotations
[
0
][
"annotations"
],
(
list
,
tuple
)):
if
isinstance
(
annotations
[
0
][
"annotations"
],
(
list
,
tuple
)):
...
@@ -692,12 +693,10 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
...
@@ -692,12 +693,10 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
"""
"""
out_logits
,
out_bbox
=
outputs
.
logits
,
outputs
.
pred_boxes
out_logits
,
out_bbox
=
outputs
.
logits
,
outputs
.
pred_boxes
assert
len
(
out_logits
)
==
len
(
if
len
(
out_logits
)
!=
len
(
target_sizes
):
target_sizes
raise
ValueError
(
"Make sure that you pass in as many target sizes as the batch dimension of the logits"
)
),
"Make sure that you pass in as many target sizes as the batch dimension of the logits"
if
target_sizes
.
shape
[
1
]
!=
2
:
assert
(
raise
ValueError
(
"Each element of target_sizes must contain the size (h, w) of each image of the batch"
)
target_sizes
.
shape
[
1
]
==
2
),
"Each element of target_sizes must contain the size (h, w) of each image of the batch"
prob
=
nn
.
functional
.
softmax
(
out_logits
,
-
1
)
prob
=
nn
.
functional
.
softmax
(
out_logits
,
-
1
)
scores
,
labels
=
prob
[...,
:
-
1
].
max
(
-
1
)
scores
,
labels
=
prob
[...,
:
-
1
].
max
(
-
1
)
...
@@ -781,9 +780,8 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
...
@@ -781,9 +780,8 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
for an image in the batch as predicted by the model.
for an image in the batch as predicted by the model.
"""
"""
assert
len
(
orig_target_sizes
)
==
len
(
if
len
(
orig_target_sizes
)
!=
len
(
max_target_sizes
):
max_target_sizes
raise
ValueError
(
"Make sure to pass in as many orig_target_sizes as max_target_sizes"
)
),
"Make sure to pass in as many orig_target_sizes as max_target_sizes"
max_h
,
max_w
=
max_target_sizes
.
max
(
0
)[
0
].
tolist
()
max_h
,
max_w
=
max_target_sizes
.
max
(
0
)[
0
].
tolist
()
outputs_masks
=
outputs
.
pred_masks
.
squeeze
(
2
)
outputs_masks
=
outputs
.
pred_masks
.
squeeze
(
2
)
outputs_masks
=
nn
.
functional
.
interpolate
(
outputs_masks
=
nn
.
functional
.
interpolate
(
...
@@ -827,18 +825,18 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
...
@@ -827,18 +825,18 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
"""
"""
if
target_sizes
is
None
:
if
target_sizes
is
None
:
target_sizes
=
processed_sizes
target_sizes
=
processed_sizes
assert
len
(
processed_sizes
)
==
len
(
if
len
(
processed_sizes
)
!=
len
(
target_sizes
):
target_sizes
raise
ValueError
(
"Make sure to pass in as many processed_sizes as target_sizes"
)
),
"Make sure to pass in as many processed_sizes as target_sizes"
if
is_thing_map
is
None
:
if
is_thing_map
is
None
:
# default to is_thing_map of COCO panoptic
# default to is_thing_map of COCO panoptic
is_thing_map
=
{
i
:
i
<=
90
for
i
in
range
(
201
)}
is_thing_map
=
{
i
:
i
<=
90
for
i
in
range
(
201
)}
out_logits
,
raw_masks
,
raw_boxes
=
outputs
.
logits
,
outputs
.
pred_masks
,
outputs
.
pred_boxes
out_logits
,
raw_masks
,
raw_boxes
=
outputs
.
logits
,
outputs
.
pred_masks
,
outputs
.
pred_boxes
assert
(
if
not
len
(
out_logits
)
==
len
(
raw_masks
)
==
len
(
target_sizes
):
len
(
out_logits
)
==
len
(
raw_masks
)
==
len
(
target_sizes
)
raise
ValueError
(
),
"Make sure that you pass in as many target sizes as the batch dimension of the logits and masks"
"Make sure that you pass in as many target sizes as the batch dimension of the logits and masks"
)
preds
=
[]
preds
=
[]
def
to_tuple
(
tup
):
def
to_tuple
(
tup
):
...
@@ -860,7 +858,8 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
...
@@ -860,7 +858,8 @@ class DetrFeatureExtractor(FeatureExtractionMixin, ImageFeatureExtractionMixin):
cur_boxes
=
center_to_corners_format
(
cur_boxes
[
keep
])
cur_boxes
=
center_to_corners_format
(
cur_boxes
[
keep
])
h
,
w
=
cur_masks
.
shape
[
-
2
:]
h
,
w
=
cur_masks
.
shape
[
-
2
:]
assert
len
(
cur_boxes
)
==
len
(
cur_classes
),
"Not as many boxes as there are classes"
if
len
(
cur_boxes
)
!=
len
(
cur_classes
):
raise
ValueError
(
"Not as many boxes as there are classes"
)
# It may be that we have several predicted masks for the same stuff class.
# It may be that we have several predicted masks for the same stuff class.
# In the following, we track the list of masks ids for each stuff class (they are merged later on)
# In the following, we track the list of masks ids for each stuff class (they are merged later on)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment