BUG make GridSearchCV work with non-CSR sparse matrix

larsmans · GaelVaroquaux · commit 133aaf02cfe5 · 2012-10-06T15:56:45.000+02:00
diff --git a/sklearn/grid_search.py b/sklearn/grid_search.py
@@ -79,7 +79,7 @@ def fit_grid_point(X, y, base_clf, clf_params, train, test, loss_func,
                                      for k, v in clf_params.iteritems()))
         print "[GridSearchCV] %s %s" % (msg, (64 - len(msg)) * '.')
 
-    X, y = check_arrays(X, y)
+    X, y = check_arrays(X, y, sparse_format="csr")
     # update parameters of the classifier after a copy of its base structure
     clf = clone(base_clf)
     clf.set_params(**clf_params)
diff --git a/sklearn/tests/test_grid_search.py b/sklearn/tests/test_grid_search.py
@@ -113,7 +113,7 @@ def test_grid_search_sparse():
     X_ = sp.csr_matrix(X_)
     clf = LinearSVC()
     cv = GridSearchCV(clf, {'C': [0.1, 1.0]})
-    cv.fit(X_[:180], y_[:180])
+    cv.fit(X_[:180].tocoo(), y_[:180])
     y_pred2 = cv.predict(X_[180:])
     C2 = cv.best_estimator_.C
 
