Changes to mxnet.metric

python/mxnet/__init__.py

@@ -51,7 +51,6 @@
 from . import random
 from . import optimizer
 from . import model
-from . import metric
 from . import notebook
 from . import initializer
 # use mx.init as short for mx.initializer

python/mxnet/contrib/svrg_optimization/svrg_module.py

@@ -478,8 +478,8 @@ def fit(self, train_data, eval_data=None, eval_metric='acc',
 
         if validation_metric is None:
             validation_metric = eval_metric
-        if not isinstance(eval_metric, mx.metric.EvalMetric):
-            eval_metric = mx.metric.create(eval_metric)
+        if not isinstance(eval_metric, mx.gluon.metric.EvalMetric):
+            eval_metric = mx.gluon.metric.create(eval_metric)
 
         ################################################################################
         # training loop

python/mxnet/gluon/__init__.py

@@ -19,6 +19,8 @@
 # pylint: disable=wildcard-import
 """Neural network module."""
 
+from . import metric
+
 from .parameter import *
 
 from .block import *

python/mxnet/gluon/block.py

@@ -28,7 +28,8 @@
 import numpy as np
 
 from ..base import mx_real_t, MXNetError
-from .. import symbol, ndarray, initializer, np_symbol, autograd, _deferred_compute as dc
+from .. import symbol, ndarray, initializer, autograd, _deferred_compute as dc
+from ..symbol.numpy import _symbol as np_symbol
 from ..symbol import Symbol
 from ..ndarray import NDArray
 from .. import name as _name

python/mxnet/gluon/contrib/data/text.py

@@ -29,7 +29,7 @@
 from ...data import dataset
 from ...utils import download, check_sha1, _get_repo_file_url
 from ....contrib import text
-from .... import nd, base
+from .... import ndarray as nd, base
 
 class _LanguageModelDataset(dataset._DownloadedDataset): # pylint: disable=abstract-method
     def __init__(self, root, namespace, vocabulary):

python/mxnet/gluon/contrib/estimator/estimator.py

@@ -33,7 +33,7 @@
 from ...trainer import Trainer
 from ...utils import split_and_load
 from ....context import Context, cpu, gpu, num_gpus
-from ....metric import Loss as metric_loss
+from ...metric import Loss as metric_loss
 from .batch_processor import BatchProcessor
 
 __all__ = ['Estimator']

python/mxnet/gluon/contrib/estimator/event_handler.py

@@ -25,8 +25,8 @@
 
 import numpy as np
 
-from ....metric import CompositeEvalMetric, EvalMetric
-from ....metric import Loss as metric_loss
+from ...metric import CompositeEvalMetric, EvalMetric
+from ...metric import Loss as metric_loss
 from .utils import _check_metrics
 
 __all__ = ['TrainBegin', 'TrainEnd', 'EpochBegin', 'EpochEnd', 'BatchBegin', 'BatchEnd',

python/mxnet/gluon/contrib/estimator/utils.py

@@ -20,7 +20,7 @@
 """Gluon Estimator Utility Functions"""
 
 from ...loss import SoftmaxCrossEntropyLoss
-from ....metric import Accuracy, EvalMetric, CompositeEvalMetric
+from ...metric import Accuracy, EvalMetric, CompositeEvalMetric
 
 def _check_metrics(metrics):
     if isinstance(metrics, CompositeEvalMetric):
@@ -31,7 +31,7 @@ def _check_metrics(metrics):
         metrics = metrics or []
         if not all([isinstance(metric, EvalMetric) for metric in metrics]):
             raise ValueError("metrics must be a Metric or a list of Metric, "
-                             "refer to mxnet.metric.EvalMetric: {}".format(metrics))
+                             "refer to mxnet.gluon.metric.EvalMetric: {}".format(metrics))
     return metrics
 
 def _check_handler_metric_ref(handler, known_metrics):

python/mxnet/gluon/contrib/nn/basic_layers.py

@@ -24,7 +24,7 @@
            'PixelShuffle3D']
 
 import warnings
-from .... import nd, context
+from .... import ndarray as nd, context
 from ...block import HybridBlock, Block
 from ...nn import Sequential, HybridSequential, BatchNorm
 

python/mxnet/gluon/data/dataloader.py

@@ -37,7 +37,7 @@
     pass
 
 from . import sampler as _sampler
-from ... import nd, context
+from ... import ndarray as nd, context
 from ...util import is_np_shape, is_np_array, set_np
 from ... import numpy as _mx_np  # pylint: disable=reimported
 

python/mxnet/gluon/data/vision/datasets.py

@@ -30,7 +30,7 @@
 
 from .. import dataset
 from ...utils import download, check_sha1, _get_repo_file_url
-from .... import nd, image, recordio, base
+from .... import ndarray as nd, image, recordio, base
 from .... import numpy as _mx_np  # pylint: disable=reimported
 from ....util import is_np_array