提交 e5584f03 authored 作者: Ian Goodfellow's avatar Ian Goodfellow

addressed some of Olivier's complaints

various other pep8 fixes so that being pep8 compliant doesn't take as much time
上级 cfef3c00
...@@ -11,22 +11,32 @@ from theano.scalar import Scalar ...@@ -11,22 +11,32 @@ from theano.scalar import Scalar
from theano.printing import min_informative_str, pprint from theano.printing import min_informative_str, pprint
from theano.gof.python25 import all, any from theano.gof.python25 import all, any
config = theano.config config = theano.config
import traceback
import sys
# tensor depends on elemwise to provide definitions for several ops # tensor depends on elemwise to provide definitions for several ops
# but elemwise needs to make TensorType instances, so we have these as # but elemwise needs to make TensorType instances, so we have these as
# placeholders and the tensor module fills them # placeholders and the tensor module fills them
def as_tensor_variable(data): def as_tensor_variable(data):
raise Exception("Circular dependencies prevent using this here. import tensor before elemwise") raise Exception("Circular dependencies prevent using this",
"here. import tensor before elemwise")
def TensorType(*inputs, **kwargs): def TensorType(*inputs, **kwargs):
raise Exception("Circular dependencies prevent using this here. import tensor before elemwise") raise Exception("Circular dependencies prevent ",
"using this here. import tensor before elemwise")
def TensorVariable(*inputs, **kwargs): def TensorVariable(*inputs, **kwargs):
raise Exception("Circular dependencies prevent using this here. import tensor before elemwise") raise Exception("Circular ",
"dependencies ",
"prevent using this here. import tensor before elemwise")
def TensorConstant(*inputs, **kwargs): def TensorConstant(*inputs, **kwargs):
raise Exception("Circular dependencies prevent using this here. import tensor before elemwise") raise Exception("Circular dependencies ",
"prevent using this here. import tensor before elemwise")
################## ##################
...@@ -54,22 +64,28 @@ class DimShuffle(Op): ...@@ -54,22 +64,28 @@ class DimShuffle(Op):
DimShuffle((True, False), [1]) DimShuffle((True, False), [1])
This op will only work on 2d tensors with the first dimension broadcastable. This op will only work on 2d tensors with the first dimension
The second dimension of the input tensor will be the first dimension of broadcastable.
the resulting tensor. If the tensor has shape (1, 20), the resulting tensor The second dimension of the
input tensor will be the first dimension of
the resulting tensor.
If the tensor has shape (1, 20), the resulting tensor
will have shape (20, ). will have shape (20, ).
More examples: More examples:
DimShuffle((), ['x']) -> make a 0d (scalar) into a 1d vector DimShuffle((), ['x']) -> make a 0d (scalar) into a 1d vector
DimShuffle((False, False), [0, 1]) -> identity DimShuffle((False, False), [0, 1]) -> identity
DimShuffle((False, False), [1, 0]) -> inverts the first and second dimensions DimShuffle((False, False), [1, 0]) -> inverts the 1st and 2nd dimensions
DimShuffle((False,), ['x', 0]) -> make a row out of a 1d vector (N to 1xN) DimShuffle((False,), ['x', 0]) -> make a row out
DimShuffle((False,), [0, 'x']) -> make a column out of a 1d vector (N to Nx1) of a 1d vector (N to 1xN)
DimShuffle((False,), [0, 'x']) -> make a column
out of a 1d vector (N to Nx1)
DimShuffle((False, False, False), [2, 0, 1]) -> AxBxC to CxAxB DimShuffle((False, False, False), [2, 0, 1]) -> AxBxC to CxAxB
DimShuffle((False, False), [0, 'x', 1]) -> AxB to Ax1xB DimShuffle((False, False), [0, 'x', 1]) -> AxB to Ax1xB
DimShuffle((False, False), [1, 'x', 0]) -> AxB to Bx1xA DimShuffle((False, False), [1, 'x', 0]) -> AxB to Bx1xA
The reordering of the dimensions can be done in numpy with the transpose function. The reordering of the dimensions can be done in numpy with the
transpose function.
Adding, subtracting dimensions can be done with reshape. Adding, subtracting dimensions can be done with reshape.
""" """
...@@ -737,18 +753,24 @@ class Elemwise(Op): ...@@ -737,18 +753,24 @@ class Elemwise(Op):
try: try:
variables = ufunc(*ufunc_args) variables = ufunc(*ufunc_args)
except Exception, e: except Exception, e:
errormsg = 'While computing '+str(node.outputs)+ \
errormsg = 'While computing ' + str(node.outputs) + \
': Failed calling ufunc for op' + str(self.scalar_op) +\ ': Failed calling ufunc for op' + str(self.scalar_op) +\
'for params of shape' + str( [arg.shape for arg in ufunc_args]) 'for params of shape' + \
str([arg.shape for arg in ufunc_args])
if config.exception_verbosity == 'high': if config.exception_verbosity == 'high':
errormsg += 'inputs are: \n' errormsg += 'inputs are: \n'
for i, ipt in enumerate(node.inputs): for i, ipt in enumerate(node.inputs):
errormsg += '('+str(i)+') '+min_informative_str(ipt)+'\n' errormsg += '(' + str(i) + ') ' + \
min_informative_str(ipt) + '\n'
errormsg += 'outputs are: \n' errormsg += 'outputs are: \n'
for i, output in enumerate(node.outputs): for i, output in enumerate(node.outputs):
errormsg += '('+str(i)+') '+min_informative_str(output)+'\n' errormsg += '(' + str(i) + ') ' + \
errormsg += 'original exception was: '+str(e) min_informative_str(output)+'\n'
errormsg += 'original exception was: ' + \
'\n'.join( \
traceback.format_exception_only(*sys.exc_info()[0:2]))
raise Exception(errormsg) raise Exception(errormsg)
else: else:
e.args = (e.args, errormsg) e.args = (e.args, errormsg)
...@@ -756,7 +778,8 @@ class Elemwise(Op): ...@@ -756,7 +778,8 @@ class Elemwise(Op):
if nout == 1: if nout == 1:
variables = [variables] variables = [variables]
for variable, storage, nout in zip(variables, output_storage, node.outputs): for variable, storage, nout \
in zip(variables, output_storage, node.outputs):
if str(getattr(variable, "dtype", "")) == 'object': if str(getattr(variable, "dtype", "")) == 'object':
# Since numpy 1.6, function created with numpy.frompyfunc # Since numpy 1.6, function created with numpy.frompyfunc
# always return an ndarray with dtype object # always return an ndarray with dtype object
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论