Merge pull request #710 from nouiz/small

theano/scan_module/tests/test_scan.py

@@ -693,7 +693,6 @@ class T_Scan(unittest.TestCase):
                                  outputs_info = [None])
         inp = numpy.arange(5).astype('float64')
         rval = theano.function([x], y, updates=updates)(inp)
-        import ipdb; ipdb.set_trace()
         assert numpy.all(rval == inp[:-1])
 
     # simple rnn, one input, one state, weights for each; input/state are

theano/tensor/nnet/conv.py

@@ -708,7 +708,7 @@ class ConvOp(Op):
             raise NotImplementedError('todo')
 
         if self.dx not in (1, 2) or self.dy not in (1, 2):
-            raise Exception("ERROR: We disable ConvOp.grad now when dx or "\
+            raise NotImplementedError("ERROR: We disable ConvOp.grad now when dx or "\
                     "dy are different from 1 and 2, as there is a bug in it.")
 
         all_shape = self.imshp is not None and self.kshp is not None and \

theano/tests/test_updates.py

+import unittest
+
 import theano
 from theano.updates import Updates
 import theano.tensor as T
 
 
-def test_updates_setitem():
-    ok = True
+class test_ifelse(unittest.TestCase):
 
-    up = Updates()
-    sv = theano.shared('asdf')
+    def test_updates_init(self):
+        self.assertRaises(TypeError, Updates, dict(d=3))
 
-    # keys have to be SharedVariables
-    try:
-        up[5] = 7
-        ok = False
-    except TypeError:
-        ok = True
-    assert ok
+        sv = theano.shared('asdf')
+        Updates({sv:3})
 
-    # keys have to be SharedVariables
-    try:
-        up[T.vector()] = 7
-        ok = False
-    except TypeError:
+    def test_updates_setitem(self):
         ok = True
-    assert ok
-
-    # keys have to be SharedVariables
-    up[theano.shared(88)] = 7
-
 
-def test_updates_add():
+        up = Updates()
+        sv = theano.shared('asdf')
 
-    up1 = Updates()
-    up2 = Updates()
+        # keys have to be SharedVariables
+        self.assertRaises(TypeError, up.__setitem__, 5, 7)
+        self.assertRaises(TypeError, up.__setitem__, T.vector(), 7)
 
-    a = theano.shared('a')
-    b = theano.shared('b')
+        up[theano.shared(88)] = 7
 
+    def test_updates_add(self):
 
-    assert not up1 + up2
+        up1 = Updates()
+        up2 = Updates()
 
-    up1[a] = 5
+        a = theano.shared('a')
+        b = theano.shared('b')
 
-    # test that addition works
-    assert up1
-    assert up1 + up2
-    assert not up2
+        assert not up1 + up2
 
-    assert len(up1+up2)==1
-    assert (up1 + up2)[a] == 5
+        up1[a] = 5
 
-    up2[b] = 7
-    assert up1
-    assert up1 + up2
-    assert up2
+        # test that addition works
+        assert up1
+        assert up1 + up2
+        assert not up2
 
-    assert len(up1+up2)==2
-    assert (up1 + up2)[a] == 5
-    assert (up1 + up2)[b] == 7
+        assert len(up1 + up2) == 1
+        assert (up1 + up2)[a] == 5
 
-    assert a in (up1 + up2)
-    assert b in (up1 + up2)
+        up2[b] = 7
+        assert up1
+        assert up1 + up2
+        assert up2
 
-    # this works even though there is a collision
-    # because values all match
-    assert len(up1 + up1 + up1)==1
+        assert len(up1 + up2) == 2
+        assert (up1 + up2)[a] == 5
+        assert (up1 + up2)[b] == 7
 
-    up2[a] = 8 # a gets different value in up1 and up2
-    try:
-        up1 + up2
-        assert 0
-    except KeyError:
-        pass
+        assert a in (up1 + up2)
+        assert b in (up1 + up2)
 
-    # reassigning to a key works fine right?
-    up2[a] = 10
+        # this works even though there is a collision
+        # because values all match
+        assert len(up1 + up1 + up1) == 1
 
+        up2[a] = 8  # a gets different value in up1 and up2
+        try:
+            up1 + up2
+            assert 0
+        except KeyError:
+            pass
 
+        # reassigning to a key works fine right?
+        up2[a] = 10

theano/updates.py

@@ -19,6 +19,15 @@ class Updates(dict):
 
     This mapping supports the use of the "+" operator for the union of updates.
     """
+    def __init__(self, *key, **kwargs):
+        ret = super(Updates, self).__init__(*key, **kwargs)
+        for key in self:
+            if not isinstance(key, SharedVariable):
+                raise TypeError(
+                    'Updates keys must inherit from SharedVariable',
+                    key)
+        return ret
+
     def __setitem__(self, key, value):
         if isinstance(key, SharedVariable):