提交 a8457f6b authored 作者: Gabe Schwartz's avatar Gabe Schwartz

Py3k locals() does not work in list comprehensions.

上级 31b7d309
...@@ -635,10 +635,8 @@ class GpuCAReduce(GpuOp): ...@@ -635,10 +635,8 @@ class GpuCAReduce(GpuOp):
# but tensor.elemwise.CAReduce has this exact same check so I guess # but tensor.elemwise.CAReduce has this exact same check so I guess
# this is OK to do # this is OK to do
if self.scalar_op in [scal.minimum, scal.maximum]: if self.scalar_op in [scal.minimum, scal.maximum]:
conds = [] conds = ["(CudaNdarray_HOST_DIMS(%s)[%d] == 0)" % (x, i) for i in xrange(nd_in) \
for i in xrange(nd_in): if self.reduce_mask[i]]
if self.reduce_mask[i]:
conds.append("(CudaNdarray_HOST_DIMS(%(x)s)[%(i)s] == 0)" % locals())
assert len(conds) > 0 assert len(conds) > 0
cond = "(" + " || ".join(conds) + ")" cond = "(" + " || ".join(conds) + ")"
print >> sio, """ print >> sio, """
...@@ -663,7 +661,7 @@ class GpuCAReduce(GpuOp): ...@@ -663,7 +661,7 @@ class GpuCAReduce(GpuOp):
j = 0 j = 0
for i in xrange(nd_in): for i in xrange(nd_in):
if not self.reduce_mask[i]: if not self.reduce_mask[i]:
print >> sio, " || (CudaNdarray_HOST_DIMS(%(z)s)[%(j)s] !=CudaNdarray_HOST_DIMS(%(x)s)[%(i)s]) " % locals() print >> sio, " || (CudaNdarray_HOST_DIMS(%(z)s)[%(j)s] !=CudaNdarray_HOST_DIMS(%s)[%d]) " % (x, i)
j += 1 j += 1
print >> sio, """ print >> sio, """
...@@ -791,7 +789,7 @@ class GpuCAReduce(GpuOp): ...@@ -791,7 +789,7 @@ class GpuCAReduce(GpuOp):
""" % locals() """ % locals()
shapes_format = "shape=(%s)" % ",".join(["%d"] * node.inputs[0].ndim) shapes_format = "shape=(%s)" % ",".join(["%d"] * node.inputs[0].ndim)
shapes_data = ",".join(["CudaNdarray_HOST_DIMS(%(x)s)[%(i)s]" % locals() shapes_data = ",".join(["CudaNdarray_HOST_DIMS(%s)[%d]" % (x, i)
for i in range(node.inputs[0].ndim)]) for i in range(node.inputs[0].ndim)])
print >> sio, """ print >> sio, """
); );
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论