提交 19ed4931 authored 作者: Frédéric Bastien's avatar Frédéric Bastien

Merge pull request #3868 from kmike/py3-raise_with_op

fixed theano.gof.link.raise_with_op in Python 3
...@@ -227,7 +227,7 @@ def raise_with_op(node, thunk=None, exc_info=None, storage_map=None): ...@@ -227,7 +227,7 @@ def raise_with_op(node, thunk=None, exc_info=None, storage_map=None):
dtype = storage_map[k][0].dtype dtype = storage_map[k][0].dtype
storage_map_item.append(numpy.dtype(dtype).itemsize) storage_map_item.append(numpy.dtype(dtype).itemsize)
if shapeinfo is None: if shapeinfo is None:
storage_map_item.append(None) storage_map_item.append(-1)
else: else:
sz = numpy.dtype(dtype).itemsize * numpy.prod(shapeinfo) sz = numpy.dtype(dtype).itemsize * numpy.prod(shapeinfo)
storage_map_item.append(sz) storage_map_item.append(sz)
...@@ -263,7 +263,7 @@ def raise_with_op(node, thunk=None, exc_info=None, storage_map=None): ...@@ -263,7 +263,7 @@ def raise_with_op(node, thunk=None, exc_info=None, storage_map=None):
else: else:
bytes = getsizeof(storage_map[k][0]) bytes = getsizeof(storage_map[k][0])
storage_map_item.append(bytes) storage_map_item.append(bytes)
storage_map_item.append(None) storage_map_item.append(-1)
# Flag of shared val # Flag of shared val
# storage_map_item[4] # storage_map_item[4]
...@@ -278,7 +278,7 @@ def raise_with_op(node, thunk=None, exc_info=None, storage_map=None): ...@@ -278,7 +278,7 @@ def raise_with_op(node, thunk=None, exc_info=None, storage_map=None):
from operator import itemgetter from operator import itemgetter
storage_map_list.sort(key=itemgetter(3), reverse=True) storage_map_list.sort(key=itemgetter(3), reverse=True)
for item in storage_map_list: for item in storage_map_list:
if item[3] is None: if item[3] == -1:
continue continue
detailed_err_msg += " - " + item[0] + ", " detailed_err_msg += " - " + item[0] + ", "
if item[4] is True: if item[4] is True:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论