Merge master, resolve conflicts

itearsl · Shvets Kirill · commit d133005d0d52 · 2021-09-16T07:02:37.000-07:00
diff --git a/configs/cuml_config.json b/configs/cuml_config.json
@@ -135,6 +135,7 @@
             "max-depth": 16,
             "max-leaf-nodes": 131072,
             "max-features": 0.2
+<<<<<<< HEAD
         },
         {
             "algorithm": "df_regr",
@@ -169,6 +170,8 @@
                     }
                 }
             ]
+=======
+>>>>>>> ed89e1e8a25e21192ae5d70e4db203b08033dfcc
         },
         {
             "algorithm": "ridge",
@@ -598,6 +601,7 @@
             "alpha": 2.0,
             "l1_ratio": 0.5,
             "tol": 1e-4
+<<<<<<< HEAD
         },
         {
             "algorithm": "tsne",
@@ -618,6 +622,8 @@
                     }
                 }
             ]
+=======
+>>>>>>> ed89e1e8a25e21192ae5d70e4db203b08033dfcc
         }
     ]
 }
diff --git a/configs/skl_config.json b/configs/skl_config.json
@@ -147,6 +147,7 @@
             "max-depth": 16,
             "max-leaf-nodes": 131072,
             "max-features": 0.2
+<<<<<<< HEAD
         },
         {
             "algorithm": "df_regr",
@@ -181,6 +182,8 @@
                     }
                 }
             ]
+=======
+>>>>>>> ed89e1e8a25e21192ae5d70e4db203b08033dfcc
         },
         {
             "algorithm": "ridge",
@@ -765,6 +768,7 @@
             "alpha": 2.0,
             "l1_ratio": 0.5,
             "tol": 1e-4
+<<<<<<< HEAD
         },
         {
             "algorithm": "tsne",
@@ -785,6 +789,8 @@
                     }
                 }
             ]
+=======
+>>>>>>> ed89e1e8a25e21192ae5d70e4db203b08033dfcc
         }
     ]
 }
diff --git a/report_generator/default_report_gen_config.json b/report_generator/default_report_gen_config.json
@@ -2,6 +2,7 @@
     "header": [
         "algorithm",
         "stage",
+        "device",
         "input_data:data_order",
         "input_data:data_type",
         "input_data:dataset_name",
diff --git a/report_generator/sklearn_metrics_report_gen_config.json b/report_generator/sklearn_metrics_report_gen_config.json
@@ -1,6 +1,10 @@
 {
     "header": [
         "stage",
+<<<<<<< HEAD
+=======
+        "device",
+>>>>>>> ed89e1e8a25e21192ae5d70e4db203b08033dfcc
         "input_data:data_order",
         "input_data:data_type",
         "input_data:dataset_name",

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@`
`135`	`135`	`"max-depth": 16,`
`136`	`136`	`"max-leaf-nodes": 131072,`
`137`	`137`	`"max-features": 0.2`
	`138`	`+<<<<<<< HEAD`
`138`	`139`	`},`
`139`	`140`	`{`
`140`	`141`	`"algorithm": "df_regr",`
`@@ -169,6 +170,8 @@`
`169`	`170`	`}`
`170`	`171`	`}`
`171`	`172`	`]`
	`173`	`+=======`
	`174`	`+>>>>>>> ed89e1e8a25e21192ae5d70e4db203b08033dfcc`
`172`	`175`	`},`
`173`	`176`	`{`
`174`	`177`	`"algorithm": "ridge",`
`@@ -598,6 +601,7 @@`
`598`	`601`	`"alpha": 2.0,`
`599`	`602`	`"l1_ratio": 0.5,`
`600`	`603`	`"tol": 1e-4`
	`604`	`+<<<<<<< HEAD`
`601`	`605`	`},`
`602`	`606`	`{`
`603`	`607`	`"algorithm": "tsne",`
`@@ -618,6 +622,8 @@`
`618`	`622`	`}`
`619`	`623`	`}`
`620`	`624`	`]`
	`625`	`+=======`
	`626`	`+>>>>>>> ed89e1e8a25e21192ae5d70e4db203b08033dfcc`
`621`	`627`	`}`
`622`	`628`	`]`
`623`	`629`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@`
`147`	`147`	`"max-depth": 16,`
`148`	`148`	`"max-leaf-nodes": 131072,`
`149`	`149`	`"max-features": 0.2`
	`150`	`+<<<<<<< HEAD`
`150`	`151`	`},`
`151`	`152`	`{`
`152`	`153`	`"algorithm": "df_regr",`
`@@ -181,6 +182,8 @@`
`181`	`182`	`}`
`182`	`183`	`}`
`183`	`184`	`]`
	`185`	`+=======`
	`186`	`+>>>>>>> ed89e1e8a25e21192ae5d70e4db203b08033dfcc`
`184`	`187`	`},`
`185`	`188`	`{`
`186`	`189`	`"algorithm": "ridge",`
`@@ -765,6 +768,7 @@`
`765`	`768`	`"alpha": 2.0,`
`766`	`769`	`"l1_ratio": 0.5,`
`767`	`770`	`"tol": 1e-4`
	`771`	`+<<<<<<< HEAD`
`768`	`772`	`},`
`769`	`773`	`{`
`770`	`774`	`"algorithm": "tsne",`
`@@ -785,6 +789,8 @@`
`785`	`789`	`}`
`786`	`790`	`}`
`787`	`791`	`]`
	`792`	`+=======`
	`793`	`+>>>>>>> ed89e1e8a25e21192ae5d70e4db203b08033dfcc`
`788`	`794`	`}`
`789`	`795`	`]`
`790`	`796`	`}`