Remove import of test classes.

theano/sandbox/gpuarray/tests/test_basic_ops.py

@@ -7,9 +7,10 @@ import theano
 import theano.tensor as T
 from theano.tensor import TensorType
 from theano.tensor.basic import alloc
-from theano.tensor.tests.test_basic import (
-    rand, safe_make_node, T_reshape, T_Join_and_Split
-    )
+
+# Don't import test classes otherwise they get tested as part of the file
+from theano.tensor.tests import test_basic
+from theano.tensor.tests.test_basic import rand, safe_make_node
 from theano.tests.unittest_tools import SkipTest
 from numpy.testing.noseclasses import KnownFailureTest
 
@@ -340,26 +341,25 @@ def test_gpu_contiguous():
     assert f(a_val, 2).flags.c_contiguous
 
 
-class G_reshape(T_reshape):
+class G_reshape(test_basic.T_reshape):
     def shortDescription(self):
         return None
 
     def __init__(self, name):
-        T_reshape.__init__(self, name,
-                           shared=gpuarray_shared_constructor,
-                           op=GpuReshape,
-                           mode=mode_with_gpu,
-                           # avoid errors with limited devices
-#                             dtype='float32',
-                           ignore_topo=(HostFromGpu, GpuFromHost,
-                                        theano.compile.DeepCopyOp,
-                                        theano.sandbox.gpuarray.elemwise.GpuElemwise,
-                                        theano.tensor.opt.Shape_i,
-                                        theano.tensor.opt.MakeVector))
+        test_basic.T_reshape.__init__(
+            self, name,
+            shared=gpuarray_shared_constructor,
+            op=GpuReshape,
+            mode=mode_with_gpu,
+            ignore_topo=(HostFromGpu, GpuFromHost,
+                         theano.compile.DeepCopyOp,
+                         theano.sandbox.gpuarray.elemwise.GpuElemwise,
+                         theano.tensor.opt.Shape_i,
+                         theano.tensor.opt.MakeVector))
         assert self.op == GpuReshape
 
 
-class G_Join_and_Split(T_Join_and_Split):
+class G_Join_and_Split(test_basic.T_Join_and_Split):
     def setUp(self):
         super(G_Join_and_Split, self).setUp()
         self.mode = mode_with_gpu.excluding('constant_folding')

theano/sandbox/gpuarray/tests/test_subtensor.py

@@ -3,8 +3,7 @@ import numpy
 import theano
 from theano import tensor
 from theano.compile import DeepCopyOp
-
-from theano.tensor.tests.test_subtensor import T_subtensor
+from theano.tensor.tests import test_subtensor
 
 from ..basic_ops import HostFromGpu, GpuFromHost
 from ..subtensor import (GpuIncSubtensor, GpuSubtensor,
@@ -15,21 +14,22 @@ from .test_basic_ops import mode_with_gpu
 
 
 
-class G_subtensor(T_subtensor):
+class G_subtensor(test_subtensor.T_subtensor):
     def shortDescription(self):
         return None
 
     def __init__(self, name):
-        T_subtensor.__init__(self, name,
-                             shared=gpuarray_shared_constructor,
-                             sub=GpuSubtensor,
-                             inc_sub=GpuIncSubtensor,
-                             adv_incsub1=GpuAdvancedIncSubtensor1,
-                             mode=mode_with_gpu,
-                             # avoid errors with limited devices
-                             dtype='float32',
-                             ignore_topo=(HostFromGpu, GpuFromHost,
-                                          DeepCopyOp))
+        test_subtensor.T_subtensor.__init__(
+            self, name,
+            shared=gpuarray_shared_constructor,
+            sub=GpuSubtensor,
+            inc_sub=GpuIncSubtensor,
+            adv_incsub1=GpuAdvancedIncSubtensor1,
+            mode=mode_with_gpu,
+            # avoid errors with limited devices
+            dtype='float32',
+            ignore_topo=(HostFromGpu, GpuFromHost,
+                         DeepCopyOp))
         # GPU opt can't run in fast_compile only.
         self.fast_compile = False
         assert self.sub == GpuSubtensor