fix: change scipy.weave to weave

References: HIPS#105
nebgnahz · May 25, 2017 · ac71b61 · ac71b61
1 parent 9525e61
commit ac71b61
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/spearmint/kernels/kernel_utils.py b/spearmint/kernels/kernel_utils.py
@@ -184,7 +184,7 @@
 
 
 import numpy as np
-import scipy.weave
+import weave
 from scipy.spatial.distance import cdist
 
 def dist2(ls, x1, x2=None):
@@ -229,8 +229,8 @@ def grad_dist2(ls, x1, x2=None):
         for (int d=0; d<D; d++)
           gX(i,j,d) = (2/ls(d))*(x1(i,d) - x2(j,d));
     """
-    scipy.weave.inline(code, ['x1','x2','gX','ls','M','N','D'], \
-                       type_converters=scipy.weave.converters.blitz, \
+    weave.inline(code, ['x1','x2','gX','ls','M','N','D'], \
+                       type_converters=weave.converters.blitz, \
                        compiler='gcc')
 
     # The C code weave above is 10x faster than this:

diff --git a/spearmint/models/gp_classifier.py b/spearmint/models/gp_classifier.py
@@ -191,7 +191,7 @@
 import scipy.optimize    as spo
 import scipy.io          as sio
 import scipy.stats       as sps
-import scipy.weave
+import weave
 from collections import defaultdict
 
 from .gp                                     import GP

diff --git a/spearmint/utils/linalg.py b/spearmint/utils/linalg.py
@@ -184,7 +184,7 @@
 
 
 import numpy as np
-import scipy.weave
+import weave
 import scipy.linalg as spla
 
 # Update Cholesky decomposition to include a single extra
@@ -237,8 +237,8 @@ def fast_chol_add(L, A):
             }
         }
         """
-        scipy.weave.inline(code, ['U','A','j','isPosDef','rows','cols'], \
-                               type_converters=scipy.weave.converters.blitz, \
+        weave.inline(code, ['U','A','j','isPosDef','rows','cols'], \
+                               type_converters=weave.converters.blitz, \
                                compiler='gcc')
     except:
         k = np.arange(cols)