Merge pull request #6437 from abergeron/fix_buildbot

.circleci/config.yml

@@ -27,10 +27,10 @@ jobs:
           command: |
             if [[ -n "${CIRCLE_TAG}" ]]
             then
-                anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/noarch/theano*
+                anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/linux-64/theano*
             fi
       - store_artifacts:
-          path: /miniconda/conda-bld/linux-x64
+          path: /miniconda/conda-bld/linux-64
 
 workflows:
   version: 2

theano/d3viz/tests/test_d3viz.py

@@ -38,6 +38,8 @@ class TestD3Viz(unittest.TestCase):
         self.check(f)
 
     def test_mlp_profiled(self):
+        if th.config.mode in ("DebugMode", "DEBUG_MODE"):
+            raise SkipTest("Can't profile in DebugMode")
         m = models.Mlp()
         profile = th.compile.profiling.ProfileStats(False)
         f = th.function(m.inputs, m.outputs, profile=profile)

theano/gpuarray/subtensor.py

@@ -1111,6 +1111,10 @@ if (GpuArray_vector_add_fast(%(out)s, %(y)s, %(ind)s, %(params)s->set_instead_of
         """ % dict(x=inputs[0], y=inputs[1], ind=inputs[2], out=outputs[0], fail=sub['fail'], params=sub['params'])
 
     def gpu_kernels(self, node, nodename):
+        # We can't rely on numpy for this, it changes with the OS
+        CHARMAP = dict(int32='i', uint32='I',
+                       int64='l', uint64='L',
+                       float16='e', float32='f', float64='d')
         dtype_x = node.inputs[0].dtype
         dtype_y = node.inputs[1].dtype
         dtype_ind = node.inputs[2].dtype
@@ -1168,7 +1172,7 @@ if (GpuArray_vector_add_fast(%(out)s, %(y)s, %(ind)s, %(params)s->set_instead_of
              return;
         }
         """ % dict(type_x=type_x, type_y=type_y, type_ind=type_ind,
-                   tc=np.dtype(dtype_x).char)
+                   tc=CHARMAP[dtype_x])
         from pygpu.gpuarray import SIZE, SSIZE
         params = [
             SIZE, SIZE, SSIZE, SSIZE, gpuarray.GpuArray, SIZE,

theano/tensor/blas.py

@@ -1532,6 +1532,8 @@ class Dot22(GemmRelated):
     check_input = False
 
     def make_node(self, x, y):
+        x = T.as_tensor_variable(x)
+        y = T.as_tensor_variable(y)
         dtypes = ('float16', 'float32', 'float64', 'complex64', 'complex128')
         if x.type.ndim != 2 or x.type.dtype not in dtypes:
             raise TypeError(x)

theano/tensor/extra_ops.py

@@ -1218,7 +1218,7 @@ class UnravelIndex(gof.Op):
         res = np.unravel_index(indices, dims)
         assert len(res) == len(out)
         for i in xrange(len(out)):
-            out[i][0] = res[i]
+            out[i][0] = theano._asarray(res[i], node.outputs[0].dtype)
 
 
 def unravel_index(indices, dims, order='C', ndim=None):
@@ -1304,8 +1304,9 @@ class RavelMultiIndex(gof.Op):
 
     def perform(self, node, inp, out):
         multi_index, dims = inp[:-1], inp[-1]
-        out[0][0] = np.ravel_multi_index(multi_index, dims,
-                                         mode=self.mode, order=self.order)
+        res = np.ravel_multi_index(multi_index, dims,
+                                   mode=self.mode, order=self.order)
+        out[0][0] = theano._asarray(res, node.outputs[0].dtype)
 
 
 def ravel_multi_index(multi_index, dims, mode='raise', order='C'):

theano/tests/test_printing.py

@@ -84,6 +84,9 @@ def test_pydotprint_profile():
     if not theano.printing.pydot_imported:
         raise SkipTest('pydot not available')
 
+    if theano.config.mode in ("DebugMode", "DEBUG_MODE"):
+        raise SkipTest("Can't profile in DebugMode")
+
     A = tensor.matrix()
     prof = theano.compile.ProfileStats(atexit_print=False, gpu_checks=False)
     f = theano.function([A], A + 1, profile=prof)