提交 6c4a5398 authored 作者: Faruk Ahmed's avatar Faruk Ahmed

profile --> (profile or print_global_stats

上级 d3dcb876
...@@ -664,7 +664,7 @@ class Function(object): ...@@ -664,7 +664,7 @@ class Function(object):
input_storage = [i.value for i in ins] input_storage = [i.value for i in ins]
# reinitialize new maker and create new function # reinitialize new maker and create new function
if profile is None: if profile is None:
profile = config.profile profile = config.profile or config.print_global_stats
# profile -> True or False # profile -> True or False
if profile is True: if profile is True:
if name: if name:
......
...@@ -364,7 +364,7 @@ def pfunc(params, outputs=None, mode=None, updates=None, givens=None, ...@@ -364,7 +364,7 @@ def pfunc(params, outputs=None, mode=None, updates=None, givens=None,
if givens is None: if givens is None:
givens = [] givens = []
if profile is None: if profile is None:
profile = config.profile profile = config.profile or config.print_global_stats
# profile -> True or False # profile -> True or False
if profile is False: if profile is False:
profile = None profile = None
......
...@@ -50,6 +50,7 @@ def _atexit_print_fn(): ...@@ -50,6 +50,7 @@ def _atexit_print_fn():
Print ProfileStat objects in _atexit_print_list to _atexit_print_file. Print ProfileStat objects in _atexit_print_list to _atexit_print_file.
""" """
if config.profile:
to_sum = [] to_sum = []
if config.profiling.destination == 'stderr': if config.profiling.destination == 'stderr':
......
...@@ -482,7 +482,7 @@ class Stack(VM): ...@@ -482,7 +482,7 @@ class Stack(VM):
try: try:
_, dt = self.run_thunk_of_node(current_apply) _, dt = self.run_thunk_of_node(current_apply)
del _ del _
if config.profile: if config.profile or config.print_global_stats:
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
...@@ -596,7 +596,7 @@ class Stack(VM): ...@@ -596,7 +596,7 @@ class Stack(VM):
if current_apply.inputs[r].owner: if current_apply.inputs[r].owner:
apply_stack.append(current_apply.inputs[r].owner) apply_stack.append(current_apply.inputs[r].owner)
else: else:
if config.profile: if config.profile or config.print_global_stats:
for (idx, o) in enumerate(thunks[ for (idx, o) in enumerate(thunks[
self.node_idx[current_apply]].outputs): self.node_idx[current_apply]].outputs):
var = self.nodes[ var = self.nodes[
...@@ -757,7 +757,7 @@ class VM_Linker(link.LocalLinker): ...@@ -757,7 +757,7 @@ class VM_Linker(link.LocalLinker):
associated to self, else, a new VM_Linker associated to fgraph. associated to self, else, a new VM_Linker associated to fgraph.
""" """
if (config.profile and if ((config.profile or config.print_global_stats) and
((hasattr(theano, 'sandbox') and ((hasattr(theano, 'sandbox') and
hasattr(theano.sandbox, 'cuda') and hasattr(theano.sandbox, 'cuda') and
theano.sandbox.cuda.cuda_enabled) or theano.sandbox.cuda.cuda_enabled) or
...@@ -856,7 +856,7 @@ class VM_Linker(link.LocalLinker): ...@@ -856,7 +856,7 @@ class VM_Linker(link.LocalLinker):
pre_call_clear = [storage_map[v] for v in self.no_recycling] pre_call_clear = [storage_map[v] for v in self.no_recycling]
if (self.callback is not None or self.callback_input is not None or if (self.callback is not None or self.callback_input is not None or
(config.profile and config.profile_memory) or ((config.profile or config.print_global_stats) and config.profile_memory) or
(self.allow_partial_eval and not self.use_cloop)): (self.allow_partial_eval and not self.use_cloop)):
if self.use_cloop and (self.callback is not None or if self.use_cloop and (self.callback is not None or
...@@ -1086,7 +1086,7 @@ class VM_Linker(link.LocalLinker): ...@@ -1086,7 +1086,7 @@ class VM_Linker(link.LocalLinker):
lazy = config.vm.lazy lazy = config.vm.lazy
if lazy is None: if lazy is None:
lazy = not all([(not th.lazy) for th in thunks]) lazy = not all([(not th.lazy) for th in thunks])
if not (lazy or (config.profile and config.profile_memory) or if not (lazy or ((config.profile or config.print_global_stats) and config.profile_memory) or
self.use_cloop or self.callback or self.callback_input): self.use_cloop or self.callback or self.callback_input):
for pair in itervalues(reallocated_info): for pair in itervalues(reallocated_info):
storage_map[pair[1]] = storage_map[pair[0]] storage_map[pair[1]] = storage_map[pair[0]]
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论