Merge pull request #2197 from dmitriy-serdyuk/doc_fix

doc/library/tensor/basic.txt

@@ -1000,6 +1000,7 @@ Reductions
 
     :Returns: A new array holding the result.
 
+.. _indexing:
 
 Indexing
 ========

doc/library/tensor/nnet/index.txt

@@ -18,3 +18,4 @@ and ops which are particular to neural networks and deep learning.
 
     conv
     nnet
+    neighbours

doc/library/tensor/nnet/neighbours.txt

+.. _libdoc_tensor_nnet_neighbours:
+
+=======================================================================
+:mod:`neighbours` -- Ops for working with images in convolutional nets
+=======================================================================
+
+.. module:: sandbox.neighbours
+   :platform: Unix, Windows
+   :synopsis: Ops for working with images in conv nets
+.. moduleauthor:: LISA
+
+
+- Functions
+
+    .. autofunction:: theano.tensor.nnet.neighbours.images2neibs
+
+    .. autofunction:: theano.tensor.nnet.neighbours.neibs2images
+
+- See also: :ref:`indexing`, :ref:`lib_scan`

theano/sandbox/cuda/neighbours.py

@@ -3,7 +3,7 @@ from theano import Op, Apply, tensor
 from theano.gof import local_optimizer
 from theano.sandbox.cuda import cuda_available, GpuOp
 
-from theano.sandbox.neighbours import Images2Neibs
+from theano.tensor.nnet.neighbours import Images2Neibs
 
 if cuda_available:
     from theano.sandbox.cuda import CudaNdarrayType

theano/sandbox/cuda/opt.py

@@ -95,13 +95,13 @@ register_opt(name='gpu_constant_folding')(
 # moved to the GPU. This list is used by an optimization.
 # Hopefully, we can keep this list up to date.
 import theano.tensor.signal.downsample
-import theano.sandbox.neighbours
+import theano.tensor.nnet.neighbours
 cpu_ops_moved_to_gpu = [
     tensor.blas.Dot22, tensor.blas.Dot22Scalar, tensor.blas.Gemm,
     tensor.blas.Gemv, tensor.blas.Ger, tensor.nnet.conv.ConvOp,
     tensor.signal.downsample.DownsampleFactorMax,
     tensor.signal.downsample.DownsampleFactorMaxGrad,
-    theano.sandbox.neighbours.Images2Neibs,
+    theano.tensor.nnet.neighbours.Images2Neibs,
     tensor.nnet.CrossentropySoftmaxArgmax1HotWithBias,
     tensor.nnet.CrossentropySoftmax1HotWithBiasDx,
     tensor.nnet.Softmax, tensor.nnet.SoftmaxWithBias,

theano/sandbox/cuda/tests/test_neighbours.py

@@ -5,7 +5,7 @@ import theano.sandbox.cuda as cuda_ndarray
 if cuda_ndarray.cuda_available == False:
     raise SkipTest('Optional package cuda disabled')
 
-import theano.sandbox.test_neighbours
+import theano.tensor.nnet.tests.test_neighbours
 from theano.sandbox.cuda.neighbours import GpuImages2Neibs
 
 if theano.config.mode == 'FAST_COMPILE':
@@ -14,7 +14,7 @@ else:
     mode_with_gpu = theano.compile.mode.get_default_mode().including('gpu')
 
 
-class T_GpuImages2Neibs(theano.sandbox.test_neighbours.T_Images2Neibs):
+class T_GpuImages2Neibs(theano.tensor.nnet.tests.test_neighbours.T_Images2Neibs):
     mode = mode_with_gpu
     op = GpuImages2Neibs
     dtypes = ['float32']

theano/sandbox/gpuarray/neighbours.py

@@ -2,7 +2,7 @@ import numpy
 
 from theano import Op, Apply, config
 from theano.gof import local_optimizer
-from theano.sandbox.neighbours import Images2Neibs
+from theano.tensor.nnet.neighbours import Images2Neibs
 import theano.tensor as T
 
 try:

theano/sandbox/gpuarray/tests/test_neighbours.py

@@ -4,11 +4,11 @@ import unittest
 from theano.sandbox.gpuarray.tests.test_basic_ops import (mode_with_gpu,
                                                           mode_without_gpu)
 
-import theano.sandbox.test_neighbours
+import theano.tensor.nnet.tests.test_neighbours
 from theano.sandbox.gpuarray.neighbours import GpuImages2Neibs
 
 
-class T_GpuImages2Neibs(theano.sandbox.test_neighbours.T_Images2Neibs):
+class T_GpuImages2Neibs(theano.tensor.nnet.tests.test_neighbours.T_Images2Neibs):
     mode = mode_with_gpu
     op = GpuImages2Neibs
     dtypes = ['int64', 'float32', 'float64']

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

@@ -6,7 +6,7 @@ import theano
 from theano import shared, function
 from theano.gof.python25 import any
 import theano.tensor as T
-from neighbours import images2neibs, neibs2images, Images2Neibs
+from theano.tensor.nnet.neighbours import images2neibs, neibs2images, Images2Neibs
 
 from theano.tests import unittest_tools