Skip to content
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

Jump to bottom

[MRG] Updated IPython notebook for scikit-learn wrappers #1428

Merged
merged 9 commits into from
Jun 21, 2017
Merged

[MRG] Updated IPython notebook for scikit-learn wrappers #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f67b095
updated ipynb for new sklearn wrappers
chinmayapancholi13 Jun 18, 2017
861dc8b
included skl wrapper classes in '__init__.py'
chinmayapancholi13 Jun 19, 2017
539adb4
shortened import statements for skl wrapper classes
chinmayapancholi13 Jun 19, 2017
0929241
Merge branch 'develop' of https://github.com/RaRe-Technologies/gensim…
chinmayapancholi13 Jun 20, 2017
554f941
changes for __init__.py file
chinmayapancholi13 Jun 20, 2017
088d3d7
added output in sklearn wrappers ipynb
chinmayapancholi13 Jun 20, 2017
e2f2a22
updated 'set_params' function in skl wrappers
chinmayapancholi13 Jun 21, 2017
7aa385b
updated sklearn ipynb for GridSearch
chinmayapancholi13 Jun 21, 2017
4547c1e
added comments to skip flake8 checks
chinmayapancholi13 Jun 21, 2017
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
316 changes: 256 additions & 60 deletions docs/notebooks/sklearn_wrapper.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions gensim/sklearn_integration/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,10 @@
See [1] for complete set of conventions.
[1] http://scikit-learn.org/stable/developers/
"""


from .base_sklearn_wrapper import BaseSklearnWrapper # noqa: F401
from .sklearn_wrapper_gensim_ldamodel import SklLdaModel # noqa: F401
from .sklearn_wrapper_gensim_lsimodel import SklLsiModel # noqa: F401
from .sklearn_wrapper_gensim_rpmodel import SklRpModel # noqa: F401
from .sklearn_wrapper_gensim_ldaseqmodel import SklLdaSeqModel # noqa: F401
5 changes: 3 additions & 2 deletions gensim/sklearn_integration/sklearn_wrapper_gensim_ldamodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

from gensim import models
from gensim import matutils
from gensim.sklearn_integration import base_sklearn_wrapper
from gensim.sklearn_integration import BaseSklearnWrapper


class SklLdaModel(base_sklearn_wrapper.BaseSklearnWrapper, TransformerMixin, BaseEstimator):
class SklLdaModel(BaseSklearnWrapper, TransformerMixin, BaseEstimator):
"""
Base LDA module
"""
Expand Down Expand Up @@ -64,6 +64,7 @@ def set_params(self, **parameters):
Set all parameters.
"""
super(SklLdaModel, self).set_params(**parameters)
return self

def fit(self, X, y=None):
"""
Expand Down
5 changes: 3 additions & 2 deletions gensim/sklearn_integration/sklearn_wrapper_gensim_ldaseqmodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
from sklearn.exceptions import NotFittedError

from gensim import models
from gensim.sklearn_integration import base_sklearn_wrapper
from gensim.sklearn_integration import BaseSklearnWrapper


class SklLdaSeqModel(base_sklearn_wrapper.BaseSklearnWrapper, TransformerMixin, BaseEstimator):
class SklLdaSeqModel(BaseSklearnWrapper, TransformerMixin, BaseEstimator):
"""
Base LdaSeq module
"""
Expand Down Expand Up @@ -61,6 +61,7 @@ def set_params(self, **parameters):
Set all parameters.
"""
super(SklLdaSeqModel, self).set_params(**parameters)
return self

def fit(self, X, y=None):
"""
Expand Down
5 changes: 3 additions & 2 deletions gensim/sklearn_integration/sklearn_wrapper_gensim_lsimodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

from gensim import models
from gensim import matutils
from gensim.sklearn_integration import base_sklearn_wrapper
from gensim.sklearn_integration import BaseSklearnWrapper


class SklLsiModel(base_sklearn_wrapper.BaseSklearnWrapper, TransformerMixin, BaseEstimator):
class SklLsiModel(BaseSklearnWrapper, TransformerMixin, BaseEstimator):
"""
Base LSI module
"""
Expand Down Expand Up @@ -51,6 +51,7 @@ def set_params(self, **parameters):
Set all parameters.
"""
super(SklLsiModel, self).set_params(**parameters)
return self

def fit(self, X, y=None):
"""
Expand Down
5 changes: 3 additions & 2 deletions gensim/sklearn_integration/sklearn_wrapper_gensim_rpmodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
from sklearn.exceptions import NotFittedError

from gensim import models
from gensim.sklearn_integration import base_sklearn_wrapper
from gensim.sklearn_integration import BaseSklearnWrapper


class SklRpModel(base_sklearn_wrapper.BaseSklearnWrapper, TransformerMixin, BaseEstimator):
class SklRpModel(BaseSklearnWrapper, TransformerMixin, BaseEstimator):
"""
Base RP module
"""
Expand All @@ -41,6 +41,7 @@ def set_params(self, **parameters):
Set all parameters.
"""
super(SklRpModel, self).set_params(**parameters)
return self

def fit(self, X, y=None):
"""
Expand Down