added some test case for the optimisation Canonizer for elemwise.

theano/tensor/tests/test_opt.py

@@ -185,14 +185,58 @@ class test_canonize(unittest.TestCase):
         """
         verify that the Canonizer merge sequential Elemwise({mul,add})
         """
-        x, y, z = matrices('xyz')
-        for g,n in [
-            (x+y+z,1),
-            (x*y*z,1),
-            (x*y*(x+y+z),2),            
-            ]:
-            f = compile.function([x,y,z], g, mode=compile.Mode(optimizer='fast_run'))
-            assert(len(f.maker.env.toposort())==n)
+        shp=(5,5)
+        fx, fy, fz = fmatrices('xyz')
+        dx, dy, dz = dmatrices('xyz')
+        fv = fvector('r').dimshuffle('x',0)
+        fxv = numpy.asarray(numpy.random.rand(*shp),dtype='float32')
+        fyv = numpy.asarray(numpy.random.rand(*shp),dtype='float32')
+        fzv = numpy.asarray(numpy.random.rand(*shp),dtype='float32')
+        dxv = numpy.asarray(numpy.random.rand(*shp),dtype='float32')
+        dyv = numpy.asarray(numpy.random.rand(*shp),dtype='float32')
+        dzv = numpy.asarray(numpy.random.rand(*shp),dtype='float32')
+        fvv = numpy.asarray(numpy.random.rand(shp[0]),dtype='float32').reshape(1,shp[0])
+        cases = [
+            (fx+fy,(fx,fy),(fxv,fyv),1,'float32'),
+            (fx*fy,(fx,fy),(fxv,fyv),1,'float32'),
+            (fx+fy+fz,(fx,fy,fz),(fxv,fyv,fzv),1,'float32'),
+            (dx+dy+dz,(dx,dy,dz),(dxv,dyv,dzv),1,'float64'),
+            (fx*fy*fz,(fx,fy,fz),(fxv,fyv,fzv),1,'float32'),
+            (dx*dy*dz,(dx,dy,dz),(dxv,dyv,dzv),1,'float64'),
+            (fx*fy*(fx+fy+fz),(fx,fy,fz),(fxv,fyv,fzv),2,'float32'),
+            (dx*dy*(dx+dy+dz),(dx,dy,dz),(dxv,dyv,dzv),2,'float64'),
+            (fx*fy*(fx+fy+dz),(fx,fy,dz),(dxv,dyv,dzv),2,'float64'),#check mixed type add
+            (dz*fy*(fx+fy),(fx,fy,dz),(dxv,dyv,dzv),2,'float64'),#check mixed type mul
+            #check with dimshuffle of constant
+            (fx+fy+fz+2,(fx,fy,fz),(fxv,fyv,fzv),1,'float32'),
+            (fx*fy*fz*2,(fx,fy,fz),(fxv,fyv,fzv),1,'float32'),
+            (2+fx+fy+fz,(fx,fy,fz),(fxv,fyv,fzv),1,'float32'),
+            (2*fx*fy*fz,(fx,fy,fz),(fxv,fyv,fzv),1,'float32'),
+            (2+fx+fy+fz+2,(fx,fy,fz),(fxv,fyv,fzv),1,'float32'),
+            (2*fx*fy*fz*2,(fx,fy,fz),(fxv,fyv,fzv),1,'float32'),
+            (fx*fy*2*(fx+fy+fz),(fx,fy,fz),(fxv,fyv,fzv),2,'float32'),
+            (fx*fy*(2+fx+fy+fz),(fx,fy,fz),(fxv,fyv,fzv),2,'float32'),
+            (fx*fy*2*(fx+fy+fz+2),(fx,fy,fz),(fxv,fyv,fzv),2,'float32'),
+
+            #check with broadcast of row
+            (fx+fy+fz+fv,(fx,fy,fz,fv),(fxv,fyv,fzv,fvv),1,'float32'),
+            (fx*fy*fz*fv,(fx,fy,fz,fv),(fxv,fyv,fzv,fvv),1,'float32'),
+            (fv+fx+fy+fz,(fx,fy,fz,fv),(fxv,fyv,fzv,fvv),1,'float32'),
+            (fv*fx*fy*fz,(fx,fy,fz,fv),(fxv,fyv,fzv,fvv),1,'float32'),
+            (fx*fy*fv*(fx+fy+fz),(fx,fy,fz,fv),(fxv,fyv,fzv,fvv),2,'float32'),
+            (fx*fy*(fv+fx+fy+fz),(fx,fy,fz,fv),(fxv,fyv,fzv,fvv),2,'float32'),
+            (fx*fy*fv*(fv+fx+fy+fz),(fx,fy,fz,fv),(fxv,fyv,fzv,fvv),2,'float32'),
+
+            ]#[10:11]
+#        print cases
+
+        for id, [g, sym_inputs, val_inputs, expected_out_nb_elemwise, out_dtype] in enumerate(cases):
+            f = compile.function(list(sym_inputs), g,
+                                 #we need the optimisation enabled, debug do this.
+                                 mode=compile.mode.predefined_modes['DEBUG_MODE'])
+            out = f(*val_inputs)
+            assert(len(f.maker.env.toposort())==expected_out_nb_elemwise)
+            assert(out_dtype==out.dtype)
 
 def test_mixeddiv():
     """Test that int division is preserved"""