Skip to content

Commit 04e8d0b

Browse files
olegkkruglovolegkkruglov
committed
Fix lint
1 parent 584f7ac commit 04e8d0b

File tree

8 files changed

+191
-196
lines changed

8 files changed

+191
-196
lines changed

‎configs/incremental.json‎

Lines changed: 119 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1,144 +1,121 @@
11
{
2-
"PARAMETERS_SETS": {
3-
"common": {
4-
"bench": { "n_runs": 10, "time_limit": 60 }
5-
},
6-
7-
"covariance data": {
8-
"data": [
9-
{
10-
"source": "make_blobs",
11-
"generation_kwargs": {
12-
"centers": 1,
13-
"n_samples": 1000,
14-
"n_features": [16, 64]
15-
},
16-
"split_kwargs": { "ignore": true }
17-
},
18-
{
19-
"dataset_sequence": [
20-
{
21-
"source": "make_blobs",
22-
"generation_kwargs": {
23-
"centers": 1,
24-
"n_samples": 1000,
25-
"n_features": 16
26-
},
27-
"split_kwargs": { "ignore": true }
28-
},
29-
{
30-
"source": "make_blobs",
31-
"generation_kwargs": {
32-
"centers": 1,
33-
"n_samples": 2000,
34-
"n_features": 16
35-
},
36-
"split_kwargs": { "ignore": true }
37-
}
38-
]
39-
}
40-
]
41-
},
42-
43-
"basic_statistics data": {
44-
"data": {
45-
"source": "make_blobs",
46-
"generation_kwargs": {
47-
"centers": 1,
48-
"n_samples": 10000,
49-
"n_features": [16, 64]
50-
},
51-
"split_kwargs": { "ignore": true }
52-
}
53-
},
54-
"linear_regression data": {
55-
"data": {
56-
"source": "make_regression",
57-
"split_kwargs": { "train_size": 0.2, "test_size": 0.8 },
58-
"generation_kwargs": {
59-
"n_samples": 5000,
60-
"n_features": [40, 100],
61-
"n_informative": 5,
62-
"noise": 2.0
63-
}
64-
}
65-
},
66-
67-
"pca data": {
68-
"data": {
69-
"source": "make_blobs",
70-
"generation_kwargs": {
71-
"centers": 1,
72-
"n_samples": 1000,
73-
"n_features": [16, 64]
74-
},
75-
"split_kwargs": { "ignore": true }
76-
}
77-
},
78-
79-
"covariance": {
80-
"algorithm":
81-
[
82-
{
83-
"estimator": "IncrementalEmpiricalCovariance",
84-
"library": "sklearnex.covariance",
85-
"estimator_methods": {"training": "partial_fit"},
86-
"num_batches": {
87-
"training": 2
88-
}
89-
}
90-
]
91-
},
92-
"basic_statistics": {
93-
"algorithm":
94-
[
95-
{
96-
"estimator": "IncrementalBasicStatistics",
97-
"library": "sklearnex.basic_statistics",
98-
"num_batches": {
99-
"training": 2
100-
}
101-
}
102-
]
103-
},
104-
"linear_regression": {
105-
"algorithm":
106-
[
107-
{
108-
"estimator": "IncrementalLinearRegression",
109-
"library": "sklearnex.linear_model",
110-
"num_batches": {
111-
"training": 2
112-
}
113-
}
114-
]
115-
},
116-
"pca": {
117-
"algorithm":
118-
[
119-
{
120-
"estimator": "IncrementalPCA",
121-
"library": "sklearnex.preview.decomposition",
122-
"num_batches": {
123-
"training": 2
124-
}
125-
}
126-
]
127-
}
128-
129-
},
130-
"TEMPLATES": {
131-
"covariance": {
132-
"SETS": ["common", "covariance", "covariance data"]
133-
},
134-
"basic_statistics": {
135-
"SETS": ["common", "basic_statistics", "basic_statistics data"]
136-
},
137-
"linear_regression": {
138-
"SETS": ["common", "linear_regression", "linear_regression data"]
139-
},
140-
"pca": {
141-
"SETS": ["common", "pca", "pca data"]
142-
}
143-
}
2+
"PARAMETERS_SETS": {
3+
"common": {"bench": {"n_runs": 10, "time_limit": 60}},
4+
"covariance data": {
5+
"data": [
6+
{
7+
"source": "make_blobs",
8+
"generation_kwargs": {
9+
"centers": 1,
10+
"n_samples": 1000,
11+
"n_features": [16, 64],
12+
},
13+
"split_kwargs": {"ignore": true},
14+
},
15+
{
16+
"dataset_sequence": [
17+
{
18+
"source": "make_blobs",
19+
"generation_kwargs": {
20+
"centers": 1,
21+
"n_samples": 1000,
22+
"n_features": 16,
23+
},
24+
"split_kwargs": {"ignore": true},
25+
},
26+
{
27+
"source": "make_blobs",
28+
"generation_kwargs": {
29+
"centers": 1,
30+
"n_samples": 2000,
31+
"n_features": 16,
32+
},
33+
"split_kwargs": {"ignore": true},
34+
},
35+
]
36+
},
37+
]
38+
},
39+
"basic_statistics data": {
40+
"data": {
41+
"source": "make_blobs",
42+
"generation_kwargs": {
43+
"centers": 1,
44+
"n_samples": 10000,
45+
"n_features": [16, 64],
46+
},
47+
"split_kwargs": {"ignore": true},
48+
}
49+
},
50+
"linear_regression data": {
51+
"data": {
52+
"source": "make_regression",
53+
"split_kwargs": {"train_size": 0.2, "test_size": 0.8},
54+
"generation_kwargs": {
55+
"n_samples": 5000,
56+
"n_features": [40, 100],
57+
"n_informative": 5,
58+
"noise": 2.0,
59+
},
60+
}
61+
},
62+
"pca data": {
63+
"data": {
64+
"source": "make_blobs",
65+
"generation_kwargs": {
66+
"centers": 1,
67+
"n_samples": 1000,
68+
"n_features": [16, 64],
69+
},
70+
"split_kwargs": {"ignore": true},
71+
}
72+
},
73+
"covariance": {
74+
"algorithm": [
75+
{
76+
"estimator": "IncrementalEmpiricalCovariance",
77+
"library": "sklearnex.covariance",
78+
"estimator_methods": {"training": "partial_fit"},
79+
"num_batches": {"training": 2},
80+
}
81+
]
82+
},
83+
"basic_statistics": {
84+
"algorithm": [
85+
{
86+
"estimator": "IncrementalBasicStatistics",
87+
"library": "sklearnex.basic_statistics",
88+
"num_batches": {"training": 2},
89+
}
90+
]
91+
},
92+
"linear_regression": {
93+
"algorithm": [
94+
{
95+
"estimator": "IncrementalLinearRegression",
96+
"library": "sklearnex.linear_model",
97+
"num_batches": {"training": 2},
98+
}
99+
]
100+
},
101+
"pca": {
102+
"algorithm": [
103+
{
104+
"estimator": "IncrementalPCA",
105+
"library": "sklearnex.preview.decomposition",
106+
"num_batches": {"training": 2},
107+
}
108+
]
109+
},
110+
},
111+
"TEMPLATES": {
112+
"covariance": {"SETS": ["common", "covariance", "covariance data"]},
113+
"basic_statistics": {
114+
"SETS": ["common", "basic_statistics", "basic_statistics data"]
115+
},
116+
"linear_regression": {
117+
"SETS": ["common", "linear_regression", "linear_regression data"]
118+
},
119+
"pca": {"SETS": ["common", "pca", "pca data"]},
120+
},
144121
}

‎sklbench/benchmarks/custom_function.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
from typing import Dict, List, Tuple
1818

1919
from ..datasets import load_dataset
20+
from ..datasets.special_params import assign_case_special_values_on_run
2021
from ..datasets.transformer import split_and_transform_data
2122
from ..utils.bench_case import get_bench_case_value
2223
from ..utils.common import get_module_members
2324
from ..utils.config import bench_case_filter
2425
from ..utils.custom_types import BenchCase
2526
from ..utils.logger import logger
2627
from ..utils.measurement import measure_case
27-
from ..datasets.special_params import assign_case_special_values_on_run
2828
from .common import enrich_result, main_template
2929

3030

0 commit comments

Comments
 (0)