Reduce config

olegkkruglov · olegkkruglov · commit b5ad233d5398 · 2024-09-27T02:29:40.000-07:00
diff --git a/configs/incremental.json b/configs/incremental.json
@@ -1,7 +1,7 @@
 {
     "PARAMETERS_SETS": {
         "common": {"bench": {"n_runs": 10, "time_limit": 60}},
-        "covariance data": {
+        "unlabeled dataset": {
             "data": [
                 {
                     "source": "make_blobs",
@@ -14,18 +14,7 @@
                 }
             ]
         },
-        "basic_statistics data": {
-            "data": {
-                "source": "make_blobs",
-                "generation_kwargs": {
-                    "centers": 1,
-                    "n_samples": 10000,
-                    "n_features": [16, 64]
-                },
-                "split_kwargs": {"ignore": true}
-            }
-        },
-        "linear_regression data": {
+        "labeled dataset": {
             "data": {
                 "source": "make_regression",
                 "split_kwargs": {"train_size": 0.2, "test_size": 0.8},
@@ -37,22 +26,11 @@
                 }
             }
         },
-        "pca data": {
-            "data": {
-                "source": "make_blobs",
-                "generation_kwargs": {
-                    "centers": 1,
-                    "n_samples": 1000,
-                    "n_features": [16, 64]
-                },
-                "split_kwargs": {"ignore": true}
-            }
-        },
         "covariance": {
             "algorithm": [
                 {
                     "estimator": "IncrementalEmpiricalCovariance",
-                    "library": "sklearnex.covariance",
+                    "library": "sklearnex",
                     "estimator_methods": {"training": "partial_fit"},
                     "num_batches": {"training": 2}
                 }
@@ -62,7 +40,7 @@
             "algorithm": [
                 {
                     "estimator": "IncrementalBasicStatistics",
-                    "library": "sklearnex.basic_statistics",
+                    "library": "sklearnex",
                     "num_batches": {"training": 2}
                 }
             ]
@@ -71,7 +49,7 @@
             "algorithm": [
                 {
                     "estimator": "IncrementalLinearRegression",
-                    "library": "sklearnex.linear_model",
+                    "library": "sklearnex",
                     "num_batches": {"training": 2}
                 }
             ]
@@ -80,17 +58,17 @@
             "algorithm": [
                 {
                     "estimator": "IncrementalPCA",
-                    "library": "sklearnex.preview.decomposition",
+                    "library": "sklearnex.preview",
                     "num_batches": {"training": 2}
                 }
             ]
         }
     },
     "TEMPLATES": {
-        "covariance": {"SETS": ["common", "covariance", "covariance data"]},
+        "covariance": {"SETS": ["common", "covariance", "unlabeled dataset"]},
         "linear_regression": {
-            "SETS": ["common", "linear_regression", "linear_regression data"]
+            "SETS": ["common", "linear_regression", "labeled dataset"]
         },
-        "pca": {"SETS": ["common", "pca", "pca data"]}
+        "pca": {"SETS": ["common", "pca", "unlabeled dataset"]}
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"PARAMETERS_SETS": {`
`3`	`3`	`"common": {"bench": {"n_runs": 10, "time_limit": 60}},`
`4`		`- "covariance data": {`
	`4`	`+ "unlabeled dataset": {`
`5`	`5`	`"data": [`
`6`	`6`	`{`
`7`	`7`	`"source": "make_blobs",`
`@@ -14,18 +14,7 @@`
`14`	`14`	`}`
`15`	`15`	`]`
`16`	`16`	`},`
`17`		`- "basic_statistics data": {`
`18`		`- "data": {`
`19`		`- "source": "make_blobs",`
`20`		`- "generation_kwargs": {`
`21`		`- "centers": 1,`
`22`		`- "n_samples": 10000,`
`23`		`- "n_features": [16, 64]`
`24`		`- },`
`25`		`- "split_kwargs": {"ignore": true}`
`26`		`- }`
`27`		`- },`
`28`		`- "linear_regression data": {`
	`17`	`+ "labeled dataset": {`
`29`	`18`	`"data": {`
`30`	`19`	`"source": "make_regression",`
`31`	`20`	`"split_kwargs": {"train_size": 0.2, "test_size": 0.8},`
`@@ -37,22 +26,11 @@`
`37`	`26`	`}`
`38`	`27`	`}`
`39`	`28`	`},`
`40`		`- "pca data": {`
`41`		`- "data": {`
`42`		`- "source": "make_blobs",`
`43`		`- "generation_kwargs": {`
`44`		`- "centers": 1,`
`45`		`- "n_samples": 1000,`
`46`		`- "n_features": [16, 64]`
`47`		`- },`
`48`		`- "split_kwargs": {"ignore": true}`
`49`		`- }`
`50`		`- },`
`51`	`29`	`"covariance": {`
`52`	`30`	`"algorithm": [`
`53`	`31`	`{`
`54`	`32`	`"estimator": "IncrementalEmpiricalCovariance",`
`55`		`- "library": "sklearnex.covariance",`
	`33`	`+ "library": "sklearnex",`
`56`	`34`	`"estimator_methods": {"training": "partial_fit"},`
`57`	`35`	`"num_batches": {"training": 2}`
`58`	`36`	`}`
`@@ -62,7 +40,7 @@`
`62`	`40`	`"algorithm": [`
`63`	`41`	`{`
`64`	`42`	`"estimator": "IncrementalBasicStatistics",`
`65`		`- "library": "sklearnex.basic_statistics",`
	`43`	`+ "library": "sklearnex",`
`66`	`44`	`"num_batches": {"training": 2}`
`67`	`45`	`}`
`68`	`46`	`]`
`@@ -71,7 +49,7 @@`
`71`	`49`	`"algorithm": [`
`72`	`50`	`{`
`73`	`51`	`"estimator": "IncrementalLinearRegression",`
`74`		`- "library": "sklearnex.linear_model",`
	`52`	`+ "library": "sklearnex",`
`75`	`53`	`"num_batches": {"training": 2}`
`76`	`54`	`}`
`77`	`55`	`]`
`@@ -80,17 +58,17 @@`
`80`	`58`	`"algorithm": [`
`81`	`59`	`{`
`82`	`60`	`"estimator": "IncrementalPCA",`
`83`		`- "library": "sklearnex.preview.decomposition",`
	`61`	`+ "library": "sklearnex.preview",`
`84`	`62`	`"num_batches": {"training": 2}`
`85`	`63`	`}`
`86`	`64`	`]`
`87`	`65`	`}`
`88`	`66`	`},`
`89`	`67`	`"TEMPLATES": {`
`90`		`- "covariance": {"SETS": ["common", "covariance", "covariance data"]},`
	`68`	`+ "covariance": {"SETS": ["common", "covariance", "unlabeled dataset"]},`
`91`	`69`	`"linear_regression": {`
`92`		`- "SETS": ["common", "linear_regression", "linear_regression data"]`
	`70`	`+ "SETS": ["common", "linear_regression", "labeled dataset"]`
`93`	`71`	`},`
`94`		`- "pca": {"SETS": ["common", "pca", "pca data"]}`
	`72`	`+ "pca": {"SETS": ["common", "pca", "unlabeled dataset"]}`
`95`	`73`	`}`
`96`	`74`	`}`