Skip to content

Commit e68edd5

Browse files
ethanglaserethanglaser
committed
configs nearly finalized + minor job updates
1 parent d732e0f commit e68edd5

28 files changed

+59
-347
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": 100, "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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@
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": 500000, "n_features": 100, "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
},

‎configs/spmd/large_scale/forest.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +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": {
66
"estimator": "RandomForestClassifier",
7-
"estimator_methods": { "training": "fit" }
7+
"estimator_methods": { "training": "fit" },
8+
"estimator_params": { "n_estimators": 20, "max_depth": 4 }
89
}
910
},
1011
"synthetic data": {
1112
"data": [
12-
{ "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 } } },
13-
{ "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 } }
1415
]
1516
}
1617
},

‎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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +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": {
66
"estimator": "RandomForestClassifier",
7-
"estimator_methods": { "training": "fit" }
7+
"estimator_methods": { "training": "fit" },
8+
"estimator_params": { "n_estimators": 20, "max_depth": 4 }
89
}
910
},
1011
"synthetic data": {
1112
"data": [
12-
{ "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 } }
1314
]
1415
}
1516
},

‎configs/spmd/large_scale/forest_strong_reg.json

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

‎configs/spmd/large_scale/kmeans.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../regular/kmeans.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd kmeans parameters": {
55
"algorithm": {
@@ -12,8 +12,8 @@
1212
},
1313
"synthetic data": {
1414
"data": [
15-
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 3750000, "n_features": 10, "centers": 10 }, "algorithm": { "n_clusters": 10, "max_iter": 10 } },
16-
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 18750, "n_features": 1000, "centers": 10 }, "algorithm": { "n_clusters": 10, "max_iter": 10 } }
15+
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 5000000, "n_features": 10, "centers": 10 }, "algorithm": { "n_clusters": 10, "max_iter": 10 } },
16+
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 30000, "n_features": 1000, "centers": 10 }, "algorithm": { "n_clusters": 10, "max_iter": 10 } }
1717
]
1818
}
1919
},

‎configs/spmd/large_scale/kmeans_strong.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../regular/kmeans.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd kmeans parameters": {
55
"algorithm": {
@@ -23,7 +23,7 @@
2323
"SETS": [
2424
"synthetic data",
2525
"sklearnex spmd implementation",
26-
"large scale strong 32 parameters",
26+
"large scale strong <64 parameters",
2727
"spmd kmeans parameters"
2828
]
2929
}

‎configs/spmd/large_scale/kmeans_strong_2.json

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

‎configs/spmd/large_scale/knn.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../regular/knn.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd knn cls parameters": {
55
"algorithm": {
@@ -19,15 +19,13 @@
1919
},
2020
"synthetic classification data": {
2121
"data": [
22-
{ "source": "make_classification", "split_kwargs": { "train_size": 50000, "test_size": 5000 }, "generation_kwargs": { "n_samples": 55000, "n_features": 100, "n_classes": 2, "n_informative": "[SPECIAL_VALUE]0.5" } },
23-
{ "source": "make_classification", "split_kwargs": { "train_size": 5000, "test_size": 50000 }, "generation_kwargs": { "n_samples": 55000, "n_features": 100, "n_classes": 2, "n_informative": "[SPECIAL_VALUE]0.5" } }
22+
{ "source": "make_classification", "split_kwargs": { "train_size": 5000000, "test_size": 5000 }, "generation_kwargs": { "n_samples": 5005000, "n_features": 100, "n_classes": 2, "n_informative": "[SPECIAL_VALUE]0.5" } }
2423
]
2524
}
2625
},
2726
"TEMPLATES": {
2827
"knn classifier": {
2928
"SETS": [
30-
"common knn parameters",
3129
"synthetic classification data",
3230
"sklearnex spmd implementation",
3331
"large scale 2k parameters",

‎configs/spmd/large_scale/knn_strong.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"INCLUDE": ["../../common/sklearn.json", "../../regular/knn.json", "large_scale.json"],
2+
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
33
"PARAMETERS_SETS": {
44
"spmd knn cls parameters": {
55
"algorithm": {
@@ -19,18 +19,16 @@
1919
},
2020
"synthetic classification data": {
2121
"data": [
22-
{ "source": "make_classification", "split_kwargs": { "train_size": 500000, "test_size": 5000 }, "generation_kwargs": { "n_samples": 505000, "n_features": 100, "n_classes": 2, "n_informative": "[SPECIAL_VALUE]0.5" } },
23-
{ "source": "make_classification", "split_kwargs": { "train_size": 5000, "test_size": 500000 }, "generation_kwargs": { "n_samples": 505000, "n_features": 100, "n_classes": 2, "n_informative": "[SPECIAL_VALUE]0.5" } }
22+
{ "source": "make_classification", "split_kwargs": { "train_size": 500000, "test_size": 1000000 }, "generation_kwargs": { "n_samples": 1500000, "n_features": 100, "n_classes": 2, "n_informative": "[SPECIAL_VALUE]0.5" } }
2423
]
2524
}
2625
},
2726
"TEMPLATES": {
2827
"knn classifier": {
2928
"SETS": [
30-
"common knn parameters",
3129
"synthetic classification data",
3230
"sklearnex spmd implementation",
33-
"large scale strong 32 parameters",
31+
"large scale strong <64 parameters",
3432
"spmd knn cls parameters"
3533
]
3634
}

0 commit comments

Comments
 (0)