Merged

theano/tensor/nnet/Conv3D.py

@@ -568,7 +568,3 @@ def computeH(V,W,b,d):
 
 from . import ConvGrad3D
 from . import ConvTransp3D
-
-#from theano.sandbox.cuda import cuda_available, cuda_enabled
-#if cuda_available:
-#    from . import GpuConv3D

theano/tensor/nnet/ConvGrad3D.py

@@ -265,10 +265,3 @@ class ConvGrad3D(theano.Op):
 
 
 convGrad3D = ConvGrad3D()
-
-from Conv3D import conv3D
-from ConvTransp3D import convTransp3D
-#from theano.sandbox.cuda import cuda_available, cuda_enabled
-#if cuda_available:
-#    from theano.sandbox.cuda import CudaNdarrayType, float32_shared_constructor
-#    from . import GpuConvGrad3D

theano/tensor/nnet/ConvTransp3D.py

@@ -404,6 +404,3 @@ def computeR(W,b,d,H,Rshape = None):
 from Conv3D import conv3D
 from ConvGrad3D import convGrad3D
 
-#from theano.sandbox.cuda import cuda_available, cuda_enabled
-#if cuda_available:
-#    import GpuConvTransp3D