Merge pull request #2831 from nouiz/tests

theano/sandbox/cuda/tests/test_opt.py

@@ -343,7 +343,7 @@ def test_local_gpu_split():
     f = theano.function([x, splits], [ra, rb, rc], mode=mode_with_gpu)
     gpu_res = f([0, 1, 2, 3, 4, 5], [3, 2, 1])
     l = f.maker.fgraph.toposort()
-    assert any([isinstance(o.op, theano.sandbox.cuda.GpuSplit) for o in l])
+    assert any([isinstance(o.op, cuda.GpuSplit) for o in l])
     # Check equality
     assert all([(cpu == gpu).all() for cpu, gpu in zip(cpu_res, gpu_res)])
 
@@ -354,7 +354,7 @@ def test_local_gpu_split():
                         mode=mode_with_gpu.excluding("InputToGpuOptimizer"))
     gpu_res = f([0, 1, 2, 3, 4, 5], [3, 2, 1])
     l = f.maker.fgraph.toposort()
-    assert any([isinstance(o.op, theano.sandbox.cuda.GpuSplit) for o in l])
+    assert any([isinstance(o.op, cuda.GpuSplit) for o in l])
     # Check equality
     assert all([(cpu == gpu).all() for cpu, gpu in zip(cpu_res, gpu_res)])
 
@@ -363,13 +363,16 @@ def test_local_gpu_split():
     f = theano.function([x, splits], [ra], mode=mode_without_gpu)
     cpu_res = f([0, 1, 2, 3, 4, 5], [6])
     l = f.maker.fgraph.toposort()
-    # Ensure that one op is theano.tensor.Split
-    assert any([isinstance(o.op, theano.tensor.Split) for o in l])
+    # Ensure that no op is theano.tensor.Split or GpuSplit, they get
+    # optimized away.
+    assert not any([isinstance(o.op, (theano.tensor.Split,
+                                      cuda.GpuSplit)) for o in l])
     # GPU version
     f = theano.function([x, splits], [ra], mode=mode_with_gpu)
     gpu_res = f([0, 1, 2, 3, 4, 5], [6])
     l = f.maker.fgraph.toposort()
-    assert any([isinstance(o.op, theano.sandbox.cuda.GpuSplit) for o in l])
+    assert not any([isinstance(o.op, (theano.tensor.Split,
+                                      cuda.GpuSplit)) for o in l])
     # Check equality
     assert all([(cpu == gpu).all() for cpu, gpu in zip(cpu_res, gpu_res)])