Added test that the opt are not applyed when they should not.

theano/tensor/nnet/tests/test_sigm.py

@@ -50,31 +50,83 @@ class T_sigmoid_opts(unittest.TestCase):
     def test_exp_over_1_plus_exp(self):
         m = self.get_mode(excluding=['local_elemwise_fusion'])
 
-        x = T.dvector()
+        x = T.vector()
+        data = numpy.random.rand(54).astype(config.floatX)
 
         # tests exp_over_1_plus_exp
         f = theano.function([x], T.exp(x)/(1+T.exp(x)), mode=m)
-        theano.printing.debugprint(f)
         assert [node.op for node in f.maker.env.toposort()] == [sigmoid]
+        f(data)
+        f = theano.function([x], T.exp(x)/(2+T.exp(x)), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid]
+        f(data)
+        f = theano.function([x], T.exp(x)/(1-T.exp(x)), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid]
+        f(data)
+        f = theano.function([x], T.exp(x+1)/(1+T.exp(x)), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid]
+        f(data)
 
         # tests inv_1_plus_exp
         f = theano.function([x], T.fill(x,1.0) / (1+T.exp(-x)), mode=m)
-        theano.printing.debugprint(f)
         assert [node.op for node in f.maker.env.toposort()] == [sigmoid]
+        f(data)
+        f = theano.function([x], T.fill(x,1.0) / (2+T.exp(-x)), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid]
+        f(data)
+        f = theano.function([x], T.fill(x,1.0) / (1-T.exp(-x)), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid]
+        f(data)
+        f = theano.function([x], T.fill(x,1.1) / (1+T.exp(-x)), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid]
+        f(data)
 
         # tests inv_1_plus_exp with neg
         f = theano.function([x], T.fill(x,-1.0) / (1+T.exp(-x)), mode=m)
         assert [node.op for node in f.maker.env.toposort()] == [sigmoid,
                 theano.tensor.inplace.neg_inplace]
+        f(data)
+        f = theano.function([x], T.fill(x,-1.0) / (1-T.exp(-x)), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid,
+                theano.tensor.inplace.neg_inplace]
+        f(data)
+        f = theano.function([x], T.fill(x,-1.0) / (2+T.exp(-x)), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid,
+                theano.tensor.inplace.neg_inplace]
+        f(data)
+        f = theano.function([x], T.fill(x,-1.1) / (1+T.exp(-x)), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid,
+                theano.tensor.inplace.neg_inplace]
+        f(data)
 
         # tests double inv_1_plus_exp with neg
         # (-1)(exp(x)) / (1+exp(x))(1+exp(-x))
         # = (-1)/(1+exp(-x)) * exp(x)/(1+exp(x))
         # = - (sigm(x) * sigm(x))
         f = theano.function([x], (T.fill(x,-1.0)*T.exp(x)) / ((1+T.exp(x))*(1+T.exp(-x))), mode=m)
-        theano.printing.debugprint(f)
         assert [node.op for node in f.maker.env.toposort()] == [sigmoid,
                 T.mul, theano.tensor.inplace.neg_inplace]
+        f(data)
+        f = theano.function([x], (T.fill(x,-1.1)*T.exp(x)) / ((1+T.exp(x))*(1+T.exp(-x))), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid,
+                T.mul, theano.tensor.inplace.neg_inplace]
+        f(data)
+        f = theano.function([x], (T.fill(x,-1.0)*T.exp(x)) / ((2+T.exp(x))*(1+T.exp(-x))), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid,
+                T.mul, theano.tensor.inplace.neg_inplace]
+        f(data)
+        f = theano.function([x], (T.fill(x,-1.0)*T.exp(x)) / ((1+T.exp(x))*(2+T.exp(-x))), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid,
+                T.mul, theano.tensor.inplace.neg_inplace]
+        f(data)
+        f = theano.function([x], (T.fill(x,-1.0)*T.exp(x)) / ((1+T.exp(x))*(1+T.exp(x))), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid,
+                T.mul, theano.tensor.inplace.neg_inplace]
+        f(data)
+        f = theano.function([x], (T.fill(x,-1.0)*T.exp(x)) / ((1+T.exp(x))*(2+T.exp(-x))), mode=m)
+        assert [node.op for node in f.maker.env.toposort()] != [sigmoid,
+                T.mul, theano.tensor.inplace.neg_inplace]
+        f(data)
 
     def test_1msigmoid(self):
         if not register_local_1msigmoid: