make test more robust for futur change.

theano/tensor/nnet/tests/test_sigm.py

@@ -27,6 +27,8 @@ class T_sigmoid_opts(unittest.TestCase):
         m = theano.config.mode
         if m == 'FAST_COMPILE':
             m = 'FAST_RUN'
+        m = theano.compile.mode.get_mode(m)
+        m = m.excluding('local_elemwise_fusion')
 
         x = T.dvector()
 
@@ -42,12 +44,8 @@ class T_sigmoid_opts(unittest.TestCase):
 
         # tests inv_1_plus_exp with neg
         f = theano.function([x], T.fill(x,-1.0) / (1+T.exp(-x)), mode=m)
-        #theano.printing.debugprint(f)
-        assert len(f.maker.env.toposort())==1
-        assert str(f.maker.env.toposort()[0].op)=='Elemwise{Composite{scalar_sigmoid,neg}}'
-        #without fusion
-        #assert [node.op for node in f.maker.env.toposort()] == [sigmoid,
-        #        T.inplace.neg_inplace]
+        assert [node.op for node in f.maker.env.toposort()] == [sigmoid,
+                T.inplace.neg_inplace]
         
         # tests double inv_1_plus_exp with neg
         # (-1)(exp(x)) / (1+exp(x))(1+exp(-x))
@@ -55,12 +53,8 @@ class T_sigmoid_opts(unittest.TestCase):
         # = - (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 len(f.maker.env.toposort())==2
-        assert f.maker.env.toposort()[0].op == sigmoid
-        assert str(f.maker.env.toposort()[1].op)=='Elemwise{Composite{mul,neg}}'
-        #without fusion
-        #assert [node.op for node in f.maker.env.toposort()] == [sigmoid, 
-        #        T.mul, T.inplace.neg_inplace]
+        assert [node.op for node in f.maker.env.toposort()] == [sigmoid, 
+                T.mul, T.inplace.neg_inplace]
 
     def test_1msigmoid(self):
         if not register_local_1msigmoid: