Merged -- no conflict

theano/__init__.py

@@ -49,6 +49,8 @@ from gof import \
      Type, Generic, generic, \
      object2, utils
 
+import compile
+
 from compile import \
     SymbolicInput, In, \
     SymbolicOutput, Out, \

theano/misc/may_share_memory.py

@@ -18,7 +18,7 @@ except ImportError:
     def _is_sparse(a):
         return False
 
-import theano.sandbox.cuda as cuda
+from theano.sandbox import cuda
 if cuda.cuda_available:
     def _is_cuda(a):
         return isinstance(a, cuda.CudaNdarray)

theano/scan_module/tests/test_scan.py

@@ -254,7 +254,7 @@ class T_Scan(unittest.TestCase):
     # This first version test the first case in the optimizer to the gpu.
     def test_one_sequence_one_output_weights_gpu1(self):
         from nose.plugins.skip import SkipTest
-        import theano.sandbox.cuda as cuda
+        from theano.sandbox import cuda
         if cuda.cuda_available == False:
             raise SkipTest('Optional package cuda disabled')
 
@@ -331,7 +331,7 @@ class T_Scan(unittest.TestCase):
     # This second version test the second case in the optimizer to the gpu.
     def test_one_sequence_one_output_weights_gpu2(self):
         from nose.plugins.skip import SkipTest
-        import theano.sandbox.cuda as cuda
+        from theano.sandbox import cuda
         if cuda.cuda_available == False:
             raise SkipTest('Optional package cuda disabled')