fix the argument passing problem to ProfileStats.print_extra() and corresponding…

theano/compile/profiling.py

@@ -102,7 +102,6 @@ def _atexit_print_fn():
                         assert len(merge) == len(cum.optimizer_profile[1])
                         cum.optimizer_profile = (cum.optimizer_profile[0], merge)
                     except Exception as e:
-                        print("Got an exception while merging profile")
                         print(e)
                         cum.optimizer_profile = None
                 else:
@@ -178,7 +177,7 @@ class ProfileStats(object):
         self.apply_time = {}
         self.apply_callcount = {}
         # self.apply_cimpl = None
-        # self.messge = None
+        # self.message = None
     #
     # Note on implementation:
     # Class variables are used here so that each one can be
@@ -1472,7 +1471,8 @@ class ProfileStats(object):
             print("  Sorry, no tip for today.", file=file)
 
     def print_extra(self):
-        params = [None, None, None, None, self.apply_time, None, None, None, None]
+        params = [self.message, self.compile_time, self.fct_call_time,
+                  self.apply_time, self.apply_cimpl, self.output_size]
         for f in _profiler_printers:
             f(*params)
         

theano/gpuarray/basic_ops.py

@@ -1540,15 +1540,18 @@ class GpuSplit(HideC, Split):
 
 
 @theano.compile.profiling.register_profiler_printer
-def profile_printer(fct_name, compile_time, fct_call_time, fct_call,
-                    apply_time, apply_cimpl, message, outputs_size,
-                    other_time):
-    if any([x[1].op.__class__.__name__.lower().startswith("gpu")
+def profile_printer(message, compile_time, fct_call_time, 
+                    apply_time, apply_cimpl, outputs_size):
+    if any([x.op.__class__.__name__.lower().startswith("gpu")
             for x in apply_time.keys()]):
         local_time = sum(apply_time.values())
         print()
         print('Some info useful for gpu:')
 
+        fct_call = set()
+        for node in apply_time.keys():
+            fct_call.add(node.fgraph)
+
         cpu = 0
         gpu = 0
         trans = 0

theano/scan_module/scan_op.py

@@ -2868,17 +2868,21 @@ gof.ops_with_inner_function[Scan] = 'fn'
 
 
 @theano.compile.profiling.register_profiler_printer
-def profile_printer(fct_name, compile_time, fct_call_time, fct_call,
-                    apply_time, apply_cimpl, message, outputs_size,
-                    other_time):
+def profile_printer(message, compile_time, fct_call_time, 
+                    apply_time, apply_cimpl, outputs_size):
     # Scan overhead profile
-    if any([isinstance(node.op, Scan) and v > 0 for (_, node), v in
+    if any([isinstance(node.op, Scan) and v > 0 for node, v in
             apply_time.items()]):
         print()
         print('Scan overhead:')
         print('<Scan op time(s)> <sub scan fct time(s)> <sub scan op '
               'time(s)> <sub scan fct time(% scan op time)> <sub scan '
               'op time(% scan op time)> <node>')
+
+        fct_call = set()
+        for node in apply_time.keys():
+            fct_call.add(node.fgraph)
+
         total_super_scan_time = 0
         total_scan_fct_time = 0
         total_scan_op_time = 0