Skip to content

fix eval bug in dist train #69

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

Merged
merged 1 commit into from
Mar 17, 2023
Merged
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions mindocr/utils/callbacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ def eval(self, dataloader, num_keys_to_net=1, num_keys_of_labels=None):
eval_res = {}

self.net.set_train(False)
self.net.phase = 'eval'
iterator = dataloader.create_tuple_iterator(num_epochs=1, output_numpy=False, do_copy=False)
for m in self.metrics:
m.clear()
Expand Down Expand Up @@ -92,20 +91,15 @@ def eval(self, dataloader, num_keys_to_net=1, num_keys_of_labels=None):
pred_img_polys = draw_bboxes(recover_image(img), preds['polygons'].asnumpy())
show_imgs([gt_img_polys, pred_img_polys], show=False, save_path=f'results/det_vis/gt_pred_{i}.png')

# TODO: loss, add loss val to eval_res
for m in self.metrics:
res_dict = m.eval()
eval_res.update(res_dict)
# fps = total_frame / total_time

# TODO: set_train outside
self.net.set_train(True)
self.net.phase = 'train'

return eval_res

# TODO: add checkpoint save manager for better modulation


# class ModelSavor()

Expand All @@ -120,7 +114,7 @@ class EvalSaveCallback(Callback):
"""
def __init__(self,
network,
loader,
loader=None,
loss_fn=None,
postprocessor=None,
metrics=None,
Expand All @@ -130,10 +124,10 @@ def __init__(self,
):
self.rank_id = rank_id
self.is_main_device = rank_id in [0, None]
self.loader_eval = loader

if self.is_main_device:
self.network = network
self.loader_eval = loader
self.best_perf = -1e8
if self.loader_eval is not None:
self.net_evaluator = Evaluator(network, loss_fn, postprocessor, metrics)
Expand Down