Fix deprecated parameters in `D2VTransformer` and `W2VTransformer`. Fix #1937 #1945

morsdor · 2018-03-01T13:24:33Z

I tried modifying a liitle bit of @ swierh code and added a bit what he recommended.

fix 'iter' and 'size' warnings

…sh-patch-1 Revert "fix 'iter' and 'size' warnings"

fix 'iter' and 'size' warnings

menshikh-iv · 2018-03-01T13:26:10Z

@MritunjayMohitesh next time please push all code to one PR (no need to create one more for fixes).

morsdor · 2018-03-01T13:28:33Z

Sorry about that.
I will do from the next time. It was actually my first time.

menshikh-iv · 2018-03-01T13:29:33Z

@MritunjayMohitesh I already closed previous PR, let's continue here

menshikh-iv · 2018-03-02T04:09:09Z

gensim/models/doc2vec.py

@@ -404,7 +400,7 @@ def __init__(self, documents=None, dm_mean=None, dm=1, dbow_words=0, dm_concat=0
            self.train(
                documents, total_examples=self.corpus_count, epochs=self.epochs,
                start_alpha=self.alpha, end_alpha=self.min_alpha, callbacks=callbacks)
-
+    


This file is not relevant to PR, please remove it from PR

menshikh-iv · 2018-03-02T04:09:42Z

gensim/models/word2vec.py

    """

-    def __init__(self, sentences=None, size=100, alpha=0.025, window=5, min_count=5,
+    def __init__(self, sentences=None, size=None, vector_size=100, alpha=0.025, window=5, min_count=5,


This changes non-relevant too, please remove it.

menshikh-iv · 2018-03-02T04:12:14Z

gensim/sklearn_api/w2vmodel.py

                 trim_rule=None, sorted_vocab=1, batch_words=10000):
        """
        Sklearn wrapper for Word2Vec model. See gensim.models.Word2Vec for parameter details.
        """
+        if iter is not None:


Does it make sense here to rename the arguments here? You can simply pass correct variants to "original" class and this is enough to avoid deprecation problems.

CC: @manneshiva

menshikh-iv · 2018-03-08T07:35:33Z

ping @MritunjayMohitesh

morsdor · 2018-03-11T16:22:52Z

I can't understand why travisci is failing. Some help would be appreciated.

menshikh-iv · 2018-03-12T04:18:30Z

gensim/models/doc2vec.py

@@ -239,9 +239,9 @@ class TaggedDocument(namedtuple('TaggedDocument', 'words tags')):
    and `tags` (a list of tokens). Tags may be one or more unicode string
    tokens, but typical practice (which will also be most memory-efficient) is
    for the tags list to include a unique integer id as the only tag.
-
+    


Unrelated change (leading space in empty line), please revert all changes for doc2vec.py and Travis will pass successfully

menshikh-iv · 2018-03-12T04:37:34Z

gensim/sklearn_api/w2vmodel.py

        self.null_word = null_word
        self.trim_rule = trim_rule
        self.sorted_vocab = sorted_vocab
        self.batch_words = batch_words
-
+        


leading spaces again

menshikh-iv · 2018-03-12T04:38:37Z

gensim/sklearn_api/w2vmodel.py

    def fit(self, X, y=None):
        """
        Fit the model according to the given training data.
        Calls gensim.models.Word2Vec
        """
        self.gensim_model = models.Word2Vec(
-            sentences=X, size=self.size, alpha=self.alpha,
+            sentences=X, size=self.vector_size, alpha=self.alpha,


looks like you should change size to vector_size and same for iter here for avoid DeprecationWarning.

menshikh-iv · 2018-03-12T04:47:10Z

gensim/sklearn_api/w2vmodel.py

-    def __init__(self, size=100, alpha=0.025, window=5, min_count=5, max_vocab_size=None, sample=1e-3, seed=1,
-                 workers=3, min_alpha=0.0001, sg=0, hs=0, negative=5, cbow_mean=1, hashfxn=hash, iter=5, null_word=0,
-                 trim_rule=None, sorted_vocab=1, batch_words=10000):
+    def __init__(self, size=None, vector_size=100, alpha=0.025, window=5, min_count=5, max_vocab_size=None, sample=1e-3,


No need any changes to w2vmodel.py (this deprecation only for d2v), this is also unrelated change, please revert this file.

menshikh-iv · 2018-03-12T04:48:20Z

gensim/sklearn_api/d2vmodel.py

-                 docvecs_mapfile=None, comment=None, trim_rule=None, size=100, alpha=0.025, window=5, min_count=5,
-                 max_vocab_size=None, sample=1e-3, seed=1, workers=3, min_alpha=0.0001, hs=0, negative=5, cbow_mean=1,
-                 hashfxn=hash, iter=5, sorted_vocab=1, batch_words=10000):
+                 docvecs_mapfile=None, comment=None, trim_rule=None, size=None, vector_size=100, alpha=0.025, window=5,


No need to add new arguments/attributes/raise more deprecation stuff, simply change arguments name in fit when you pass it to Doc2Vec, that's all fix here.

menshikh-iv · 2018-03-12T07:05:37Z

gensim/sklearn_api/d2vmodel.py

@@ -72,11 +79,11 @@ def fit(self, X, y=None):
            documents=d2v_sentences, dm_mean=self.dm_mean, dm=self.dm,
            dbow_words=self.dbow_words, dm_concat=self.dm_concat, dm_tag_count=self.dm_tag_count,
            docvecs=self.docvecs, docvecs_mapfile=self.docvecs_mapfile, comment=self.comment,
-            trim_rule=self.trim_rule, size=self.size, alpha=self.alpha, window=self.window,
+            trim_rule=self.trim_rule, size=self.vector_size, alpha=self.alpha, window=self.window,


All changes of your PR should be in 2 lines of fit function, that's all that you needed here.

menshikh-iv · 2018-03-12T07:29:18Z

@MritunjayMohitesh Horaay 🔥, looks like needed change, let's wait CI

morsdor · 2018-03-12T08:04:38Z

first of all, thank you for your help. Doing this will not give deprecation warning but it should still give the error as @swierh <https://github.com/swierh> stated since , vector_size(or epoch) hasn't been passed as argument to D2VTransformer class. Please correct me if I'm wrong.

…

On Mon, Mar 12, 2018 at 12:59 PM, Menshikh Ivan ***@***.***> wrote: @MritunjayMohitesh <https://github.com/mritunjaymohitesh> Horaay 🔥, looks like needed change, let's wait CI — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1945 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AV3txU2aMmXs6ztZ8YKiyKzGRKEM-Mrhks5tdiPZgaJpZM4SYTLG> .

menshikh-iv · 2018-03-12T09:01:47Z

@MritunjayMohitesh this shouldn't be passed to w2v class (this have no this parameter). Test passed correctly (probably @swierh trying to run tests based on old version of your PR), right now all works fine.

menshikh-iv · 2018-03-12T09:02:32Z

Thanks @MritunjayMohitesh, congratz with the first-time contribution 🥇 !

morsdor added 13 commits February 28, 2018 21:02

fix 'iter' and 'size' warnings

2ee6ab8

Merge pull request #1 from MritunjayMohitesh/MritunjayMohitesh-patch-1

2e0afad

fix 'iter' and 'size' warnings

Revert "fix 'iter' and 'size' warnings"

6301be6

Merge pull request #2 from MritunjayMohitesh/revert-1-MritunjayMohite…

77307c3

…sh-patch-1 Revert "fix 'iter' and 'size' warnings"

Update w2vmodel.py

5b9d2ff

fix 'iter' and 'size' warnings

d2733ff

Merge pull request #3 from MritunjayMohitesh/MritunjayMohitesh-patch-2

92fc07b

fix 'iter' and 'size' warnings

Merge pull request #4 from MritunjayMohitesh/MritunjayMohitesh-patch-1

66c6bf1

fix 'iter' and 'size' warnings

Fix 'iter' and 'size' warnings

21934e1

fixed deprecated argument warnings

428d428

fixed deprecated argument warnings

0a0e1d6

Update test_sklearn_api.py

c79bdfb

fix deprecated arguments

da76d3c

menshikh-iv mentioned this pull request Mar 1, 2018

Fix deprecated parameters in D2VTransformer and W2VTransformer. Fix #1937 #1939

Closed

morsdor closed this Mar 1, 2018

menshikh-iv reopened this Mar 1, 2018

morsdor added 7 commits March 1, 2018 22:55

fix deprecated argument warnings

bbdb0d4

fix deprecated argumet warnings

31d3729

fix deprecated argumet warnings

bbcd0e5

fix deprecated argumet warnings

734d5c5

fix deprecated argument warnings

7cfbfe1

fix deprecated argument warnings

be108c1

fix deprecated arguments

e4f7ad7

menshikh-iv suggested changes Mar 2, 2018

View reviewed changes

morsdor added 2 commits March 10, 2018 11:18

fix deprecated arguments

02fdf70

fix deprecated arguments

477b381

morsdor added 18 commits March 10, 2018 12:31

Update doc2vec.py

74d1c59

Update doc2vec.py

9b8aa91

Update word2vec.py

7bc192d

Update w2vmodel.py

c6d73f6

Update d2vmodel.py

f06c653

Update test_sklearn_api.py

3dad345

Update d2vmodel.py

3148a17

Update w2vmodel.py

9ac44f9

Update w2vmodel.py

e90fcf6

Update test_sklearn_api.py

9686738

Update d2vmodel.py

33961ed

Update w2vmodel.py

a5fb143

Update d2vmodel.py

d1c2d5a

Update d2vmodel.py

7246e37

Update w2vmodel.py

b254009

Update w2vmodel.py

7505229

Update d2vmodel.py

e603649

Update test_sklearn_api.py

61dfef0

menshikh-iv suggested changes Mar 12, 2018

View reviewed changes

morsdor added 2 commits March 12, 2018 12:28

Update doc2vec.py

52d2945

Update w2vmodel.py

09b5dc7

menshikh-iv suggested changes Mar 12, 2018

View reviewed changes

Update d2vmodel.py

341a91f

menshikh-iv changed the title ~~Fix deprecated parameters in D2VTransformer and W2VTransformer . Fix #1937~~ Fix deprecated parameters in D2VTransformer and W2VTransformer. Fix #1937 Mar 12, 2018

menshikh-iv merged commit dc97c51 into piskvorky:develop Mar 12, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix deprecated parameters in `D2VTransformer` and `W2VTransformer`. Fix #1937 #1945

Fix deprecated parameters in `D2VTransformer` and `W2VTransformer`. Fix #1937 #1945

morsdor commented Mar 1, 2018

menshikh-iv commented Mar 1, 2018

morsdor commented Mar 1, 2018

menshikh-iv commented Mar 1, 2018

menshikh-iv Mar 2, 2018

menshikh-iv Mar 2, 2018

menshikh-iv Mar 2, 2018

menshikh-iv commented Mar 8, 2018

morsdor commented Mar 11, 2018

menshikh-iv Mar 12, 2018

menshikh-iv Mar 12, 2018

menshikh-iv Mar 12, 2018

menshikh-iv Mar 12, 2018

menshikh-iv Mar 12, 2018

menshikh-iv Mar 12, 2018

menshikh-iv commented Mar 12, 2018

morsdor commented Mar 12, 2018 via email •

edited

Loading

menshikh-iv commented Mar 12, 2018

menshikh-iv commented Mar 12, 2018

Fix deprecated parameters in D2VTransformer and W2VTransformer. Fix #1937 #1945

Fix deprecated parameters in D2VTransformer and W2VTransformer. Fix #1937 #1945

Conversation

morsdor commented Mar 1, 2018

menshikh-iv commented Mar 1, 2018

morsdor commented Mar 1, 2018

menshikh-iv commented Mar 1, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

menshikh-iv commented Mar 8, 2018

morsdor commented Mar 11, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

menshikh-iv commented Mar 12, 2018

morsdor commented Mar 12, 2018 via email • edited Loading

menshikh-iv commented Mar 12, 2018

menshikh-iv commented Mar 12, 2018

Fix deprecated parameters in `D2VTransformer` and `W2VTransformer`. Fix #1937 #1945

Fix deprecated parameters in `D2VTransformer` and `W2VTransformer`. Fix #1937 #1945

morsdor commented Mar 12, 2018 via email •

edited

Loading