提交 f32478a3 authored 作者: Olivier Breuleux's avatar Olivier Breuleux

made the output_storage be a tuple for the time being

上级 033b4eab
...@@ -599,7 +599,7 @@ class CLinker(Linker): ...@@ -599,7 +599,7 @@ class CLinker(Linker):
# out_results = [copy(output) for output in self.outputs] # out_results = [copy(output) for output in self.outputs]
error_storage = [None, None, None] error_storage = [None, None, None]
if input_storage is None: if input_storage is None:
input_storage = [[None] for result in self.inputs] input_storage = tuple([None] for result in self.inputs)
if output_storage is None: if output_storage is None:
map = {} map = {}
output_storage = [] output_storage = []
...@@ -607,6 +607,8 @@ class CLinker(Linker): ...@@ -607,6 +607,8 @@ class CLinker(Linker):
if result not in map: if result not in map:
map[result] = [None] map[result] = [None]
output_storage.append(map[result]) output_storage.append(map[result])
input_storage = tuple(input_storage)
output_storage = tuple(output_storage)
thunk = self.cthunk_factory(error_storage, thunk = self.cthunk_factory(error_storage,
input_storage, input_storage,
output_storage) output_storage)
......
...@@ -231,8 +231,8 @@ class PerformLinker(LocalLinker): ...@@ -231,8 +231,8 @@ class PerformLinker(LocalLinker):
thunks = [] thunks = []
input_storage, output_storage, storage_map = map_storage(env, order, input_storage, output_storage) input_storage, output_storage, storage_map = map_storage(env, order, input_storage, output_storage)
for node in order: for node in order:
node_input_storage = [storage_map[input] for input in node.inputs] node_input_storage = tuple(storage_map[input] for input in node.inputs)
node_output_storage = [storage_map[output] for output in node.outputs] node_output_storage = tuple(storage_map[output] for output in node.outputs)
p = node.op.perform p = node.op.perform
thunk = lambda p = p, i = node_input_storage, o = node_output_storage, n = node: p(n, [x[0] for x in i], o) thunk = lambda p = p, i = node_input_storage, o = node_output_storage, n = node: p(n, [x[0] for x in i], o)
thunk.inputs = node_input_storage thunk.inputs = node_input_storage
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论