Skip to content

Commit 2f0d2db

Browse files
Linear Regression out of preview (#1557)
* changing import to preview * test_preview_linear upd * no assert daal4py in module * actual removal * address public and private CI fails * cleanup additional mentions of preview * isorted * minor paths update * adding pytest args to function * alignment with #1508 * Update sklearnex/tests/test_memory_usage.py Co-authored-by: Alexander Andreev <alexander.andreev@intel.com> * Update sklearnex/tests/test_memory_usage.py Co-authored-by: Alexander Andreev <alexander.andreev@intel.com> * some cpu deselected test removals * restoring one deselected for pub CI * restoring one deselected for private CI * temp debugging * another temp for debug * debug removal * alphabetical tweak after merging * minor space * deselected pca tweak --------- Co-authored-by: Alexander Andreev <alexander.andreev@intel.com>
1 parent d437d54 commit 2f0d2db

File tree

12 files changed

+395
-495
lines changed

12 files changed

+395
-495
lines changed

deselected_tests.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,10 @@ deselected_tests:
239239
- tests/test_multioutput.py::test_multi_output_classification
240240

241241
# Linear Regression - badly defined equation system
242-
- ensemble/tests/test_stacking.py::test_stacking_prefit[StackingRegressor-DummyRegressor-predict-final_estimator1-X1-y1]
243242
- tests/test_common.py::test_estimators[RandomForestClassifier()-check_requires_y_none]
244243
- tests/test_common.py::test_estimators[RandomForestRegressor()-check_requires_y_none]
245-
- tests/test_common.py::test_estimators[LinearRegression()-check_requires_y_none]
246244

247245
# Linear Regression - minor mismatches in error/warning messages
248-
- tree/tests/test_export.py::test_precision
249246
- model_selection/tests/test_search.py::test_grid_search_pipeline_steps
250247
- linear_model/tests/test_base.py::test_linear_regression_pd_sparse_dataframe_warning
251248

@@ -1192,7 +1189,7 @@ gpu:
11921189
- tests/test_common.py::test_check_n_features_in_after_fitting[DBSCAN()]
11931190
- tests/test_common.py::test_check_n_features_in_after_fitting[SVC()]
11941191
# originated with pca dpctl/dpnp fit, to be re-assesed with pca out-of-preview
1195-
- test_pca_n_components_mostly_explained_variance_ratio
1192+
- decomposition/tests/test_pca.py::test_pca_n_components_mostly_explained_variance_ratio
11961193

11971194
preview:
11981195
- cluster/tests/test_k_means.py::test_kmeans_elkan_results

setup_sklearnex.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
"sklearnex.preview",
9797
"sklearnex.preview.cluster",
9898
"sklearnex.preview.decomposition",
99-
"sklearnex.preview.linear_model",
10099
"sklearnex.svm",
101100
"sklearnex.utils",
102101
]

sklearnex/dispatcher.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def get_patch_map():
6868
from .ensemble import ExtraTreesRegressor as ExtraTreesRegressor_sklearnex
6969
from .ensemble import RandomForestClassifier as RandomForestClassifier_sklearnex
7070
from .ensemble import RandomForestRegressor as RandomForestRegressor_sklearnex
71+
from .linear_model import LinearRegression as LinearRegression_sklearnex
7172
from .neighbors import KNeighborsClassifier as KNeighborsClassifier_sklearnex
7273
from .neighbors import KNeighborsRegressor as KNeighborsRegressor_sklearnex
7374
from .neighbors import LocalOutlierFactor as LocalOutlierFactor_sklearnex
@@ -76,7 +77,6 @@ def get_patch_map():
7677
# Preview classes for patching
7778
from .preview.cluster import KMeans as KMeans_sklearnex
7879
from .preview.decomposition import PCA as PCA_sklearnex
79-
from .preview.linear_model import LinearRegression as LinearRegression_sklearnex
8080
from .svm import SVC as SVC_sklearnex
8181
from .svm import SVR as SVR_sklearnex
8282
from .svm import NuSVC as NuSVC_sklearnex
@@ -88,21 +88,6 @@ def get_patch_map():
8888
mapping.pop("pca")
8989
mapping["pca"] = [[(decomposition_module, "PCA", PCA_sklearnex), None]]
9090

91-
# Linear Regression
92-
mapping.pop("linear")
93-
mapping.pop("linearregression")
94-
mapping["linear"] = [
95-
[
96-
(
97-
linear_model_module,
98-
"LinearRegression",
99-
LinearRegression_sklearnex,
100-
),
101-
None,
102-
]
103-
]
104-
mapping["linearregression"] = mapping["linear"]
105-
10691
# KMeans
10792
mapping.pop("kmeans")
10893
mapping["kmeans"] = [
@@ -128,6 +113,21 @@ def get_patch_map():
128113
mapping["nusvr"] = [[(svm_module, "NuSVR", NuSVR_sklearnex), None]]
129114
mapping["nusvc"] = [[(svm_module, "NuSVC", NuSVC_sklearnex), None]]
130115

116+
# Linear Regression
117+
mapping.pop("linear")
118+
mapping.pop("linearregression")
119+
mapping["linear"] = [
120+
[
121+
(
122+
linear_model_module,
123+
"LinearRegression",
124+
LinearRegression_sklearnex,
125+
),
126+
None,
127+
]
128+
]
129+
mapping["linearregression"] = mapping["linear"]
130+
131131
# kNN
132132
mapping.pop("knn_classifier")
133133
mapping.pop("kneighborsclassifier")

0 commit comments

Comments
 (0)