Merge test_sp.py.

theano/sparse/sandbox/test_sp.py

@@ -438,10 +438,11 @@ def test_remove0():
         print 'config: format=\'%(format)s\', matrix_class=%(matrix_class)s'%locals()
         # real
         origin = (numpy.arange(9) + 1).reshape((3, 3)).astype(theano.config.floatX)
-        with0 = matrix_class(origin).astype(theano.config.floatX)
+        mat = matrix_class(origin).astype(theano.config.floatX)
 
-        with0[0,1] = with0[1,0] = with0[2,2] = 0
-        assert with0.size == 9
+        mat[0,1] = mat[1,0] = mat[2,2] = 0
+
+        assert mat.size == 9
 
         # symbolic
         x = theano.sparse.SparseType(format=format, dtype=theano.config.floatX)()
@@ -456,9 +457,9 @@ def test_remove0():
 
         # checking
         # makes sense to change its name
-        target = with0
-        result = f(with0)
-        with0.eliminate_zeros()
+        target = mat
+        result = f(mat)
+        mat.eliminate_zeros()
         assert result.size == target.size, 'Matrices sizes differ. Have zeros been removed ?'
 
 def test_diagonal():

theano/tensor/opt.py

@@ -1951,6 +1951,7 @@ compile.optdb.register('local_inplace_incsubtensor1',
 @gof.local_optimizer([None])
 def local_inplace_remove0(node):
     """
+    Optimization to insert inplace versions of Remove0.
     """
     if isinstance(node.op, theano.sparse.sandbox.sp.Remove0) and not node.op.inplace:
         new_op = node.op.__class__(inplace=True)
@@ -1960,7 +1961,7 @@ def local_inplace_remove0(node):
 compile.optdb.register('local_inplace_remove0',
                        TopoOptimizer(local_inplace_remove0,
     failure_callback=TopoOptimizer.warn_inplace), 60,
-                       'fast_run', 'inplace')  # DEBUG
+                       'fast_run', 'inplace')
 
 
 @register_canonicalize