Merge pull request #670 from nouiz/fix_new_op

theano/gof/env.py

@@ -5,6 +5,7 @@ from copy import copy
 import graph
 import utils
 import toolbox
+from python25 import all
 from theano import config
 
 
@@ -144,6 +145,18 @@ class Env(utils.object2):
         # sets up node so it belongs to this env
         if hasattr(node, 'env') and node.env is not self:
             raise Exception("%s is already owned by another env" % node)
+        if (hasattr(node.op, 'view_map') and
+            not all([isinstance(view, (list, tuple))
+                     for view in node.op.view_map.values()])):
+            raise Exception("Op '%s' have a bad view map '%s',"
+                            " the values must be tuples or lists." % (
+                                str(node.op), str(node.op.view_map)))
+        if (hasattr(node.op, 'destroy_map') and
+            not all([isinstance(destroy, (list, tuple))
+                     for destroy in node.op.destroy_map.values()])):
+            raise Exception("Op '%s' have a bad destroy map '%s',"
+                            " the values must be tuples or lists." % (
+                                str(node.op), str(node.op.destroy_map)))
         node.env = self
         node.deps = {}
         #self.execute_callbacks('on_setup_node', node)

theano/tensor/extra_ops.py

@@ -21,6 +21,10 @@ class DiffOp(theano.Op):
     def __init__(self, n=1, axis=-1):
         self.n = n
         self.axis = axis
+        # numpy return a view in that case.
+        # TODO, make an optimization that remove this op in this case.
+        if n == 0:
+            self.view_map = {0: [0]}
 
     def __eq__(self, other):
         return (type(self) == type(other) and

theano/tensor/tests/test_extra_ops.py

@@ -91,7 +91,7 @@ class TestDiffOp(utt.InferShapeTester):
 
     def test_grad(self):
         x = T.vector('x')
-        a = np.random.random(500)
+        a = np.random.random(50)
 
         gf = theano.function([x], T.grad(T.sum(diff(x)), x))
         utt.verify_grad(self.op, [a])