Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
ahuber21 committed Dec 17, 2024
1 parent 2f37e08 commit e40cb3f
Show file tree
Hide file tree
Showing 28 changed files with 75 additions and 40 deletions.
1 change: 1 addition & 0 deletions onedal/basic_statistics/basic_statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from abc import ABCMeta, abstractmethod

import numpy as np

from onedal._device_offload import supports_queue

from ..common._backend import bind_default_backend
Expand Down
1 change: 1 addition & 0 deletions onedal/basic_statistics/incremental_basic_statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# ==============================================================================

import numpy as np

from daal4py.sklearn._utils import get_dtype
from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import bind_default_backend
Expand Down
1 change: 1 addition & 0 deletions onedal/cluster/dbscan.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# ===============================================================================

import numpy as np

from daal4py.sklearn._utils import get_dtype, make2d
from onedal._device_offload import supports_queue
from onedal.common._backend import bind_default_backend
Expand Down
4 changes: 3 additions & 1 deletion onedal/cluster/kmeans.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from abc import ABC

import numpy as np

from daal4py.sklearn._utils import daal_check_version
from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.basic_statistics import BasicStatistics
Expand All @@ -27,12 +28,13 @@
if daal_check_version((2023, "P", 200)):
from .kmeans_init import KMeansInit

from onedal import _default_backend
from sklearn.cluster._kmeans import _kmeans_plusplus
from sklearn.exceptions import ConvergenceWarning
from sklearn.metrics.pairwise import euclidean_distances
from sklearn.utils import check_random_state

from onedal import _default_backend

from ..common._mixin import ClusterMixin, TransformerMixin
from ..datatypes import from_table, to_table
from ..utils.validation import _check_array, _is_arraylike_not_scalar, _is_csr
Expand Down
3 changes: 2 additions & 1 deletion onedal/cluster/kmeans_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
# ==============================================================================

import numpy as np
from sklearn.utils import check_random_state

from daal4py.sklearn._utils import daal_check_version
from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import bind_default_backend
from sklearn.utils import check_random_state

from ..datatypes import from_table, to_table
from ..utils.validation import _check_array
Expand Down
1 change: 1 addition & 0 deletions onedal/covariance/covariance.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from abc import ABCMeta

import numpy as np

from daal4py.sklearn._utils import daal_check_version, get_dtype
from onedal._device_offload import supports_queue
from onedal.common._backend import bind_default_backend
Expand Down
1 change: 1 addition & 0 deletions onedal/covariance/incremental_covariance.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# ===============================================================================

import numpy as np

from daal4py.sklearn._utils import daal_check_version
from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import bind_default_backend
Expand Down
1 change: 1 addition & 0 deletions onedal/datatypes/_data_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# ==============================================================================

import numpy as np

from onedal import _default_backend as backend


Expand Down
1 change: 1 addition & 0 deletions onedal/datatypes/tests/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import pytest
import scipy.sparse as sp
from numpy.testing import assert_allclose

from onedal import _default_backend, _dpc_backend
from onedal.datatypes import from_table, to_table
from onedal.utils._dpep_helpers import dpctl_available
Expand Down
1 change: 1 addition & 0 deletions onedal/decomposition/incremental_pca.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# ==============================================================================

import numpy as np

from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import bind_default_backend

Expand Down
5 changes: 3 additions & 2 deletions onedal/decomposition/pca.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
from abc import ABCMeta

import numpy as np
from onedal._device_offload import supports_queue
from onedal.common._backend import bind_default_backend
from sklearn.decomposition._pca import _infer_dimension
from sklearn.utils.extmath import stable_cumsum

from onedal._device_offload import supports_queue
from onedal.common._backend import bind_default_backend

from ..datatypes import from_table, to_table


Expand Down
5 changes: 3 additions & 2 deletions onedal/ensemble/forest.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
from math import ceil

import numpy as np
from sklearn.ensemble import BaseEnsemble
from sklearn.utils import check_random_state

from daal4py.sklearn._utils import daal_check_version
from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import bind_default_backend
from sklearn.ensemble import BaseEnsemble
from sklearn.utils import check_random_state
from sklearnex import get_hyperparameters

from ..common._estimator_checks import _check_is_fitted
Expand Down
1 change: 1 addition & 0 deletions onedal/linear_model/incremental_linear_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# ==============================================================================

import numpy as np

from daal4py.sklearn._utils import get_dtype
from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import bind_default_backend
Expand Down
1 change: 1 addition & 0 deletions onedal/linear_model/linear_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from numbers import Number

import numpy as np

from daal4py.sklearn._utils import daal_check_version, get_dtype, make2d
from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import bind_default_backend
Expand Down
1 change: 1 addition & 0 deletions onedal/linear_model/logistic_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from numbers import Number

import numpy as np

from daal4py.sklearn._utils import daal_check_version, get_dtype, make2d
from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import bind_default_backend
Expand Down
1 change: 1 addition & 0 deletions onedal/primitives/kernel_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import queue

import numpy as np

from onedal import _default_backend as backend
from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import BackendFunction
Expand Down
12 changes: 9 additions & 3 deletions onedal/svm/svm.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,21 @@
from enum import Enum

import numpy as np
from scipy import sparse as sp

from onedal._device_offload import SyclQueueManager, supports_queue
from onedal.common._backend import bind_default_backend
from scipy import sparse as sp

from ..common._estimator_checks import _check_is_fitted
from ..common._mixin import ClassifierMixin, RegressorMixin
from ..datatypes import from_table, to_table
from ..utils.validation import (_check_array, _check_n_features, _check_X_y,
_column_or_1d, _validate_targets)
from ..utils.validation import (
_check_array,
_check_n_features,
_check_X_y,
_column_or_1d,
_validate_targets,
)


class SVMtype(Enum):
Expand Down
7 changes: 4 additions & 3 deletions onedal/svm/tests/test_csr_svm.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
import numpy as np
import pytest
from numpy.testing import assert_array_almost_equal, assert_array_equal
from scipy import sparse as sp
from sklearn import datasets
from sklearn.datasets import make_classification

from onedal.common._mixin import ClassifierMixin
from onedal.svm import SVC, SVR
from onedal.tests.utils._device_selection import (
get_queues,
pass_if_not_implemented_for_gpu,
)
from scipy import sparse as sp
from sklearn import datasets
from sklearn.datasets import make_classification


def check_svm_model_equal(
Expand Down
11 changes: 6 additions & 5 deletions onedal/svm/tests/test_nusvc.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@
import numpy as np
import pytest
from numpy.testing import assert_array_almost_equal, assert_array_equal
from onedal.svm import NuSVC
from onedal.tests.utils._device_selection import (
get_queues,
pass_if_not_implemented_for_gpu,
)
from sklearn import datasets
from sklearn.datasets import make_blobs
from sklearn.metrics.pairwise import rbf_kernel
from sklearn.model_selection import train_test_split
from sklearn.svm import NuSVC as SklearnNuSVC

from onedal.svm import NuSVC
from onedal.tests.utils._device_selection import (
get_queues,
pass_if_not_implemented_for_gpu,
)


def _test_libsvm_parameters(queue, array_constr, dtype):
X = array_constr([[-2, -1], [-1, -1], [-1, -2], [1, 1], [1, 2], [2, 1]], dtype=dtype)
Expand Down
7 changes: 4 additions & 3 deletions onedal/svm/tests/test_nusvr.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@
import numpy as np
import pytest
from numpy.testing import assert_allclose, assert_array_almost_equal, assert_array_equal
from sklearn import datasets
from sklearn.metrics.pairwise import rbf_kernel
from sklearn.svm import NuSVR as SklearnNuSVR

from onedal.svm import NuSVR
from onedal.tests.utils._device_selection import (
get_queues,
pass_if_not_implemented_for_gpu,
)
from sklearn import datasets
from sklearn.metrics.pairwise import rbf_kernel
from sklearn.svm import NuSVR as SklearnNuSVR

synth_params = {"n_samples": 500, "n_features": 100, "random_state": 42}

Expand Down
8 changes: 5 additions & 3 deletions onedal/utils/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
from numbers import Integral

import numpy as np
from scipy import sparse as sp

from onedal._device_offload import supports_queue
from onedal.common._backend import BackendFunction
from scipy import sparse as sp

if np.lib.NumpyVersion(np.__version__) >= np.lib.NumpyVersion("2.0.0a0"):
# numpy_version >= 2.0
Expand All @@ -30,13 +31,14 @@
# numpy_version < 2.0
from numpy import VisibleDeprecationWarning

from sklearn.preprocessing import LabelEncoder
from sklearn.utils.validation import check_array

from daal4py.sklearn.utils.validation import (
_assert_all_finite as _daal4py_assert_all_finite,
)
from onedal import _default_backend as backend
from onedal.datatypes import to_table
from sklearn.preprocessing import LabelEncoder
from sklearn.utils.validation import check_array


class DataConversionWarning(UserWarning):
Expand Down
7 changes: 4 additions & 3 deletions sklearnex/basic_statistics/incremental_basic_statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
# ==============================================================================

import numpy as np
from sklearn.base import BaseEstimator
from sklearn.utils import check_array, gen_batches
from sklearn.utils.validation import _check_sample_weight

from daal4py.sklearn._n_jobs_support import control_n_jobs
from daal4py.sklearn._utils import sklearn_check_version
from onedal.basic_statistics import (
IncrementalBasicStatistics as onedal_IncrementalBasicStatistics,
)
from sklearn.base import BaseEstimator
from sklearn.utils import check_array, gen_batches
from sklearn.utils.validation import _check_sample_weight

from .._device_offload import dispatch
from .._utils import IntelEstimator, PatchingConditionsChain
Expand Down
11 changes: 6 additions & 5 deletions sklearnex/covariance/incremental_covariance.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,18 @@
import warnings

import numpy as np
from daal4py.sklearn._n_jobs_support import control_n_jobs
from daal4py.sklearn._utils import daal_check_version, sklearn_check_version
from onedal.covariance import (
IncrementalEmpiricalCovariance as onedal_IncrementalEmpiricalCovariance,
)
from scipy import linalg
from sklearn.base import BaseEstimator, clone
from sklearn.covariance import EmpiricalCovariance as _sklearn_EmpiricalCovariance
from sklearn.covariance import log_likelihood
from sklearn.utils import check_array, gen_batches
from sklearn.utils.validation import _num_features, check_is_fitted

from daal4py.sklearn._n_jobs_support import control_n_jobs
from daal4py.sklearn._utils import daal_check_version, sklearn_check_version
from onedal.covariance import (
IncrementalEmpiricalCovariance as onedal_IncrementalEmpiricalCovariance,
)
from sklearnex import config_context

from .._device_offload import dispatch, wrap_output_data
Expand Down
13 changes: 7 additions & 6 deletions sklearnex/covariance/tests/test_incremental_covariance.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@

import numpy as np
import pytest
from daal4py.sklearn._utils import daal_check_version
from numpy.linalg import slogdet
from numpy.testing import assert_allclose
from onedal.tests.utils._dataframes_support import (
_as_numpy,
_convert_to_dataframe,
get_dataframes_and_queues,
)
from scipy.linalg import pinvh
from sklearn.covariance.tests.test_covariance import (
test_covariance,
Expand All @@ -43,6 +37,13 @@
from sklearn.datasets import load_diabetes
from sklearn.decomposition import PCA

from daal4py.sklearn._utils import daal_check_version
from onedal.tests.utils._dataframes_support import (
_as_numpy,
_convert_to_dataframe,
get_dataframes_and_queues,
)


@pytest.mark.parametrize("dataframe,queue", get_dataframes_and_queues())
@pytest.mark.parametrize("dtype", [np.float32, np.float64])
Expand Down
3 changes: 2 additions & 1 deletion sklearnex/linear_model/ridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
import numbers

import numpy as np
from daal4py.sklearn._n_jobs_support import control_n_jobs
from scipy.sparse import issparse
from sklearn.linear_model import Ridge as _sklearn_Ridge
from sklearn.metrics import r2_score
from sklearn.utils.validation import check_is_fitted

from daal4py.sklearn._n_jobs_support import control_n_jobs

if not sklearn_check_version("1.2"):
from sklearn.linear_model._base import _deprecate_normalize
if sklearn_check_version("1.1") and not sklearn_check_version("1.2"):
Expand Down
5 changes: 3 additions & 2 deletions sklearnex/preview/decomposition/incremental_pca.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
# ===============================================================================

import numpy as np
from sklearn.decomposition import IncrementalPCA as _sklearn_IncrementalPCA
from sklearn.utils import check_array, gen_batches

from daal4py.sklearn._n_jobs_support import control_n_jobs
from daal4py.sklearn._utils import sklearn_check_version
from onedal.decomposition import IncrementalPCA as onedal_IncrementalPCA
from sklearn.decomposition import IncrementalPCA as _sklearn_IncrementalPCA
from sklearn.utils import check_array, gen_batches

from ..._device_offload import dispatch, wrap_output_data
from ..._utils import PatchingConditionsChain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import numpy as np
import pytest
from numpy.testing import assert_allclose

from onedal.basic_statistics.tests.utils import options_and_tests
from onedal.tests.utils._dataframes_support import (
_convert_to_dataframe,
Expand Down
1 change: 1 addition & 0 deletions sklearnex/spmd/cluster/tests/test_kmeans_spmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import numpy as np
import pytest
from numpy.testing import assert_allclose

from onedal.tests.utils._dataframes_support import (
_convert_to_dataframe,
get_dataframes_and_queues,
Expand Down

0 comments on commit e40cb3f

Please sign in to comment.