From 15e56320350dea162683bd25c5c2b7f6c2414a1b Mon Sep 17 00:00:00 2001 From: PivovarA Date: Wed, 7 Apr 2021 15:36:45 +0300 Subject: [PATCH] replace daal4py with sklearnex --- src/dbs_all/dbs_patch.py | 7 +++---- src/kmeans_all/kmeans_patch.py | 9 +++------ src/kmeans_all/kmeans_patch_training.py | 9 +++------ src/lm_all/lm_patch.py | 5 ++--- src/lm_all/lm_patch_training.py | 5 +++-- src/logit_all/logit_patch.py | 8 +++----- src/logit_all/logit_patch_training.py | 8 +++----- src/rf_all/rf_patch.py | 7 +++---- src/rf_all/rf_patch_training.py | 7 +++---- 9 files changed, 26 insertions(+), 39 deletions(-) diff --git a/src/dbs_all/dbs_patch.py b/src/dbs_all/dbs_patch.py index bd87142..c9ffc63 100644 --- a/src/dbs_all/dbs_patch.py +++ b/src/dbs_all/dbs_patch.py @@ -1,13 +1,12 @@ from timeit import default_timer as timer +from sklearnex import patch_sklearn +patch_sklearn() + from sklearn.metrics import mean_squared_error -import daal4py as d4p import numpy as np import pandas as pd - -import daal4py.sklearn -daal4py.sklearn.patch_sklearn() from sklearn.cluster import DBSCAN import common diff --git a/src/kmeans_all/kmeans_patch.py b/src/kmeans_all/kmeans_patch.py index 8fa8552..0df35bf 100644 --- a/src/kmeans_all/kmeans_patch.py +++ b/src/kmeans_all/kmeans_patch.py @@ -1,16 +1,13 @@ from timeit import default_timer as timer -import xgboost as xgb +from sklearnex import patch_sklearn +patch_sklearn() + from sklearn.metrics import mean_squared_error -import daal4py as d4p import numpy as np import pandas as pd import common - - -import daal4py.sklearn -daal4py.sklearn.patch_sklearn() from sklearn.cluster import KMeans kmeans_kwargs = { diff --git a/src/kmeans_all/kmeans_patch_training.py b/src/kmeans_all/kmeans_patch_training.py index ba597bd..07809d1 100644 --- a/src/kmeans_all/kmeans_patch_training.py +++ b/src/kmeans_all/kmeans_patch_training.py @@ -1,16 +1,13 @@ from timeit import default_timer as timer -import xgboost as xgb +from sklearnex import patch_sklearn +patch_sklearn() + from sklearn.metrics import mean_squared_error -import daal4py as d4p import numpy as np import pandas as pd import common - - -import daal4py.sklearn -daal4py.sklearn.patch_sklearn() from sklearn.cluster import KMeans kmeans_kwargs = { diff --git a/src/lm_all/lm_patch.py b/src/lm_all/lm_patch.py index 988ba56..db54cab 100644 --- a/src/lm_all/lm_patch.py +++ b/src/lm_all/lm_patch.py @@ -1,7 +1,6 @@ -import daal4py as d4p +from sklearnex import patch_sklearn +patch_sklearn() -import daal4py.sklearn -daal4py.sklearn.patch_sklearn() from sklearn.linear_model import LinearRegression from timeit import default_timer as timer diff --git a/src/lm_all/lm_patch_training.py b/src/lm_all/lm_patch_training.py index a913608..06ad603 100644 --- a/src/lm_all/lm_patch_training.py +++ b/src/lm_all/lm_patch_training.py @@ -1,6 +1,7 @@ -import numpy as np -from daal4py.sklearn import patch_sklearn +from sklearnex import patch_sklearn patch_sklearn() + +import numpy as np from sklearn.linear_model import LinearRegression from timeit import default_timer as timer from sklearn.metrics import mean_squared_error diff --git a/src/logit_all/logit_patch.py b/src/logit_all/logit_patch.py index f4ec836..bca67b9 100644 --- a/src/logit_all/logit_patch.py +++ b/src/logit_all/logit_patch.py @@ -1,15 +1,13 @@ +from sklearnex import patch_sklearn +patch_sklearn() + from timeit import default_timer as timer -import xgboost as xgb from sklearn.metrics import mean_squared_error -import daal4py as d4p import numpy as np import pandas as pd import common - -import daal4py.sklearn -daal4py.sklearn.patch_sklearn() from sklearn.linear_model import LogisticRegression diff --git a/src/logit_all/logit_patch_training.py b/src/logit_all/logit_patch_training.py index 5010bc8..78df1c7 100644 --- a/src/logit_all/logit_patch_training.py +++ b/src/logit_all/logit_patch_training.py @@ -1,17 +1,15 @@ +from sklearnex import patch_sklearn +patch_sklearn() + from timeit import default_timer as timer -import xgboost as xgb from sklearn.metrics import mean_squared_error -import daal4py as d4p import numpy as np import pandas as pd import common - NUM_LOOPS = 100 -import daal4py.sklearn -daal4py.sklearn.patch_sklearn() from sklearn.linear_model import LogisticRegression diff --git a/src/rf_all/rf_patch.py b/src/rf_all/rf_patch.py index 75318f4..9a23a98 100644 --- a/src/rf_all/rf_patch.py +++ b/src/rf_all/rf_patch.py @@ -1,14 +1,13 @@ +from sklearnex import patch_sklearn +patch_sklearn() + from timeit import default_timer as timer -#import xgboost as xgb from sklearn.metrics import mean_squared_error -import daal4py as d4p import numpy as np import pandas as pd import common -import daal4py.sklearn -daal4py.sklearn.patch_sklearn() from sklearn.ensemble import RandomForestRegressor NUM_LOOPS = 100 diff --git a/src/rf_all/rf_patch_training.py b/src/rf_all/rf_patch_training.py index 297c905..0771256 100644 --- a/src/rf_all/rf_patch_training.py +++ b/src/rf_all/rf_patch_training.py @@ -1,14 +1,13 @@ +from sklearnex import patch_sklearn +patch_sklearn() + from timeit import default_timer as timer -#import xgboost as xgb from sklearn.metrics import mean_squared_error -import daal4py as d4p import numpy as np import pandas as pd import common -import daal4py.sklearn -daal4py.sklearn.patch_sklearn() from sklearn.ensemble import RandomForestRegressor NUM_LOOPS = 100