Skip to content

Commit 9b70f7e

Browse files
ethanglaserethanglaser
authored
Merge pull request #161 from ethanglaser/large-scale
Latest configs with cleanup
2 parents 7ed0235 + 75f2f10 commit 9b70f7e

29 files changed

+78
-368
lines changed

‎configs/spmd/large_scale/basic_stats.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd basicstats parameters": {
55
"algorithm": {

‎configs/spmd/large_scale/basic_stats_single.json

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

‎configs/spmd/large_scale/basic_stats_strong.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd basicstats parameters": {
55
"algorithm": {

‎configs/spmd/large_scale/covariance.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd basicstats parameters": {
55
"algorithm": {

‎configs/spmd/large_scale/covariance_strong.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd basicstats parameters": {
55
"algorithm": {

‎configs/spmd/large_scale/dbscan.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"estimator": "DBSCAN",
77
"estimator_methods": {
88
"training": "fit"
9+
},
10+
"estimator_params" : {
11+
"eps": 10, "min_samples": 5
912
}
1013
},
1114
"data": {
@@ -14,7 +17,7 @@
1417
},
1518
"synthetic dataset": {
1619
"data": [
17-
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 100000, "n_features": 10, "centers": 10 }, "algorithm": { "eps": 5, "min_samples": 5 } }
20+
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 100000, "n_features": 100, "centers": 10 } }
1821
]
1922
}
2023
},
@@ -24,7 +27,7 @@
2427
"common dbscan parameters",
2528
"synthetic dataset",
2629
"sklearnex spmd implementation",
27-
"large scale default parameters",
30+
"large scale <=64 parameters",
2831
"spmd dbscan parameters"
2932
]
3033
}

‎configs/spmd/large_scale/dbscan_strong.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,28 @@
66
"estimator": "DBSCAN",
77
"estimator_methods": {
88
"training": "fit"
9-
}
9+
},
10+
"estimator_params" : {
11+
"eps": 10, "min_samples": 5
12+
}
1013
},
1114
"data": {
1215
"dtype": "float64"
1316
}
1417
},
1518
"synthetic dataset": {
1619
"data": [
17-
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 100000, "n_features": 10, "centers": 10 }, "algorithm": { "eps": 5, "min_samples": 5 } }
20+
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 500000, "n_features": 100, "centers": 10 } }
1821
]
1922
}
2023
},
2124
"TEMPLATES": {
2225
"dbscan": {
2326
"SETS": [
27+
"common dbscan parameters",
2428
"synthetic dataset",
2529
"sklearnex spmd implementation",
26-
"large scale strong 32 parameters",
30+
"large scale strong <=64 parameters",
2731
"spmd dbscan parameters"
2832
]
2933
}

‎configs/spmd/large_scale/forest.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd forest classification parameters": {
55
"algorithm": {
6-
"estimator": "RandomForestClassifier"
6+
"estimator": "RandomForestClassifier",
7+
"estimator_methods": { "training": "fit" },
8+
"estimator_params": { "n_estimators": 20, "max_depth": 4 }
79
}
810
},
911
"synthetic data": {
1012
"data": [
11-
{ "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-
{ "source": "make_classification", "split_kwargs": { "train_size": 10000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 11000, "n_features": 1000, "n_classes": 2 }, "algorithm": { "estimator_params": { "n_estimators": 20, "max_depth": 4 } } }
13+
{ "source": "make_classification", "split_kwargs": { "train_size": 500000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 501000, "n_features": 10, "n_classes": 2 } },
14+
{ "source": "make_classification", "split_kwargs": { "train_size": 10000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 11000, "n_features": 1000, "n_classes": 2 } }
1315
]
1416
}
1517
},

‎configs/spmd/large_scale/forest_reg.json

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

‎configs/spmd/large_scale/forest_strong.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd forest classification parameters": {
55
"algorithm": {
6-
"estimator": "RandomForestClassifier"
6+
"estimator": "RandomForestClassifier",
7+
"estimator_methods": { "training": "fit" },
8+
"estimator_params": { "n_estimators": 20, "max_depth": 4 }
79
}
810
},
911
"synthetic data": {
1012
"data": [
11-
{ "source": "make_classification", "split_kwargs": { "train_size": 10000000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 10001000, "n_features": 100, "n_classes": 2 }, "algorithm": { "estimator_params": { "n_estimators": 20, "max_depth": 4 } } }
13+
{ "source": "make_classification", "split_kwargs": { "train_size": 10000000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 10001000, "n_features": 100, "n_classes": 2 } }
1214
]
1315
}
1416
},

0 commit comments

Comments
 (0)