提交 6298f875 authored 作者: Roy Xue's avatar Roy Xue

PEP format check

上级 84205775
...@@ -56,6 +56,7 @@ raise_with_op = link.raise_with_op ...@@ -56,6 +56,7 @@ raise_with_op = link.raise_with_op
class VM(object): class VM(object):
""" """
A VM object's __call__ method evaluates a Theano program. A VM object's __call__ method evaluates a Theano program.
...@@ -83,6 +84,7 @@ class VM(object): ...@@ -83,6 +84,7 @@ class VM(object):
storage. False means it *must not* repeat that feedback. storage. False means it *must not* repeat that feedback.
""" """
def __init__(self, nodes, thunks, pre_call_clear): def __init__(self, nodes, thunks, pre_call_clear):
""" """
Allocate a virtual machine. Allocate a virtual machine.
...@@ -159,10 +161,12 @@ class VM(object): ...@@ -159,10 +161,12 @@ class VM(object):
class Loop(VM): class Loop(VM):
""" """
Unconditional start-to-finish program execution in Python. Unconditional start-to-finish program execution in Python.
No garbage collection is allowed on intermediate results. No garbage collection is allowed on intermediate results.
""" """
def __call__(self): def __call__(self):
if self.time_thunks: if self.time_thunks:
for cont in self.pre_call_clear: for cont in self.pre_call_clear:
...@@ -188,10 +192,12 @@ class Loop(VM): ...@@ -188,10 +192,12 @@ class Loop(VM):
class LoopGC(VM): class LoopGC(VM):
""" """
Unconditional start-to-finish program execution in Python. Unconditional start-to-finish program execution in Python.
Garbage collection is possible on intermediate results. Garbage collection is possible on intermediate results.
""" """
def __init__(self, nodes, thunks, pre_call_clear, post_thunk_clear): def __init__(self, nodes, thunks, pre_call_clear, post_thunk_clear):
super(LoopGC, self).__init__(nodes, thunks, pre_call_clear) super(LoopGC, self).__init__(nodes, thunks, pre_call_clear)
self.post_thunk_clear = post_thunk_clear self.post_thunk_clear = post_thunk_clear
...@@ -231,6 +237,7 @@ class LoopGC(VM): ...@@ -231,6 +237,7 @@ class LoopGC(VM):
class Stack(VM): class Stack(VM):
""" """
Finish-to-start evalution order of thunks. Finish-to-start evalution order of thunks.
...@@ -340,7 +347,7 @@ class Stack(VM): ...@@ -340,7 +347,7 @@ class Stack(VM):
apply_stack = list(self.base_apply_stack) apply_stack = list(self.base_apply_stack)
last_apply_stack_len = -1 last_apply_stack_len = -1
#This record all function inputs/shared varibles and constants # This record all function inputs/shared varibles and constants
for var, data in self.storage_map.iteritems(): for var, data in self.storage_map.iteritems():
if data[0] is None: if data[0] is None:
continue continue
...@@ -396,7 +403,7 @@ class Stack(VM): ...@@ -396,7 +403,7 @@ class Stack(VM):
current_idx = self.node_idx[current_apply] current_idx = self.node_idx[current_apply]
self.call_counts[current_idx] += 1 self.call_counts[current_idx] += 1
self.call_times[current_idx] += dt self.call_times[current_idx] += dt
## Computing the memory footprint of the the op # Computing the memory footprint of the the op
# ?? What about inplace .. if the op is inplace # ?? What about inplace .. if the op is inplace
# you don't actually ask for more memory! # you don't actually ask for more memory!
for (idx, o) in enumerate( for (idx, o) in enumerate(
...@@ -436,15 +443,16 @@ class Stack(VM): ...@@ -436,15 +443,16 @@ class Stack(VM):
if all(compute_map[v][0] if all(compute_map[v][0]
for v in dependencies[i]): for v in dependencies[i]):
storage_map[i][0] = None storage_map[i][0] = None
input_index.append(current_apply.inputs.index(i)) input_index.append(
current_apply.inputs.index(i))
#DO NOT set compute_map to 0 # DO NOT set compute_map to 0
#If values become False and the # If values become False and the
#current_apply is still in the #current_apply is still in the
#stack, this will cause it to be # stack, this will cause it to be
#recomputed! This can cause wrong value # recomputed! This can cause wrong value
#with some combination of inplace op. # with some combination of inplace op.
compute_map[i][0] = 2 compute_map[i][0] = 2
if (config.warn.vm_gc_bug and if (config.warn.vm_gc_bug and
current_apply in apply_stack and current_apply in apply_stack and
...@@ -456,7 +464,8 @@ class Stack(VM): ...@@ -456,7 +464,8 @@ class Stack(VM):
" only in the development version between July 5th 2012" " only in the development version between July 5th 2012"
" and July 30th 2012. This was not in a released version." " and July 30th 2012. This was not in a released version."
" The bug was affecting this script.", " The bug was affecting this script.",
#The stack level is not good when inside a Scan. # The stack level is not good when
# inside a Scan.
stacklevel=3 stacklevel=3
) )
self.node_cleared_order.append(input_index) self.node_cleared_order.append(input_index)
...@@ -468,7 +477,6 @@ class Stack(VM): ...@@ -468,7 +477,6 @@ class Stack(VM):
for inp in current_deps for inp in current_deps
if inp.owner) if inp.owner)
elif not computed_outs: elif not computed_outs:
# #
# stack loop: Lazy Evaluation Case # stack loop: Lazy Evaluation Case
...@@ -531,9 +539,10 @@ class Stack(VM): ...@@ -531,9 +539,10 @@ class Stack(VM):
break break
if empty_storage_map: if empty_storage_map:
storage_map[i][0] = None storage_map[i][0] = None
input_index.append(current_apply.inputs.index(i)) input_index.append(
#See the not lazy gc code for explanations current_apply.inputs.index(i))
#of compute_map change # See the not lazy gc code for explanations
# of compute_map change
compute_map[i][0] = 2 compute_map[i][0] = 2
self.node_cleared_order.append(input_index) self.node_cleared_order.append(input_index)
...@@ -560,6 +569,7 @@ try: ...@@ -560,6 +569,7 @@ try:
import lazylinker_c import lazylinker_c
class CVM(lazylinker_c.CLazyLinker, VM): class CVM(lazylinker_c.CLazyLinker, VM):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
lazylinker_c.CLazyLinker.__init__(self, *args, **kwargs) lazylinker_c.CLazyLinker.__init__(self, *args, **kwargs)
# skip VM.__init__ # skip VM.__init__
...@@ -576,6 +586,7 @@ except (OSError, theano.gof.cmodule.MissingGXX), e: ...@@ -576,6 +586,7 @@ except (OSError, theano.gof.cmodule.MissingGXX), e:
class VM_Linker(link.LocalLinker): class VM_Linker(link.LocalLinker):
""" """
Class that satisfies the Linker interface by acting as a VM factory. Class that satisfies the Linker interface by acting as a VM factory.
""" """
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论