From a90ad310fe7458a9b0bcff0915e6be70ae8bcac1 Mon Sep 17 00:00:00 2001 From: Chinmaya Pancholi Date: Fri, 10 Nov 2017 03:31:05 +0530 Subject: [PATCH 1/3] updated param passed to 'Sparse2Corpus' --- gensim/sklearn_api/hdp.py | 2 +- gensim/sklearn_api/ldamodel.py | 2 +- gensim/sklearn_api/lsimodel.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gensim/sklearn_api/hdp.py b/gensim/sklearn_api/hdp.py index acadd6f459..92f4046c31 100644 --- a/gensim/sklearn_api/hdp.py +++ b/gensim/sklearn_api/hdp.py @@ -51,7 +51,7 @@ def fit(self, X, y=None): Calls gensim.models.HdpModel """ if sparse.issparse(X): - corpus = matutils.Sparse2Corpus(X) + corpus = matutils.Sparse2Corpus(X, False) else: corpus = X diff --git a/gensim/sklearn_api/ldamodel.py b/gensim/sklearn_api/ldamodel.py index 40d7c52db0..24230a7195 100644 --- a/gensim/sklearn_api/ldamodel.py +++ b/gensim/sklearn_api/ldamodel.py @@ -57,7 +57,7 @@ def fit(self, X, y=None): Calls gensim.models.LdaModel """ if sparse.issparse(X): - corpus = matutils.Sparse2Corpus(X) + corpus = matutils.Sparse2Corpus(X, False) else: corpus = X diff --git a/gensim/sklearn_api/lsimodel.py b/gensim/sklearn_api/lsimodel.py index 30263b02af..ef99310475 100644 --- a/gensim/sklearn_api/lsimodel.py +++ b/gensim/sklearn_api/lsimodel.py @@ -43,7 +43,7 @@ def fit(self, X, y=None): Calls gensim.models.LsiModel """ if sparse.issparse(X): - corpus = matutils.Sparse2Corpus(X) + corpus = matutils.Sparse2Corpus(X, False) else: corpus = X From cada78aa9bd7b99bc2a776e5f438515e6e0958cc Mon Sep 17 00:00:00 2001 From: Chinmaya Pancholi Date: Fri, 10 Nov 2017 03:31:23 +0530 Subject: [PATCH 2/3] updated unit test --- gensim/test/test_sklearn_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gensim/test/test_sklearn_api.py b/gensim/test/test_sklearn_api.py index ff4a6a2202..5f8a0c59f7 100644 --- a/gensim/test/test_sklearn_api.py +++ b/gensim/test/test_sklearn_api.py @@ -177,7 +177,7 @@ def testCSRMatrixConversion(self): newmodel.fit(sarr) bow = [(0, 1), (1, 2), (2, 0)] transformed_vec = newmodel.transform(bow) - expected_vec = numpy.array([0.35367903, 0.64632097]) + expected_vec = numpy.array([0.12843782, 0.87156218]) passed = numpy.allclose(transformed_vec, expected_vec, atol=1e-1) self.assertTrue(passed) From 11c944b29e241729fd8548a47dc451d2257a6db6 Mon Sep 17 00:00:00 2001 From: Chinmaya Pancholi Date: Fri, 17 Nov 2017 23:12:54 +0530 Subject: [PATCH 3/3] updated 'partial_fit' and passed named params --- gensim/sklearn_api/hdp.py | 4 ++-- gensim/sklearn_api/ldamodel.py | 4 ++-- gensim/sklearn_api/lsimodel.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gensim/sklearn_api/hdp.py b/gensim/sklearn_api/hdp.py index 92f4046c31..41b3412972 100644 --- a/gensim/sklearn_api/hdp.py +++ b/gensim/sklearn_api/hdp.py @@ -51,7 +51,7 @@ def fit(self, X, y=None): Calls gensim.models.HdpModel """ if sparse.issparse(X): - corpus = matutils.Sparse2Corpus(X, False) + corpus = matutils.Sparse2Corpus(sparse=X, documents_columns=False) else: corpus = X @@ -95,7 +95,7 @@ def partial_fit(self, X): Train model over X. """ if sparse.issparse(X): - X = matutils.Sparse2Corpus(X) + X = matutils.Sparse2Corpus(sparse=X, documents_columns=False) if self.gensim_model is None: self.gensim_model = models.HdpModel( diff --git a/gensim/sklearn_api/ldamodel.py b/gensim/sklearn_api/ldamodel.py index 24230a7195..9b6ff96990 100644 --- a/gensim/sklearn_api/ldamodel.py +++ b/gensim/sklearn_api/ldamodel.py @@ -57,7 +57,7 @@ def fit(self, X, y=None): Calls gensim.models.LdaModel """ if sparse.issparse(X): - corpus = matutils.Sparse2Corpus(X, False) + corpus = matutils.Sparse2Corpus(sparse=X, documents_columns=False) else: corpus = X @@ -101,7 +101,7 @@ def partial_fit(self, X): """ if sparse.issparse(X): - X = matutils.Sparse2Corpus(X) + X = matutils.Sparse2Corpus(sparse=X, documents_columns=False) if self.gensim_model is None: self.gensim_model = models.LdaModel( diff --git a/gensim/sklearn_api/lsimodel.py b/gensim/sklearn_api/lsimodel.py index ef99310475..87d813d768 100644 --- a/gensim/sklearn_api/lsimodel.py +++ b/gensim/sklearn_api/lsimodel.py @@ -43,7 +43,7 @@ def fit(self, X, y=None): Calls gensim.models.LsiModel """ if sparse.issparse(X): - corpus = matutils.Sparse2Corpus(X, False) + corpus = matutils.Sparse2Corpus(sparse=X, documents_columns=False) else: corpus = X @@ -78,7 +78,7 @@ def partial_fit(self, X): Train model over X. """ if sparse.issparse(X): - X = matutils.Sparse2Corpus(X) + X = matutils.Sparse2Corpus(sparse=X, documents_columns=False) if self.gensim_model is None: self.gensim_model = models.LsiModel(