pep8

sdpython · sdpython · commit c48eba46de4c · 2019-10-10T18:30:08.000+02:00
diff --git a/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_64_liblinear_solverliblinear_onnx_10.py b/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_64_liblinear_solverliblinear_onnx_10.py
@@ -33,6 +33,5 @@ def _create_model(self):
             solver='liblinear'
         )
 
-
     def _optimize_onnx(self, onx):
         return onnx_optimisations(onx)
diff --git a/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_64_liblinear_solverliblinear_onnx_11.py b/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_64_liblinear_solverliblinear_onnx_11.py
@@ -33,6 +33,5 @@ def _create_model(self):
             solver='liblinear'
         )
 
-
     def _optimize_onnx(self, onx):
         return onnx_optimisations(onx)
diff --git a/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_64_liblinear_solverliblinear_onnx_9.py b/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_64_liblinear_solverliblinear_onnx_9.py
@@ -33,6 +33,5 @@ def _create_model(self):
             solver='liblinear'
         )
 
-
     def _optimize_onnx(self, onx):
         return onnx_optimisations(onx)
diff --git a/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_liblinear_solverliblinear_onnx_10.py b/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_liblinear_solverliblinear_onnx_10.py
@@ -32,6 +32,5 @@ def _create_model(self):
             solver='liblinear'
         )
 
-
     def _optimize_onnx(self, onx):
         return onnx_optimisations(onx)
diff --git a/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_liblinear_solverliblinear_onnx_11.py b/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_liblinear_solverliblinear_onnx_11.py
@@ -32,6 +32,5 @@ def _create_model(self):
             solver='liblinear'
         )
 
-
     def _optimize_onnx(self, onx):
         return onnx_optimisations(onx)
diff --git a/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_liblinear_solverliblinear_onnx_9.py b/_benches/linear_model/LogisticRegression/bench_LogisticRegression_b_cl_liblinear_solverliblinear_onnx_9.py
@@ -32,6 +32,5 @@ def _create_model(self):
             solver='liblinear'
         )
 
-
     def _optimize_onnx(self, onx):
         return onnx_optimisations(onx)
diff --git a/_benches/linear_model/LogisticRegression/bench_LogisticRegression_m_cl_liblinear_solverliblinear_onnx_10.py b/_benches/linear_model/LogisticRegression/bench_LogisticRegression_m_cl_liblinear_solverliblinear_onnx_10.py
@@ -32,6 +32,5 @@ def _create_model(self):
             solver='liblinear'
         )
 
-
     def _optimize_onnx(self, onx):
         return onnx_optimisations(onx)
diff --git a/_benches/linear_model/LogisticRegression/bench_LogisticRegression_m_cl_liblinear_solverliblinear_onnx_11.py b/_benches/linear_model/LogisticRegression/bench_LogisticRegression_m_cl_liblinear_solverliblinear_onnx_11.py
@@ -32,6 +32,5 @@ def _create_model(self):
             solver='liblinear'
         )
 
-
     def _optimize_onnx(self, onx):
         return onnx_optimisations(onx)
diff --git a/_benches/linear_model/LogisticRegression/bench_LogisticRegression_m_cl_liblinear_solverliblinear_onnx_9.py b/_benches/linear_model/LogisticRegression/bench_LogisticRegression_m_cl_liblinear_solverliblinear_onnx_9.py
@@ -32,6 +32,5 @@ def _create_model(self):
             solver='liblinear'
         )
 
-
     def _optimize_onnx(self, onx):
         return onnx_optimisations(onx)
diff --git a/_unittests/ut_asv_benchmark/data/results.zip b/_unittests/ut_asv_benchmark/data/results.zip
diff --git a/_unittests/ut_asv_benchmark/test_asv_json_text.py b/_unittests/ut_asv_benchmark/test_asv_json_text.py
@@ -7,12 +7,25 @@
 from pyquickhelper.pycode import ExtTestCase, get_temp_folder
 from pyquickhelper.filehelper.compression_helper import unzip_files
 from mlprodict.asv_benchmark import export_asv_json
+from mlprodict.asv_benchmark.asv_exports import _figures2dict
 
 
 class TestAsvJsonText(ExtTestCase):
 
     data = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
 
+    def test_update_obs(self):
+        values = list(range(0, 18))
+        coor = [["'skl'", "'pyrt'", "'ort'"], [
+            '1', '100', '10000'], ['4', '20']]
+        res = _figures2dict(values, coor)
+        exp = {'M-skl-1-4': 0, 'M-skl-1-20': 1, 'M-skl-100-4': 2, 'M-skl-100-20': 3,
+               'M-skl-10000-4': 4, 'M-skl-10000-20': 5, 'M-pyrt-1-4': 6, 'M-pyrt-1-20': 7,
+               'M-pyrt-100-4': 8, 'M-pyrt-100-20': 9, 'M-pyrt-10000-4': 10,
+               'M-pyrt-10000-20': 11, 'M-ort-1-4': 12, 'M-ort-1-20': 13, 'M-ort-100-4': 14,
+               'M-ort-100-20': 15, 'M-ort-10000-4': 16, 'M-ort-10000-20': 17}
+        self.assertEqual(res, exp)
+
     def test_asv_json_simplify(self):
         temp = get_temp_folder(__file__, 'temp_asv_json_simplify')
         filenames = [
@@ -43,7 +56,8 @@ def test_unzip_and_convert(self):
         unzip_files(file_zip, temp)
         data = os.path.join(temp, 'results')
         exp = export_asv_json(data)
-        self.assertIsInstance(exp, dict)
+        self.assertIsInstance(exp, list)
+        self.assertTrue(all(map(lambda x: isinstance(x, dict), exp)))
 
 
 if __name__ == "__main__":
diff --git a/mlprodict/asv_benchmark/asv_exports.py b/mlprodict/asv_benchmark/asv_exports.py
@@ -7,14 +7,30 @@
 import json
 
 
-def export_asv_json(folder, as_df=False, last_one=False):
+def _figures2dict(metrics, coor):
+    ind = [0 for c in coor]
+    res = {}
+    pos = 0
+    while ind[0] < len(coor[0]):
+        cc = [coor[i][ind[i]] for i in range(len(ind))]
+        name = 'M-' + "-".join(map(str, cc)).replace("'", "")
+        res[name] = metrics[pos]
+        pos += 1
+        ind[-1] += 1
+        last = len(ind) - 1
+        while last > 0 and ind[last] >= len(coor[last]):
+            ind[last] = 0
+            last -= 1
+            ind[last] += 1
+    return res
+
+
+def enumerate_export_asv_json(folder, as_df=False, last_one=False):
     """
     Looks into :epkg:`asv` results and wraps all of them
     into a :epkg:`dataframe` or flat data.
 
     @param      folder      location of the results
-    @param      as_df       returns a dataframe or
-                            a list of dictionaries
     @param      last_one    to return only the last one
     @return                 :epkg:`dataframe` or flat data
     """
@@ -55,10 +71,40 @@ def export_asv_json(folder, as_df=False, last_one=False):
                     meta_res[k] = v
                     continue
                 results = test_content['results']
-                print(results)
                 for kk, vv in results.items():
                     if 'track_opset' not in kk:
                         continue
                     if vv is None:
                         raise RuntimeError('Unexpected empty value for vv')
-    return content
+                    try:
+                        metrics, coord, hash = vv[:3]
+                    except ValueError as e:
+                        raise ValueError(
+                            "Test '{}', unable to interpret: {}.".format(
+                                kk, vv)) from e
+
+                    obs = meta_res.copy()
+                    obs['test_name'] = kk
+                    obs['test_hash'] = hash
+                    if metrics is not None:
+                        obs.update(_figures2dict(metrics, coord))
+                    yield obs
+
+
+def export_asv_json(folder, as_df=False, last_one=False):
+    """
+    Looks into :epkg:`asv` results and wraps all of them
+    into a :epkg:`dataframe` or flat data.
+
+    @param      folder      location of the results
+    @param      as_df       returns a dataframe or
+                            a list of dictionaries
+    @param      last_one    to return only the last one
+    @return                 :epkg:`dataframe` or flat data
+    """
+    rows = list(enumerate_export_asv_json(
+        folder, last_one=last_one))
+    if as_df:
+        import pandas
+        return pandas.DataFrame(rows)
+    return rows
diff --git a/mlprodict/onnxrt/ops_cpu/op_label_encoder.py b/mlprodict/onnxrt/ops_cpu/op_label_encoder.py
@@ -49,7 +49,8 @@ def __init__(self, onnx_node, desc=None, **options):
             raise RuntimeError("This runtime does not implement version 1 of "
                                "operator LabelEncoder.")
         else:
-            raise RuntimeError("No encoding was defined in {}.".format(onnx_node))
+            raise RuntimeError(
+                "No encoding was defined in {}.".format(onnx_node))
         if len(self.classes_) == 0:
             raise RuntimeError(
                 "Empty classes for LabelEncoder, (onnx_node='{}')\n{}.".format(

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,5 @@ def _create_model(self):`
`33`	`33`	`solver='liblinear'`
`34`	`34`	`)`
`35`	`35`
`36`		`-`
`37`	`36`	`def _optimize_onnx(self, onx):`
`38`	`37`	`return onnx_optimisations(onx)`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,5 @@ def _create_model(self):`
`32`	`32`	`solver='liblinear'`
`33`	`33`	`)`
`34`	`34`
`35`		`-`
`36`	`35`	`def _optimize_onnx(self, onx):`
`37`	`36`	`return onnx_optimisations(onx)`