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
ModelZoo
SOLOv2-pytorch
Commits
4fcdf6e9
Commit
4fcdf6e9
authored
Dec 10, 2018
by
yhcao6
Browse files
rename reduction of loss
parent
092b97f6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
mmdet/core/bbox/samplers/ohem_sampler.py
mmdet/core/bbox/samplers/ohem_sampler.py
+2
-2
mmdet/core/loss/losses.py
mmdet/core/loss/losses.py
+3
-3
mmdet/models/bbox_heads/bbox_head.py
mmdet/models/bbox_heads/bbox_head.py
+1
-1
No files found.
mmdet/core/bbox/samplers/ohem_sampler.py
View file @
4fcdf6e9
...
@@ -42,7 +42,7 @@ class OHEMSampler(BaseSampler):
...
@@ -42,7 +42,7 @@ class OHEMSampler(BaseSampler):
label_weights
=
cls_score
.
new_ones
(
cls_score
.
size
(
0
)),
label_weights
=
cls_score
.
new_ones
(
cls_score
.
size
(
0
)),
bbox_targets
=
None
,
bbox_targets
=
None
,
bbox_weights
=
None
,
bbox_weights
=
None
,
reduction
=
'none'
)[
'loss_cls'
]
reduction
=
False
)[
'loss_cls'
]
_
,
topk_loss_pos_inds
=
loss_pos
.
topk
(
num_expected
)
_
,
topk_loss_pos_inds
=
loss_pos
.
topk
(
num_expected
)
return
pos_inds
[
topk_loss_pos_inds
]
return
pos_inds
[
topk_loss_pos_inds
]
...
@@ -67,6 +67,6 @@ class OHEMSampler(BaseSampler):
...
@@ -67,6 +67,6 @@ class OHEMSampler(BaseSampler):
label_weights
=
cls_score
.
new_ones
(
cls_score
.
size
(
0
)),
label_weights
=
cls_score
.
new_ones
(
cls_score
.
size
(
0
)),
bbox_targets
=
None
,
bbox_targets
=
None
,
bbox_weights
=
None
,
bbox_weights
=
None
,
reduction
=
'none'
)[
'loss_cls'
]
reduction
=
False
)[
'loss_cls'
]
_
,
topk_loss_neg_inds
=
loss_neg
.
topk
(
num_expected
)
_
,
topk_loss_neg_inds
=
loss_neg
.
topk
(
num_expected
)
return
neg_inds
[
topk_loss_neg_inds
]
return
neg_inds
[
topk_loss_neg_inds
]
mmdet/core/loss/losses.py
View file @
4fcdf6e9
...
@@ -11,13 +11,13 @@ def weighted_nll_loss(pred, label, weight, avg_factor=None):
...
@@ -11,13 +11,13 @@ def weighted_nll_loss(pred, label, weight, avg_factor=None):
def
weighted_cross_entropy
(
pred
,
label
,
weight
,
avg_factor
=
None
,
def
weighted_cross_entropy
(
pred
,
label
,
weight
,
avg_factor
=
None
,
reduction
=
'elementwise_sum'
):
reduction
=
True
):
if
avg_factor
is
None
:
if
avg_factor
is
None
:
avg_factor
=
max
(
torch
.
sum
(
weight
>
0
).
float
().
item
(),
1.
)
avg_factor
=
max
(
torch
.
sum
(
weight
>
0
).
float
().
item
(),
1.
)
raw
=
F
.
cross_entropy
(
pred
,
label
,
reduction
=
'none'
)
raw
=
F
.
cross_entropy
(
pred
,
label
,
reduction
=
'none'
)
if
reduction
==
'elementwise_sum'
:
if
reduction
:
return
torch
.
sum
(
raw
*
weight
)[
None
]
/
avg_factor
return
torch
.
sum
(
raw
*
weight
)[
None
]
/
avg_factor
el
if
reduction
==
'none'
:
el
se
:
return
raw
*
weight
/
avg_factor
return
raw
*
weight
/
avg_factor
...
...
mmdet/models/bbox_heads/bbox_head.py
View file @
4fcdf6e9
...
@@ -79,7 +79,7 @@ class BBoxHead(nn.Module):
...
@@ -79,7 +79,7 @@ class BBoxHead(nn.Module):
return
cls_reg_targets
return
cls_reg_targets
def
loss
(
self
,
cls_score
,
bbox_pred
,
labels
,
label_weights
,
bbox_targets
,
def
loss
(
self
,
cls_score
,
bbox_pred
,
labels
,
label_weights
,
bbox_targets
,
bbox_weights
,
reduction
=
'elementwise_sum'
):
bbox_weights
,
reduction
=
True
):
losses
=
dict
()
losses
=
dict
()
if
cls_score
is
not
None
:
if
cls_score
is
not
None
:
losses
[
'loss_cls'
]
=
weighted_cross_entropy
(
losses
[
'loss_cls'
]
=
weighted_cross_entropy
(
...
...
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