提交 f50cb527 authored 作者: lamblin's avatar lamblin

Merge pull request #703 from nouiz/small

Small
...@@ -312,7 +312,8 @@ class T_Scan(unittest.TestCase): ...@@ -312,7 +312,8 @@ class T_Scan(unittest.TestCase):
nodes = [x for x in my_f.maker.env.toposort() nodes = [x for x in my_f.maker.env.toposort()
if isinstance(x.op, theano.scan_module.scan_op.Scan)] if isinstance(x.op, theano.scan_module.scan_op.Scan)]
# This assertation fails if savemem optimization failed on scan # This assertation fails if savemem optimization failed on scan
assert nodes[0].op._scan_savemem_visited if theano.config.mode != "FAST_COMPILE":
assert nodes[0].op._scan_savemem_visited
rng = numpy.random.RandomState(utt.fetch_seed()) rng = numpy.random.RandomState(utt.fetch_seed())
my_f(rng.uniform(size=(3,)), my_f(rng.uniform(size=(3,)),
4, 4,
......
...@@ -3508,7 +3508,10 @@ def transpose(x, axes=None): ...@@ -3508,7 +3508,10 @@ def transpose(x, axes=None):
""" """
if axes is None: if axes is None:
axes = range((x.ndim - 1), -1, -1) axes = range((x.ndim - 1), -1, -1)
return DimShuffle(x.broadcastable, axes, inplace=False)(x) ret = DimShuffle(x.broadcastable, axes, inplace=False)(x)
if x.name and axes == range((x.ndim - 1), -1, -1):
ret.name = x.name + '.T'
return ret
class AdvancedIndexingError(TypeError): class AdvancedIndexingError(TypeError):
......
...@@ -5841,9 +5841,9 @@ class test_numpy_assumptions(unittest.TestCase): ...@@ -5841,9 +5841,9 @@ class test_numpy_assumptions(unittest.TestCase):
def test_transpose(): def test_transpose():
x1 = tensor.dvector() x1 = tensor.dvector('x1')
x2 = tensor.dmatrix() x2 = tensor.dmatrix('x2')
x3 = tensor.dtensor3() x3 = tensor.dtensor3('x3')
x1v = numpy.arange(24) x1v = numpy.arange(24)
x2v = numpy.arange(24).reshape(2, 12) x2v = numpy.arange(24).reshape(2, 12)
...@@ -5881,6 +5881,12 @@ def test_transpose(): ...@@ -5881,6 +5881,12 @@ def test_transpose():
assert numpy.all(t2d == numpy.transpose(x2v, [0, 1])) assert numpy.all(t2d == numpy.transpose(x2v, [0, 1]))
assert numpy.all(t3d == numpy.transpose(x3v, [0, 2, 1])) assert numpy.all(t3d == numpy.transpose(x3v, [0, 2, 1]))
# Check that we create a name.
assert tensor.transpose(x1).name == 'x1.T'
assert tensor.transpose(x2).name == 'x2.T'
assert tensor.transpose(x3).name == 'x3.T'
assert tensor.transpose(tensor.dmatrix()).name == None
if __name__ == '__main__': if __name__ == '__main__':
if 0: if 0:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论