Merge pull request #92 from CortexFoundation/zh

8.16

Author: wlt-cortex

docs/deep_dive/mrt.rst

@@ -7,6 +7,7 @@
 
 from yacs.config import CfgNode as CN
 import logging
+import time
 
 import mxnet as mx
 from mxnet import gluon, ndarray as nd
@@ -132,8 +133,10 @@ def get_evaluation_info(cm_cfg, pass_cfg, logger=None):
     def evalfunc(data, label):
         # outs = forward(graph, data, ctx=ctx)
         outs = forward(graph, data, ctx, baxis, olen)
+        start = time.time()
         acc = dataset.validate(metric, outs, label)
-        return acc
+        end = time.time()
+        return acc, int((end-start)*1e3)
 
     # forward function for the quantized model
     if conf_map.get("split_keys", "") != "":
@@ -161,8 +164,10 @@ def quantize(data, label):
         outs = forward(qgraph, data, ctx, baxis, olen)
         outs = outs / oscales[0] if olen == 1 \
             else [(t / oscales[i]) for i, t in enumerate(outs)]
+        start = time.time()
         acc = dataset.validate(qmetric, outs, label)
-        return acc
+        end = time.time()
+        return acc, int((end-start)*1e3)
 
     return evalfunc, data_iter_func, quantize
 

docs/index.rst

@@ -188,17 +188,17 @@ def multi_validate(base_func, data_iter, *comp_funcs,
     log_str = "Iteration: {:3d} | " + base_func.__name__ + ": {} | "
     for func in comp_funcs:
         log_str += func.__name__ + ": {} | "
-    log_str += "Total Sample: {:5d}"
+    log_str += "time: {}ms {}ms | Total Sample: {:5d}"
 
     total = 0
     for i in range(iter_num):
         data, label = data_iter()
-        base_acc = base_func(data, label)
+        base_acc, base_time = base_func(data, label)
         comp_acc = [func(data, label) for func in comp_funcs]
         total += batch_size
-
-        msg = log_str.format(i, base_acc, *comp_acc, total)
+        msg = log_str.format(i, base_acc, comp_acc[0][0], base_time, comp_acc[0][1], total)
         logger.info(msg)
+        
 
 def multi_eval_accuracy(base_func, data_iter_func, *comp_funcs,
         iter_num=10, logger=logging):

docs/mrt/model.md

@@ -1,5 +1,5 @@
 COMMON:
-  MODEL_NAME: cifar_resnet20_v2
+  MODEL_NAME: cifar_resnet110_v2
 PREPARE:
   INPUT_SHAPE: [-1,3,32,32]
 CALIBRATE:

python/mrt/V3/evaluate.py

@@ -1,5 +1,5 @@
 COMMON:
-  MODEL_NAME: mobilenet1_0
+  MODEL_NAME: mobilenet1.0
 CALIBRATE:
   NUM_CALIB: 1
   DATASET_NAME: imagenet

python/mrt/utils.py

@@ -1,5 +1,5 @@
 COMMON:
-  MODEL_NAME: resnet152_v1
+  MODEL_NAME: resnet152_v2
   VERBOSITY: debug
   RUN_EVALUATE: True
 CALIBRATE: