Merge pull request #1139 from jlowin/sort_argsort

theano/tensor/__init__.py

@@ -54,6 +54,6 @@ import nnet  # used for softmax, sigmoid, etc.
 from theano.gradient import Rop, Lop, grad, numeric_grad, verify_grad, \
     jacobian, hessian
 
-from theano.tensor.sort import sort
+from theano.tensor.sort import sort, argsort
 from extra_ops import (DiffOp, bincount, squeeze,
                        repeat, bartlett, fill_diagonal)

theano/tensor/basic.py

@@ -1796,8 +1796,13 @@ class _tensor_py_operators:
         """See `theano.tensor.argmax`"""
         return argmax(self, axis, keepdims=keepdims)
 
+    def sort(self,  axis=-1, kind='quicksort', order=None):
+        """See `theano.tensor.sort`"""
+        from theano.tensor.sort import sort
+        return sort(self, axis, kind, order)
+
     def argsort(self,  axis=-1, kind='quicksort', order=None):
-        """See `theano.tensor.sort.argsort`"""
+        """See `theano.tensor.argsort`"""
         from theano.tensor.sort import argsort
         return argsort(self, axis, kind, order)