Skip to content

re-add preview for lasso/enet #224

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

Open
ethanglaser wants to merge 2 commits into
base: main
Choose a base branch
from
Open

re-add preview for lasso/enet #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fc13b5
Guard n_jobs access after conditional column drop
ethanglaser Sep 10, 2026
458a95c
re-add preview for lasso/enet
ethanglaser Sep 9, 2026
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
6 changes: 6 additions & 0 deletions configs/common/sklearn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
"data": { "format": "dpnp", "order": "C" }
}
],
"sklearn-ex[preview,cpu] implementations": {
"algorithm": [
{ "library": "sklearn", "device": "cpu" },
{ "library": "sklearnex.preview", "device": "cpu" }
]
},
"sklearnex spmd implementation": {
"algorithm": {
"library": "sklearnex.spmd",
Expand Down
4 changes: 2 additions & 2 deletions configs/regular/linear_model.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
]
},
"sklearn lasso": {
"SETS": ["sklearn-ex[cpu] implementations", "common lasso parameters", "regression datasets"]
"SETS": ["sklearn-ex[preview,cpu] implementations", "common lasso parameters", "regression datasets"]
},
"sklearn elasticnet": {
"SETS": ["sklearn-ex[cpu] implementations", "common elasticnet parameters", "regression datasets"]
"SETS": ["sklearn-ex[preview,cpu] implementations", "common elasticnet parameters", "regression datasets"]
},
"cuml linear": {
"SETS": ["cuml implementation", "common linear parameters", "cuml L2 parameters", "regression datasets"]
Expand Down
18 changes: 17 additions & 1 deletion configs/testing/azure-pipelines-ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
},
{
"algorithm": {
"estimator": ["LinearRegression", "Ridge", "Lasso", "ElasticNet"]
"estimator": ["LinearRegression", "Ridge"]
}
},
{
Expand All @@ -116,11 +116,27 @@
}
}
}
],
"preview algorithms": [
{
"algorithm": {
"estimator": ["Lasso", "ElasticNet"]
}
}
]
},
"TEMPLATES": {
"test": {
"SETS": ["sklearn-ex[cpu] implementations", "common parameters", "data formats", "datasets", "algorithms"]
},
"test preview": {
"SETS": [
"sklearn-ex[preview,cpu] implementations",
"common parameters",
"data formats",
"datasets",
"preview algorithms"
]
}
}
}
4 changes: 2 additions & 2 deletions configs/weekly/linear_model.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
]
},
"sklearn lasso": {
"SETS": ["sklearn-ex[cpu] implementations", "common lasso parameters", "regression datasets"]
"SETS": ["sklearn-ex[preview,cpu] implementations", "common lasso parameters", "regression datasets"]
},
"sklearn elasticnet": {
"SETS": ["sklearn-ex[cpu] implementations", "common elasticnet parameters", "regression datasets"]
"SETS": ["sklearn-ex[preview,cpu] implementations", "common elasticnet parameters", "regression datasets"]
},
"cuml linear": {
"SETS": ["cuml implementation", "common linear parameters", "cuml L2 parameters", "regression datasets"]
Expand Down
2 changes: 1 addition & 1 deletion sklbench/report/compatibility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def transform_results_to_compatible(results: pd.DataFrame):
],
)
# auto-assigned `n_jobs` drop for different CPUs
if results["n_jobs"].unique().size > 1:
if "n_jobs" in results.columns and results["n_jobs"].unique().size > 1:
results.drop(
inplace=True,
errors="ignore",
Expand Down
Loading