Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

revert acc changes #9731

Merged
eric-haibin-lin merged 4 commits into from
Feb 7, 2018
Merged

revert acc changes #9731

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d4f0d2
Revert "avoid per-batch blocking in metric (#9636)"
Feb 7, 2018
35d7654
Revert "proper flatten in acc (#9619)"
Feb 7, 2018
46e3361
Revert "use nd for accuracy calculation (#9583)"
Feb 7, 2018
6b40759
keep doc change
Feb 7, 2018
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
15 changes: 4 additions & 11 deletions python/mxnet/metric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
from .base import numeric_types, string_types
from . import ndarray
from . import registry
from .context import cpu


def check_label_shapes(labels, preds, shape=0):
Expand Down Expand Up @@ -389,22 +388,16 @@ def update(self, labels, preds):
"""
check_label_shapes(labels, preds)

results = []
for label, pred_label in zip(labels, preds):
if pred_label.shape != label.shape:
pred_label = ndarray.argmax(pred_label, axis=self.axis)
pred_label = pred_label.astype('int32')
label = label.astype('int32')
pred_label = pred_label.asnumpy().astype('int32')
label = label.asnumpy().astype('int32')

check_label_shapes(label, pred_label)

if pred_label.context != label.context:
pred_label = pred_label.as_in_context(label.context)

self.num_inst += pred_label.size
results.append((pred_label.reshape((-1,)) == label.reshape((-1,)))
.sum().as_in_context(cpu()))
self.sum_metric += ndarray.add_n(*results).asscalar()
self.sum_metric += (pred_label.flat == label.flat).sum()
self.num_inst += len(pred_label.flat)


@register
Expand Down