Merge pull request #1695 from abergeron/fix_npcompat

theano/sandbox/gpuarray/basic_ops.py

@@ -563,7 +563,7 @@ class GpuAlloc(HideC, Alloc):
         return Apply(self, [value] + res.inputs[1:], [otype()])
 
     def c_headers(self):
-        return ['<compyte/numpy_compat.h>']
+        return ['<numpy_compat.h>']
 
     def perform(self, node, inputs, outs):
         out, = outs

theano/sandbox/gpuarray/blas.py

@@ -191,7 +191,7 @@ class GpuDot22(BlasOp, Dot22):
 
     def c_headers(self):
         ret = super(GpuDot22, self).c_headers()
-        return ret + ['<compyte/numpy_compat.h>']
+        return ret + ['<numpy_compat.h>']
 
 gpu_dot22 = GpuDot22()
 

theano/sandbox/gpuarray/conv.py

@@ -183,7 +183,7 @@ class GpuConv(gof.Op):
 
     def c_headers(self):
         return ['<stdio.h>', 'cuda.h',
-                '<compyte/extension.h>', '<compyte/numpy_compat.h>']
+                '<compyte/extension.h>', '<numpy_compat.h>']
 
     def c_code_cache_version(self):
         # raise this whenever modifying any of the support_code_files

theano/sandbox/gpuarray/elemwise.py

@@ -165,7 +165,7 @@ class GpuElemwise(HideC, Elemwise):
         return ElemwiseKernel(None, inps+outs, kop, preamble=support_code)
 
     def c_headers(self):
-        return ['cuda.h', '<compyte/extension.h>', '<compyte/numpy_compat.h>']
+        return ['cuda.h', '<compyte/extension.h>', '<numpy_compat.h>']
 
     def c_compiler(self):
         return NVCC_compiler

theano/sandbox/gpuarray/nnet.py

@@ -44,7 +44,7 @@ class GpuCrossentropySoftmaxArgmax1HotWithBias(Op):
         return Apply(self, [x, b, y_idx], [nll, sm, am])
 
     def c_headers(self):
-        return ['cuda.h', '<compyte/extension.h>', '<compyte/numpy_compat.h>']
+        return ['cuda.h', '<compyte/extension.h>', '<numpy_compat.h>']
 
     def c_support_code_apply(self, node, nodename):
         dtype_x = node.inputs[0].dtype
@@ -297,7 +297,7 @@ class GpuCrossentropySoftmax1HotWithBiasDx(Op):
         return (6,)
 
     def c_headers(self):
-        return ['cuda.h', '<compyte/extension.h>', '<compyte/numpy_compat.h>']
+        return ['cuda.h', '<compyte/extension.h>', '<numpy_compat.h>']
 
     def c_compiler(self):
         return NVCC_compiler