Skip to content

Latest configs with cleanup #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 16, 2024
Merged

Latest configs with cleanup #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8025719
dbscan large scale support and logreg details
ethanglaser Oct 7, 2024
105d203
merge changes from root and add config updates
ethanglaser Oct 8, 2024
d732e0f
rebase
ethanglaser Oct 15, 2024
e68edd5
configs nearly finalized + minor job updates
ethanglaser Oct 15, 2024
e834493
<=
ethanglaser Oct 16, 2024
75f2f10
lint
ethanglaser Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configs/spmd/large_scale/basic_stats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd basicstats parameters": {
"algorithm": {
Expand Down
30 changes: 0 additions & 30 deletions configs/spmd/large_scale/basic_stats_single.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion configs/spmd/large_scale/basic_stats_strong.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd basicstats parameters": {
"algorithm": {
Expand Down
2 changes: 1 addition & 1 deletion configs/spmd/large_scale/covariance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd basicstats parameters": {
"algorithm": {
Expand Down
2 changes: 1 addition & 1 deletion configs/spmd/large_scale/covariance_strong.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd basicstats parameters": {
"algorithm": {
Expand Down
7 changes: 5 additions & 2 deletions configs/spmd/large_scale/dbscan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"estimator": "DBSCAN",
"estimator_methods": {
"training": "fit"
},
"estimator_params" : {
"eps": 10, "min_samples": 5
}
},
"data": {
Expand All @@ -14,7 +17,7 @@
},
"synthetic dataset": {
"data": [
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 100000, "n_features": 10, "centers": 10 }, "algorithm": { "eps": 5, "min_samples": 5 } }
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 100000, "n_features": 100, "centers": 10 } }
]
}
},
Expand All @@ -24,7 +27,7 @@
"common dbscan parameters",
"synthetic dataset",
"sklearnex spmd implementation",
"large scale default parameters",
"large scale <=64 parameters",
"spmd dbscan parameters"
]
}
Expand Down
10 changes: 7 additions & 3 deletions configs/spmd/large_scale/dbscan_strong.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,28 @@
"estimator": "DBSCAN",
"estimator_methods": {
"training": "fit"
}
},
"estimator_params" : {
"eps": 10, "min_samples": 5
}
},
"data": {
"dtype": "float64"
}
},
"synthetic dataset": {
"data": [
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 100000, "n_features": 10, "centers": 10 }, "algorithm": { "eps": 5, "min_samples": 5 } }
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 500000, "n_features": 100, "centers": 10 } }
]
}
},
"TEMPLATES": {
"dbscan": {
"SETS": [
"common dbscan parameters",
"synthetic dataset",
"sklearnex spmd implementation",
"large scale strong 32 parameters",
"large scale strong <=64 parameters",
"spmd dbscan parameters"
]
}
Expand Down
10 changes: 6 additions & 4 deletions configs/spmd/large_scale/forest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd forest classification parameters": {
"algorithm": {
"estimator": "RandomForestClassifier"
"estimator": "RandomForestClassifier",
"estimator_methods": { "training": "fit" },
"estimator_params": { "n_estimators": 20, "max_depth": 4 }
}
},
"synthetic data": {
"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 } } },
{ "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 } } }
{ "source": "make_classification", "split_kwargs": { "train_size": 500000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 501000, "n_features": 10, "n_classes": 2 } },
{ "source": "make_classification", "split_kwargs": { "train_size": 10000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 11000, "n_features": 1000, "n_classes": 2 } }
]
}
},
Expand Down
27 changes: 0 additions & 27 deletions configs/spmd/large_scale/forest_reg.json
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions configs/spmd/large_scale/forest_strong.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../spmd/stats_covariance.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd forest classification parameters": {
"algorithm": {
"estimator": "RandomForestClassifier"
"estimator": "RandomForestClassifier",
"estimator_methods": { "training": "fit" },
"estimator_params": { "n_estimators": 20, "max_depth": 4 }
}
},
"synthetic data": {
"data": [
{ "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 } } }
{ "source": "make_classification", "split_kwargs": { "train_size": 10000000, "test_size": 1000 }, "generation_kwargs": { "n_samples": 10001000, "n_features": 100, "n_classes": 2 } }
]
}
},
Expand Down
27 changes: 0 additions & 27 deletions configs/spmd/large_scale/forest_strong_reg.json
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions configs/spmd/large_scale/kmeans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../regular/kmeans.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd kmeans parameters": {
"algorithm": {
Expand All @@ -12,8 +12,8 @@
},
"synthetic data": {
"data": [
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 3750000, "n_features": 10, "centers": 10 }, "algorithm": { "n_clusters": 10, "max_iter": 10 } },
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 18750, "n_features": 1000, "centers": 10 }, "algorithm": { "n_clusters": 10, "max_iter": 10 } }
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 5000000, "n_features": 10, "centers": 10 }, "algorithm": { "n_clusters": 10, "max_iter": 10 } },
{ "source": "make_blobs", "generation_kwargs": { "n_samples": 30000, "n_features": 1000, "centers": 10 }, "algorithm": { "n_clusters": 10, "max_iter": 10 } }
]
}
},
Expand Down
4 changes: 2 additions & 2 deletions configs/spmd/large_scale/kmeans_strong.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../regular/kmeans.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd kmeans parameters": {
"algorithm": {
Expand All @@ -23,7 +23,7 @@
"SETS": [
"synthetic data",
"sklearnex spmd implementation",
"large scale strong 32 parameters",
"large scale strong <=64 parameters",
"spmd kmeans parameters"
]
}
Expand Down
31 changes: 0 additions & 31 deletions configs/spmd/large_scale/kmeans_strong_2.json
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions configs/spmd/large_scale/knn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../regular/knn.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd knn cls parameters": {
"algorithm": {
Expand All @@ -19,15 +19,13 @@
},
"synthetic classification data": {
"data": [
{ "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" } },
{ "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" } }
{ "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" } }
]
}
},
"TEMPLATES": {
"knn classifier": {
"SETS": [
"common knn parameters",
"synthetic classification data",
"sklearnex spmd implementation",
"large scale 2k parameters",
Expand Down
8 changes: 3 additions & 5 deletions configs/spmd/large_scale/knn_strong.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"INCLUDE": ["../../common/sklearn.json", "../../regular/knn.json", "large_scale.json"],
"INCLUDE": ["../../common/sklearn.json", "large_scale.json"],
"PARAMETERS_SETS": {
"spmd knn cls parameters": {
"algorithm": {
Expand All @@ -19,18 +19,16 @@
},
"synthetic classification data": {
"data": [
{ "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" } },
{ "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" } }
{ "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" } }
]
}
},
"TEMPLATES": {
"knn classifier": {
"SETS": [
"common knn parameters",
"synthetic classification data",
"sklearnex spmd implementation",
"large scale strong 32 parameters",
"large scale strong <=64 parameters",
"spmd knn cls parameters"
]
}
Expand Down
Loading
Loading