Skip to content

Commit

Permalink
simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb committed Feb 3, 2021
1 parent e951669 commit 876bfe5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 18 deletions.
3 changes: 0 additions & 3 deletions python-package/lightgbm/dask.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,6 @@ def _predict(

class _DaskLGBMModel:

# self._client is set in the constructor of classes that use this mixin
_client: Optional[Client] = None

@property
def client_(self) -> Client:
"""Dask client.
Expand Down
27 changes: 12 additions & 15 deletions tests/python_package_test/test_dask.py
Original file line number Diff line number Diff line change
Expand Up @@ -832,18 +832,15 @@ def f(part):
]
)
def test_dask_classes_and_sklearn_equivalents_have_identical_constructors_except_client_arg(classes):
def _compare_spec(dask_cls, sklearn_cls):
dask_spec = inspect.getfullargspec(dask_cls)
sklearn_spec = inspect.getfullargspec(sklearn_cls)
assert dask_spec.varargs == sklearn_spec.varargs
assert dask_spec.varkw == sklearn_spec.varkw
assert dask_spec.kwonlyargs == sklearn_spec.kwonlyargs
assert dask_spec.kwonlydefaults == sklearn_spec.kwonlydefaults

# "client" should be the only different, and the final argument
assert dask_spec.args[:-1] == sklearn_spec.args
assert dask_spec.defaults[:-1] == sklearn_spec.defaults
assert dask_spec.args[-1] == 'client'
assert dask_spec.defaults[-1] is None

_compare_spec(classes[0], classes[1])
dask_spec = inspect.getfullargspec(classes[0])
sklearn_spec = inspect.getfullargspec(classes[1])
assert dask_spec.varargs == sklearn_spec.varargs
assert dask_spec.varkw == sklearn_spec.varkw
assert dask_spec.kwonlyargs == sklearn_spec.kwonlyargs
assert dask_spec.kwonlydefaults == sklearn_spec.kwonlydefaults

# "client" should be the only different, and the final argument
assert dask_spec.args[:-1] == sklearn_spec.args
assert dask_spec.defaults[:-1] == sklearn_spec.defaults
assert dask_spec.args[-1] == 'client'
assert dask_spec.defaults[-1] is None

0 comments on commit 876bfe5

Please sign in to comment.