Move blocksparse to tensor.nnet

theano/sandbox/__init__.py

-from . import opt

theano/sandbox/cuda/tests/test_blocksparse.py

@@ -4,7 +4,7 @@ from nose.plugins.skip import SkipTest
 import theano
 from theano import tensor
 import theano.tests.unittest_tools as utt
-import theano.sandbox.tests.test_blocksparse
+import theano.tensor.nnet.tests.test_blocksparse
 
 import theano.sandbox.cuda as cuda_ndarray
 from theano.sandbox.cuda.blocksparse import (GpuSparseBlockOuter,

theano/sandbox/cuda/tests/test_opt.py

@@ -29,7 +29,7 @@ from theano.sandbox.cuda import basic_ops
 from theano.sandbox.cuda.type import CudaNdarrayType
 from theano.scalar.basic_scipy import erfinv
 
-from theano.sandbox.blocksparse import sparse_block_dot
+from theano.tensor.nnet.blocksparse import sparse_block_dot
 from theano.sandbox.cuda.blocksparse import GpuSparseBlockGemv, GpuSparseBlockOuter
 
 

theano/tensor/nnet/__init__.py

 from .nnet import *
+from . import opt
 from .conv import conv2d, ConvOp
 from .Conv3D import *
 from .ConvGrad3D import *

theano/tensor/nnet/nnet.py

@@ -29,7 +29,7 @@ from theano.gof import Apply
 from theano.tensor.nnet.sigm import sigmoid, softplus
 from theano.gradient import DisconnectedType
 from theano.gradient import grad_not_implemented
-from theano.sandbox.blocksparse import sparse_block_dot
+from theano.tensor.nnet.blocksparse import sparse_block_dot
 from theano.tensor.type import values_eq_approx_remove_nan
 
 

theano/sandbox/opt.py → theano/tensor/nnet/opt.py

 """
-Optimizations addressing the ops in sandbox root directory
+Optimizations addressing the ops in nnet root directory
 """
 
 from theano import compile  # to register the optimizer built by this file
 from theano import gof
-from theano.sandbox.blocksparse import (
+from theano.tensor.nnet.blocksparse import (
     SparseBlockGemv,
     SparseBlockOuter,
     sparse_block_gemv_inplace,

theano/sandbox/tests/test_blocksparse.py → theano/tensor/nnet/tests/test_blocksparse.py

@@ -10,7 +10,7 @@ import theano
 from theano import tensor
 import theano.tests.unittest_tools as utt
 
-from theano.sandbox.blocksparse import sparse_block_dot, \
+from theano.tensor.nnet.blocksparse import sparse_block_dot, \
     sparse_block_gemv, sparse_block_outer
 
 

theano/sandbox/tests/test_opt.py → theano/tensor/nnet/tests/test_opt.py

 import theano
 from theano import tensor
-from theano.sandbox.blocksparse import sparse_block_dot
+from theano.tensor.nnet.blocksparse import sparse_block_dot
 
 
 def test_blocksparse_inplace_gemv_opt():