Skip to content

Commit d732e0f

Browse files
ethanglaserethanglaser
committed
rebase
2 parents 105d203 + 7ed0235 commit d732e0f

34 files changed

+277
-110
lines changed

‎configs/incremental.json‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{ "INCLUDE": ["./common/sklearn.json"],
22
"PARAMETERS_SETS": {
33
"common": {"bench": {"n_runs": 10, "time_limit": 60}},
44
"covariance data": {
@@ -7,8 +7,8 @@
77
"source": "make_blobs",
88
"generation_kwargs": {
99
"centers": 1,
10-
"n_samples": 1000,
11-
"n_features": [16, 64]
10+
"n_samples": 12000000,
11+
"n_features": [10, 100]
1212
},
1313
"split_kwargs": {"ignore": true}
1414
}
@@ -19,8 +19,8 @@
1919
"source": "make_blobs",
2020
"generation_kwargs": {
2121
"centers": 1,
22-
"n_samples": 10000,
23-
"n_features": [16, 64]
22+
"n_samples": 12000000,
23+
"n_features": [10, 100]
2424
},
2525
"split_kwargs": {"ignore": true}
2626
}
@@ -30,8 +30,8 @@
3030
"source": "make_regression",
3131
"split_kwargs": {"train_size": 0.2, "test_size": 0.8},
3232
"generation_kwargs": {
33-
"n_samples": 5000,
34-
"n_features": [40, 100],
33+
"n_samples": 12000000,
34+
"n_features": [10, 100],
3535
"n_informative": 5,
3636
"noise": 2.0
3737
}
@@ -42,8 +42,8 @@
4242
"source": "make_blobs",
4343
"generation_kwargs": {
4444
"centers": 1,
45-
"n_samples": 1000,
46-
"n_features": [16, 64]
45+
"n_samples": 12000000,
46+
"n_features": [10, 100]
4747
},
4848
"split_kwargs": {"ignore": true}
4949
}
@@ -54,16 +54,17 @@
5454
"estimator": "IncrementalEmpiricalCovariance",
5555
"library": "sklearnex.covariance",
5656
"estimator_methods": {"training": "partial_fit"},
57-
"num_batches": {"training": 2}
57+
"num_batches": {"training": 12}
5858
}
5959
]
60-
},
60+
},
6161
"basic_statistics": {
6262
"algorithm": [
6363
{
6464
"estimator": "IncrementalBasicStatistics",
6565
"library": "sklearnex.basic_statistics",
66-
"num_batches": {"training": 2}
66+
"estimator_methods": {"training": "partial_fit"},
67+
"num_batches": {"training": 12}
6768
}
6869
]
6970
},
@@ -72,7 +73,8 @@
7273
{
7374
"estimator": "IncrementalLinearRegression",
7475
"library": "sklearnex.linear_model",
75-
"num_batches": {"training": 2}
76+
"estimator_methods": {"training": "partial_fit"},
77+
"num_batches": {"training": 12}
7678
}
7779
]
7880
},
@@ -81,16 +83,18 @@
8183
{
8284
"estimator": "IncrementalPCA",
8385
"library": "sklearnex.preview.decomposition",
84-
"num_batches": {"training": 2}
85-
}
86+
"estimator_methods": {"training": "partial_fit"},
87+
"num_batches": {"training": 12}
88+
}
8689
]
8790
}
8891
},
8992
"TEMPLATES": {
90-
"covariance": {"SETS": ["common", "covariance", "covariance data"]},
93+
"basic_statistics": {"SETS": ["common", "basic_statistics", "basic_statistics data", "sklearn-ex[gpu] implementations"]},
94+
"covariance": {"SETS": ["common", "covariance", "covariance data", "sklearn-ex[gpu] implementations"]},
9195
"linear_regression": {
92-
"SETS": ["common", "linear_regression", "linear_regression data"]
96+
"SETS": ["common", "linear_regression", "linear_regression data", "sklearn-ex[gpu] implementations"]
9397
},
94-
"pca": {"SETS": ["common", "pca", "pca data"]}
98+
"pca": {"SETS": ["common", "pca", "pca data", "sklearn-ex[gpu] implementations"]}
9599
}
96100
}

‎configs/regular/batch_for_online.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,5 @@
8181
},
8282
"pca": {"SETS": ["common", "pca", "pca data", "sklearn-ex[gpu] implementations"]}
8383
}
84-
}
84+
}
85+

‎configs/regular/bf16/basic_statistics.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"INCLUDE": ["../../common/sklearn.json"],
3+
"PARAMETERS_SETS": {
4+
"basic stats parameters": {
5+
"algorithm": {
6+
"estimator": "BasicStatistics"
7+
},
8+
"data": {
9+
"dtype": ["float32"]
10+
}
11+
},
12+
"synthetic data": {
13+
"data": [
14+
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 10000000, "n_features": 10, "centers": 1 } }
15+
]
16+
}
17+
},
18+
"TEMPLATES": {
19+
"basic_statistics": {
20+
"SETS": [
21+
"sklearn-ex[gpu] implementations",
22+
"basic stats parameters",
23+
"synthetic data"
24+
]
25+
}
26+
}
27+
}

‎configs/regular/bf16/covariance.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"INCLUDE": ["../../common/sklearn.json"],
3+
"PARAMETERS_SETS": {
4+
"covariance parameters": {
5+
"algorithm": {
6+
"estimator": "EmpiricalCovariance",
7+
"library": "sklearnex.preview.covariance"
8+
},
9+
"data": {
10+
"dtype": ["float32"]
11+
}
12+
},
13+
"synthetic data": {
14+
"data": [
15+
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 10000000, "n_features": 10, "centers": 1 } }
16+
]
17+
}
18+
},
19+
"TEMPLATES": {
20+
"covariance": {
21+
"SETS": [
22+
"sklearn-ex[gpu] implementations",
23+
"covariance parameters",
24+
"synthetic data"
25+
]
26+
}
27+
}
28+
}

‎configs/regular/bf16/ensemble.json‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎configs/regular/bf16/forest.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"INCLUDE": ["../../common/sklearn.json"],
3+
"PARAMETERS_SETS": {
4+
"common forest params": {
5+
"data": {
6+
"dtype": ["float32"]
7+
}
8+
},
9+
"forest classifier params": {
10+
"algorithm": {"estimator": "RandomForestClassifier"},
11+
"data": { "source": "make_classification", "split_kwargs": { "train_size": 500000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 501000, "n_features": 10, "n_classes": 2 }, "algorithm": { "estimator_params": { "n_estimators": 20, "max_depth": 4 } } }
12+
},
13+
"forest regression params": {
14+
"algorithm": {"estimator": "RandomForestRegressor"},
15+
"data": { "source": "make_regression", "generation_kwargs": { "n_samples": 501000, "n_features": 10, "noise": 1.25 }, "split_kwargs": { "train_size": 500000, "test_size": 1000 }, "algorithm": { "estimator_params": { "n_estimators": 20, "max_depth": 4 } }}
16+
}
17+
},
18+
"TEMPLATES": {
19+
"forest cls": {
20+
"SETS": [
21+
"sklearn-ex[gpu] implementations",
22+
"common forest params",
23+
"forest classifier params"
24+
]
25+
},
26+
"forest reg": {
27+
"SETS": [
28+
"sklearn-ex[gpu] implementations",
29+
"common forest params",
30+
"forest regression params"
31+
]
32+
}
33+
}
34+
}

‎configs/regular/bf16/knn.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,19 @@
1717
"algorithm": { "estimator_params": { "n_jobs": "[SPECIAL_VALUE]physical_cpus" } }
1818
},
1919
"synthetic classification data": {
20+
"algorithm": {
21+
"estimator": "KNeighborsClassifier",
22+
"estimator_params": { "algorithm": "brute", "metric": "minkowski", "p": [1, 2] }
23+
},
2024
"data": [
2125
{ "source": "make_classification", "split_kwargs": { "train_size": 50000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 51000, "n_features": 100, "n_classes": 2, "n_informative": "[SPECIAL_VALUE]0.5" } }
2226
]
2327
},
2428
"synthetic regression data": {
29+
"algorithm": {
30+
"estimator": "KNeighborsRegressor",
31+
"estimator_params": { "algorithm": "brute", "metric": "minkowski", "p": [1, 2] }
32+
},
2533
"data": [
2634
{ "source": "make_regression", "split_kwargs": { "train_size": 50000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 51000, "n_features": 100, "noise":1.5 } }
2735
]
@@ -33,7 +41,14 @@
3341
"sklearn-ex[gpu] implementations",
3442
"common knn parameters",
3543
"sklearn knn parameters",
36-
"synthetic classification data",
44+
"synthetic classification data"
45+
]
46+
},
47+
"sklearn brute knn reg": {
48+
"SETS": [
49+
"sklearn-ex[gpu] implementations",
50+
"common knn parameters",
51+
"sklearn knn parameters",
3752
"synthetic regression data"
3853
]
3954
}

‎configs/spmd/large_scale/basic_stats.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"SETS": [
2323
"sklearnex spmd implementation",
2424
"large scale 2k parameters",
25-
"synthetic data",
25+
"synthetic data",
2626
"spmd basicstats parameters"
2727
]
2828
}

‎configs/spmd/large_scale/basic_stats_single.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"SETS": [
2323
"sklearnex spmd implementation",
2424
"large scale one node parameters",
25-
"synthetic data",
25+
"synthetic data",
2626
"spmd basicstats parameters"
2727
]
2828
}

‎configs/spmd/large_scale/basic_stats_strong.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"SETS": [
2222
"sklearnex spmd implementation",
2323
"large scale strong 2k parameters",
24-
"synthetic data",
24+
"synthetic data",
2525
"spmd basicstats parameters"
2626
]
2727
}

0 commit comments

Comments
 (0)