1 files changed, 46 insertions, 44 deletions
diff --git a/cros_utils/tabulator.py b/cros_utils/tabulator.py
index b4092993..1a3fd4a7 100644
--- a/cros_utils/tabulator.py
+++ b/cros_utils/tabulator.py
@@ -67,10 +67,10 @@ from __future__ import print_function
 import collections
 import getpass
 import math
+import statistics
 import sys
-# TODO(zhizhouy): Drop numpy in the future
+# TODO(crbug.com/980719): Drop scipy in the future.
 # pylint: disable=import-error
-import numpy
 import scipy
 
 from cros_utils.email_sender import EmailSender
@@ -556,7 +556,7 @@ class AmeanResult(StringMeanResult):
   def _ComputeFloat(self, cell, values, baseline_values):
     if self.ignore_min_max:
       values = _RemoveMinMax(cell, values)
-    cell.value = numpy.mean(values)
+    cell.value = statistics.mean(values)
 
 
 class RawResult(Result):
@@ -610,7 +610,7 @@ class StdResult(NumericalResult):
   def _ComputeFloat(self, cell, values, baseline_values):
     if self.ignore_min_max:
       values = _RemoveMinMax(cell, values)
-    cell.value = numpy.std(values)
+    cell.value = statistics.pstdev(values)
 
 
 class CoeffVarResult(NumericalResult):
@@ -623,8 +623,8 @@ class CoeffVarResult(NumericalResult):
   def _ComputeFloat(self, cell, values, baseline_values):
     if self.ignore_min_max:
       values = _RemoveMinMax(cell, values)
-    if numpy.mean(values) != 0.0:
-      noise = numpy.abs(numpy.std(values) / numpy.mean(values))
+    if statistics.mean(values) != 0.0:
+      noise = abs(statistics.pstdev(values) / statistics.mean(values))
     else:
       noise = 0.0
     cell.value = noise
@@ -731,9 +731,12 @@ class AmeanRatioResult(KeyAwareComparisonResult):
     if self.ignore_min_max:
       values = _RemoveMinMax(cell, values)
       baseline_values = _RemoveMinMax(cell, baseline_values)
-    if numpy.mean(baseline_values) != 0:
-      cell.value = numpy.mean(values) / numpy.mean(baseline_values)
-    elif numpy.mean(values) != 0:
+
+    baseline_mean = statistics.mean(baseline_values)
+    values_mean = statistics.mean(values)
+    if baseline_mean != 0:
+      cell.value = values_mean / baseline_mean
+    elif values_mean != 0:
       cell.value = 0.00
       # cell.value = 0 means the values and baseline_values have big difference
     else:
@@ -1495,41 +1498,40 @@ def GetComplexTable(runs, labels, out_to=TablePrinter.CONSOLE):
 
 if __name__ == '__main__':
   # Run a few small tests here.
-  runs = [
-      [{
-          'k1': '10',
-          'k2': '12',
-          'k5': '40',
-          'k6': '40',
-          'ms_1': '20',
-          'k7': 'FAIL',
-          'k8': 'PASS',
-          'k9': 'PASS',
-          'k10': '0'
-      },
-       {
-           'k1': '13',
-           'k2': '14',
-           'k3': '15',
-           'ms_1': '10',
-           'k8': 'PASS',
-           'k9': 'FAIL',
-           'k10': '0'
-       }],
-      [{
-          'k1': '50',
-          'k2': '51',
-          'k3': '52',
-          'k4': '53',
-          'k5': '35',
-          'k6': '45',
-          'ms_1': '200',
-          'ms_2': '20',
-          'k7': 'FAIL',
-          'k8': 'PASS',
-          'k9': 'PASS'
-      }],
-  ]
+  run1 = {
+      'k1': '10',
+      'k2': '12',
+      'k5': '40',
+      'k6': '40',
+      'ms_1': '20',
+      'k7': 'FAIL',
+      'k8': 'PASS',
+      'k9': 'PASS',
+      'k10': '0'
+  }
+  run2 = {
+      'k1': '13',
+      'k2': '14',
+      'k3': '15',
+      'ms_1': '10',
+      'k8': 'PASS',
+      'k9': 'FAIL',
+      'k10': '0'
+  }
+  run3 = {
+      'k1': '50',
+      'k2': '51',
+      'k3': '52',
+      'k4': '53',
+      'k5': '35',
+      'k6': '45',
+      'ms_1': '200',
+      'ms_2': '20',
+      'k7': 'FAIL',
+      'k8': 'PASS',
+      'k9': 'PASS'
+  }
+  runs = [[run1, run2], [run3]]
   labels = ['vanilla', 'modified']
   t = GetComplexTable(runs, labels, TablePrinter.CONSOLE)
   print(t)