moved a lot of functionality in the theano.tensor submodule

__init__.py

@@ -44,12 +44,9 @@ from compile import \
     FunctionMaker, function, OpFromGraph #, eval_outputs, fast_compute
 
 import tensor
-import tensor_random
 import scalar
 import sparse
 import gradient
-import elemwise
-import tensor_opt
 
 ## import scalar_opt
 

tensor.py → tensor/basic.py

@@ -8,20 +8,19 @@ import inspect
 import functools
 
 import numpy
-
 from copy import copy
 
-from gof import Result, Op, utils, AbstractFunctionError, Type, Constant, Apply, Value
-import gof
+from .. import gof
+from ..gof import Result, Op, utils, AbstractFunctionError, Type, Constant, Apply, Value
 
 import blas # for gemm, dot
-import gradient
+from .. import gradient
 
 import elemwise
-import scalar as scal
-from gof.python25 import partial
+from .. import scalar as scal
+from ..gof.python25 import partial
 
-import compile
+from .. import compile
 
 
 ### set up the external interface

blas.py → tensor/blas.py

 import os, sys
 import scipy.weave as weave
-import gof.utils
+from ..gof import utils
 
 
 """
@@ -796,7 +796,7 @@ def blas_proto():
     }
     """
 
-@gof.utils.memoize
+@utils.memoize
 def ldflags():
     """Return a list of libraries against which an Op's object file should be
     linked to benefit from a BLAS implementation.

elemwise.py → tensor/elemwise.py

@@ -2,11 +2,11 @@
 import elemwise_cgen as cgen
 
 import numpy
-from gof import Op, Apply
-import scalar
-from scalar import Scalar
-import gof
-from gof.python25 import all
+from .. import gof
+from ..gof import Op, Apply
+from .. import scalar
+from ..scalar import Scalar
+from ..gof.python25 import all
 from copy import copy
 
 

tensor_opt.py → tensor/opt.py

@@ -3,16 +3,16 @@
 # TODO: 0*x -> 0
 
 
-import gof
-from gof import opt
+from .. import gof
+from ..gof import opt
 from elemwise import Elemwise, DimShuffle
-import scalar
-import tensor as T
+from .. import scalar
+import basic as T
 import numpy as N
 import operator
 import itertools
 import sys
-import compile  #to register the optimizer built by this file
+from .. import compile  #to register the optimizer built by this file
 
 
 # Utilities

tensor_random.py → tensor/raw_random.py

 """Random number generation for Theano graphs."""
-import gof
-import tensor
+from .. import gof
+import basic as tensor
 import numpy
 import functools
 
-from compile import SymbolicInputKit, SymbolicInput
+from ..compile import SymbolicInputKit, SymbolicInput
 from copy import copy
 
 class RandomFunction(gof.Op):