Fix weave imports

spearmint/kernels/kernel_utils.py

@@ -184,7 +184,10 @@
 
 
 import numpy as np
-import scipy.weave
+try:
+    import scipy.weave as weave
+except ImportError:
+    import weave
 from scipy.spatial.distance import cdist
 
 def dist2(ls, x1, x2=None):
@@ -228,8 +231,8 @@ def grad_dist2(ls, x1, x2=None):
           gX(i,j,d) = (2/ls(d))*(x1(i,d) - x2(j,d));
     """
     try:
-        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')
     except:
     # The C code weave above is 10x faster than this:

spearmint/models/gp_classifier.py

@@ -191,7 +191,10 @@
 import scipy.optimize    as spo
 import scipy.io          as sio
 import scipy.stats       as sps
-import scipy.weave
+try:
+    import scipy.weave as weave
+except ImportError:
+    import weave
 
 
 from .gp                                     import GP

spearmint/utils/linalg.py

@@ -184,7 +184,10 @@
 
 
 import numpy as np
-import scipy.weave
+try:
+    import scipy.weave as weave
+except ImportError:
+    import weave
 import scipy.linalg as spla
 
 # Update Cholesky decomposition to include a single extra
@@ -237,8 +240,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)