Skip to content

FEAT add scikit-learn wrappers #20599

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

Merged
merged 26 commits into from
Dec 12, 2024
Merged

FEAT add scikit-learn wrappers #20599

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6178e35
FEAT add scikit-learn wrappers
adrinjalali Dec 5, 2024
9a4b999
import cleanup
adrinjalali Dec 5, 2024
e14ec2b
run black
adrinjalali Dec 5, 2024
77d0975
linters
adrinjalali Dec 5, 2024
5b28b90
lint
adrinjalali Dec 5, 2024
e450bf1
add scikit-learn to requirements-common
adrinjalali Dec 5, 2024
f73c5e2
generate public api
adrinjalali Dec 5, 2024
c5aa0ea
fix tests for sklearn 1.5
adrinjalali Dec 5, 2024
999c598
check fixes
adrinjalali Dec 5, 2024
5d9bd01
Merge remote-tracking branch 'upstream/master' into wrapper
adrinjalali Dec 5, 2024
a91b475
skip numpy tests
adrinjalali Dec 6, 2024
ab1d0ea
xfail instead of skip
adrinjalali Dec 6, 2024
4f3d7ad
apply review comments
adrinjalali Dec 9, 2024
425b940
Merge remote-tracking branch 'upstream/master' into wrapper
adrinjalali Dec 9, 2024
7f9dd79
change names to SKL* and add transformer example
adrinjalali Dec 10, 2024
9eebe2d
fix API and imports
adrinjalali Dec 10, 2024
8e784fa
fix for new sklearn
adrinjalali Dec 10, 2024
4c26931
sklearn1.6 test
adrinjalali Dec 10, 2024
6289a8f
review comments and remove random_state
adrinjalali Dec 10, 2024
a958d98
Merge remote-tracking branch 'upstream/master' into wrapper
adrinjalali Dec 10, 2024
3cad37f
add another skipped test
adrinjalali Dec 10, 2024
70b44e8
rename file
adrinjalali Dec 11, 2024
f506f97
change imports
adrinjalali Dec 11, 2024
a33501e
unindent
adrinjalali Dec 12, 2024
be8835f
Merge remote-tracking branch 'upstream/master' into wrapper
adrinjalali Dec 12, 2024
eb7a893
docstrings
adrinjalali Dec 12, 2024
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
1 change: 1 addition & 0 deletions keras/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from keras.api import utils
from keras.api import version
from keras.api import visualization
from keras.api import wrappers

# END DO NOT EDIT.

Expand Down
1 change: 1 addition & 0 deletions keras/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
from keras.api import tree
from keras.api import utils
from keras.api import visualization
from keras.api import wrappers
from keras.src.backend import Variable
from keras.src.backend import device
from keras.src.backend import name_scope
Expand Down
1 change: 1 addition & 0 deletions keras/api/_tf_keras/keras/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from keras.api import tree
from keras.api import utils
from keras.api import visualization
from keras.api import wrappers
from keras.api._tf_keras.keras import backend
from keras.api._tf_keras.keras import layers
from keras.api._tf_keras.keras import losses
Expand Down
9 changes: 9 additions & 0 deletions keras/api/_tf_keras/keras/wrappers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
"""DO NOT EDIT.

This file was autogenerated. Do not edit it by hand,
since your modifications would be overwritten.
"""

from keras.src.wrappers._sklearn import KerasClassifier
from keras.src.wrappers._sklearn import KerasRegressor
from keras.src.wrappers._sklearn import KerasTransformer
9 changes: 9 additions & 0 deletions keras/api/wrappers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
"""DO NOT EDIT.

This file was autogenerated. Do not edit it by hand,
since your modifications would be overwritten.
"""

from keras.src.wrappers._sklearn import KerasClassifier
from keras.src.wrappers._sklearn import KerasRegressor
from keras.src.wrappers._sklearn import KerasTransformer
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have reservations about "KerasTransformer" due to the very specific meaning that Transformer has in deep learning. This is going to confuse the hell out of people who search "Transformer" on keras.io. This was also not part of the original implementation of sklearn wrappers we had in Keras.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

I've included this here since, in the meantime, using pre-trained models as a step in a pipeline to get embeddings or any other kind of transformation has become much more popular than a couple of years ago.

But I do understand the name is quite confusing. What do you think of naming these estimators SKLearn{Regressor, Classifier, Transformer}? That should make it clear that the space/scope of these estimators are scikit-learn. We can also add a clear note in the docstring that these have nothing to do with "transformers".

5 changes: 5 additions & 0 deletions keras/src/wrappers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from keras.src.wrappers._sklearn import KerasClassifier
from keras.src.wrappers._sklearn import KerasRegressor
from keras.src.wrappers._sklearn import KerasTransformer

__all__ = ["KerasClassifier", "KerasRegressor", "KerasTransformer"]
Loading
Loading