Move scipy_future into utils.arpack

scikit-learn · Jun 29, 2011 · 1b427d9 · 1b427d9
1 parent f75f47d
commit 1b427d9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/scikits/learn/manifold/locally_linear.py b/scikits/learn/manifold/locally_linear.py
@@ -7,9 +7,9 @@
 from scipy.linalg import eigh, svd, qr
 from scipy.sparse import linalg, eye, csr_matrix
 from scipy.sparse.linalg import LinearOperator
-from scipy_future import eigsh
 from ..base import BaseEstimator
 from ..utils import check_random_state
+from ..utils.arpack import eigsh
 from ..neighbors import kneighbors_graph, BallTree, barycenter_weights
 
 try:
@@ -315,7 +315,7 @@ def locally_linear_embedding(
             # >> W_hat = np.zeros( (N,s_i) )
             # >> W_hat[neighbors[i],:] = Wi
             # >> W_hat[i] -= 1
-            # >> M += np.dot(W_hat,W_hat.T)
+            # >> M += np.dot(W_hat,W_hat.T)
             #We can do this much more efficiently:
             nbrs_x, nbrs_y = np.meshgrid(neighbors[i], neighbors[i])
             M[nbrs_x, nbrs_y] += np.dot(Wi, Wi.T)

diff --git a/scikits/learn/utils/__init__.py b/scikits/learn/utils/__init__.py
@@ -1,7 +1,6 @@
 import numpy as np
 import scipy.sparse as sp
 
-
 def safe_asanyarray(X, dtype=None, order=None):
     if sp.issparse(X):
         return X

diff --git a/scikits/learn/manifold/scipy_future.py → scikits/learn/utils/arpack.py b/scikits/learn/manifold/scipy_future.py → scikits/learn/utils/arpack.py