maybe works

akusok · Jan 21, 2016 · 3421249 · 3421249
1 parent 8802388
commit 3421249
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -41,9 +41,9 @@
     'sphinx.ext.napoleon',
 ]
 
-autodoc_mock_imports = ['tables',
-                        'numpy',
+autodoc_mock_imports = [#'numpy',
                         'scipy',
+                        'tables',
                         'scipy.linalg',
                         'scipy.spatial.distance'] #17:40
 

diff --git a/hpelm/mss_loo.py b/hpelm/mss_loo.py
@@ -6,7 +6,6 @@
 """
 
 import numpy as np
-from numpy.linalg import inv
 
 
 def train_loo(self, X, T):
@@ -31,7 +30,7 @@ def train_loo(self, X, T):
     rank, L = self._ranking(L, H, T)  # create ranking of neurons
 
     # PRESS_LOO
-    P = inv(HH)
+    P = np.linalg.inv(HH)
     Bt = np.dot(P, HT)
     R = np.ones((N,)) - np.einsum('ij,ji->i', np.dot(H, P), H.T)
     Y = np.dot(H, Bt)
@@ -63,7 +62,7 @@ def train_loo(self, X, T):
                 HH1 = HH[rank1, :][:, rank1]
                 HT1 = HT[rank1, :]
 
-                P = inv(HH1)
+                P = np.linalg.inv(HH1)
                 Bt1 = np.dot(P, HT1)
                 R = np.ones((N,)) - np.einsum('ij,ji->i', np.dot(H1, P), H1.T)
                 Y1 = np.dot(H1, Bt1)

diff --git a/hpelm/nnets/slfn_python.py b/hpelm/nnets/slfn_python.py
@@ -10,7 +10,6 @@
 
 from slfn import SLFN
 import numpy as np
-from scipy.spatial.distance import cdist
 from scipy.linalg import blas, lapack