Merge pull request #6324 from chyikwei/fix-lda-joblib-error

ogrisel · ogrisel · commit 268af6918ec9 · 2016-02-10T15:17:21.000+01:00
[MRG + 1] Fix joblib error in LatentDirichletAllocation (#6258)
diff --git a/sklearn/decomposition/online_lda.py b/sklearn/decomposition/online_lda.py
@@ -520,7 +520,8 @@ def fit(self, X, y=None):
                 # check perplexity
                 if evaluate_every > 0 and (i + 1) % evaluate_every == 0:
                     doc_topics_distr, _ = self._e_step(X, cal_sstats=False,
-                                                       random_init=False)
+                                                       random_init=False,
+                                                       parallel=parallel)
                     bound = self.perplexity(X, doc_topics_distr,
                                             sub_sampling=False)
                     if self.verbose:
diff --git a/sklearn/decomposition/tests/test_online_lda.py b/sklearn/decomposition/tests/test_online_lda.py
@@ -199,6 +199,7 @@ def test_lda_multi_jobs():
         rng = np.random.RandomState(0)
         lda = LatentDirichletAllocation(n_topics=n_topics, n_jobs=2,
                                         learning_method=method,
+                                        evaluate_every=1,
                                         random_state=rng)
         lda.fit(X)
 
