Merge pull request #937 from nouiz/small_fix

theano/compile/debugmode.py

@@ -1607,7 +1607,7 @@ class _Linker(gof.link.LocalLinker):
                 if not isinstance(node.op, gof.op.Op):
                     raise utils.MethodNotDefined()
                 e = FunctionGraph(*graph.clone(node.inputs, node.outputs))
-                e.toposort = lambda: e.nodes  # WARNING: STOCHASTIC ORDER
+                e.toposort = lambda: e.apply_nodes  # WARNING: STOCHASTIC ORDER
                 #  Specifically... e.nodes is a set, but of only 1 element
 
                 cl = CLinker().accept(e, [r for r, r2 in zip(e.outputs,

theano/gof/tests/test_utils.py

 import theano
 from theano.gof.utils import give_variables_names, unique
+from theano.gof.python25 import all
+
 
 def test_give_variables_names():
     x = theano.tensor.matrix('x')
@@ -10,6 +12,7 @@ def test_give_variables_names():
     assert all(var.name for var in variables)
     assert unique([var.name for var in variables])
 
+
 def test_give_variables_names_idempotence():
     x = theano.tensor.matrix('x')
     y = x + 1
@@ -23,6 +26,7 @@ def test_give_variables_names_idempotence():
 
     assert names == names2
 
+
 def test_give_variables_names_small():
     x = theano.tensor.matrix('x')
     y = theano.tensor.dot(x, x)
@@ -30,4 +34,3 @@ def test_give_variables_names_small():
     give_variables_names(fgraph.variables)
     assert all(var.name for var in fgraph.variables)
     assert unique([var.name for var in fgraph.variables])
-

theano/sparse/basic.py

@@ -854,7 +854,8 @@ class CSMGrad(gof.op.Op):
             sp_dim = x_shape[0]
 
         g_row = numpy.zeros(sp_dim, dtype=g_data.dtype)
-        gout_data = numpy.zeros_like(x_data)
+        gout_data = numpy.zeros_like(x_data, dtype=node.outputs[0].dtype)
+
         for i in range(len(x_indptr) - 1):
             for j_ptr in range(g_indptr[i], g_indptr[i + 1]):
                 g_row[g_indices[j_ptr]] += g_data[j_ptr]