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
wangsen
paddle_dbnet
Commits
b78eeb24
Unverified
Commit
b78eeb24
authored
Jan 26, 2021
by
Double_V
Committed by
GitHub
Jan 26, 2021
Browse files
Merge pull request #1831 from LDOUBLEV/trt_cpp
fix typo
parents
9982550a
09fd94e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
15 deletions
+15
-15
tools/program.py
tools/program.py
+15
-15
No files found.
tools/program.py
View file @
b78eeb24
...
@@ -212,7 +212,7 @@ def train(config,
...
@@ -212,7 +212,7 @@ def train(config,
stats
[
'lr'
]
=
lr
stats
[
'lr'
]
=
lr
train_stats
.
update
(
stats
)
train_stats
.
update
(
stats
)
if
cal_metric_during_train
:
# onl
t
rec and cls need
if
cal_metric_during_train
:
# onl
y
rec and cls need
batch
=
[
item
.
numpy
()
for
item
in
batch
]
batch
=
[
item
.
numpy
()
for
item
in
batch
]
post_result
=
post_process_class
(
preds
,
batch
[
1
])
post_result
=
post_process_class
(
preds
,
batch
[
1
])
eval_class
(
post_result
,
batch
)
eval_class
(
post_result
,
batch
)
...
@@ -238,21 +238,21 @@ def train(config,
...
@@ -238,21 +238,21 @@ def train(config,
# eval
# eval
if
global_step
>
start_eval_step
and
\
if
global_step
>
start_eval_step
and
\
(
global_step
-
start_eval_step
)
%
eval_batch_step
==
0
and
dist
.
get_rank
()
==
0
:
(
global_step
-
start_eval_step
)
%
eval_batch_step
==
0
and
dist
.
get_rank
()
==
0
:
cur_met
i
rc
=
eval
(
model
,
valid_dataloader
,
post_process_class
,
cur_metr
i
c
=
eval
(
model
,
valid_dataloader
,
post_process_class
,
eval_class
)
eval_class
)
cur_met
i
rc_str
=
'cur met
i
rc, {}'
.
format
(
', '
.
join
(
cur_metr
i
c_str
=
'cur metr
i
c, {}'
.
format
(
', '
.
join
(
[
'{}: {}'
.
format
(
k
,
v
)
for
k
,
v
in
cur_met
i
rc
.
items
()]))
[
'{}: {}'
.
format
(
k
,
v
)
for
k
,
v
in
cur_metr
i
c
.
items
()]))
logger
.
info
(
cur_met
i
rc_str
)
logger
.
info
(
cur_metr
i
c_str
)
# logger metric
# logger metric
if
vdl_writer
is
not
None
:
if
vdl_writer
is
not
None
:
for
k
,
v
in
cur_met
i
rc
.
items
():
for
k
,
v
in
cur_metr
i
c
.
items
():
if
isinstance
(
v
,
(
float
,
int
)):
if
isinstance
(
v
,
(
float
,
int
)):
vdl_writer
.
add_scalar
(
'EVAL/{}'
.
format
(
k
),
vdl_writer
.
add_scalar
(
'EVAL/{}'
.
format
(
k
),
cur_met
i
rc
[
k
],
global_step
)
cur_metr
i
c
[
k
],
global_step
)
if
cur_met
i
rc
[
main_indicator
]
>=
best_model_dict
[
if
cur_metr
i
c
[
main_indicator
]
>=
best_model_dict
[
main_indicator
]:
main_indicator
]:
best_model_dict
.
update
(
cur_met
i
rc
)
best_model_dict
.
update
(
cur_metr
i
c
)
best_model_dict
[
'best_epoch'
]
=
epoch
best_model_dict
[
'best_epoch'
]
=
epoch
save_model
(
save_model
(
model
,
model
,
...
@@ -263,7 +263,7 @@ def train(config,
...
@@ -263,7 +263,7 @@ def train(config,
prefix
=
'best_accuracy'
,
prefix
=
'best_accuracy'
,
best_model_dict
=
best_model_dict
,
best_model_dict
=
best_model_dict
,
epoch
=
epoch
)
epoch
=
epoch
)
best_str
=
'best met
i
rc, {}'
.
format
(
', '
.
join
([
best_str
=
'best metr
i
c, {}'
.
format
(
', '
.
join
([
'{}: {}'
.
format
(
k
,
v
)
for
k
,
v
in
best_model_dict
.
items
()
'{}: {}'
.
format
(
k
,
v
)
for
k
,
v
in
best_model_dict
.
items
()
]))
]))
logger
.
info
(
best_str
)
logger
.
info
(
best_str
)
...
@@ -294,7 +294,7 @@ def train(config,
...
@@ -294,7 +294,7 @@ def train(config,
prefix
=
'iter_epoch_{}'
.
format
(
epoch
),
prefix
=
'iter_epoch_{}'
.
format
(
epoch
),
best_model_dict
=
best_model_dict
,
best_model_dict
=
best_model_dict
,
epoch
=
epoch
)
epoch
=
epoch
)
best_str
=
'best met
i
rc, {}'
.
format
(
', '
.
join
(
best_str
=
'best metr
i
c, {}'
.
format
(
', '
.
join
(
[
'{}: {}'
.
format
(
k
,
v
)
for
k
,
v
in
best_model_dict
.
items
()]))
[
'{}: {}'
.
format
(
k
,
v
)
for
k
,
v
in
best_model_dict
.
items
()]))
logger
.
info
(
best_str
)
logger
.
info
(
best_str
)
if
dist
.
get_rank
()
==
0
and
vdl_writer
is
not
None
:
if
dist
.
get_rank
()
==
0
and
vdl_writer
is
not
None
:
...
@@ -323,13 +323,13 @@ def eval(model, valid_dataloader, post_process_class, eval_class):
...
@@ -323,13 +323,13 @@ def eval(model, valid_dataloader, post_process_class, eval_class):
eval_class
(
post_result
,
batch
)
eval_class
(
post_result
,
batch
)
pbar
.
update
(
1
)
pbar
.
update
(
1
)
total_frame
+=
len
(
images
)
total_frame
+=
len
(
images
)
# Get final met
i
rc,eg. acc or hmean
# Get final metr
i
c,eg. acc or hmean
met
i
rc
=
eval_class
.
get_metric
()
metr
i
c
=
eval_class
.
get_metric
()
pbar
.
close
()
pbar
.
close
()
model
.
train
()
model
.
train
()
met
i
rc
[
'fps'
]
=
total_frame
/
total_time
metr
i
c
[
'fps'
]
=
total_frame
/
total_time
return
met
i
rc
return
metr
i
c
def
preprocess
(
is_train
=
False
):
def
preprocess
(
is_train
=
False
):
...
...
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