X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=profiler-torch.git;a=blobdiff_plain;f=profiler.lua;h=6f63861ea87df8d7d38501d83510bd3cf3e497ea;hp=58100e7ae3766fde5836cd8d18e525affc45c0f4;hb=c4b8d97c31f5e7dc948bf51ad6564d24e377801b;hpb=59733f475cf99a682c7b3368bffe7d2866c5b585

diff --git a/profiler.lua b/profiler.lua
old mode 100755
new mode 100644
index 58100e7..6f63861
--- a/profiler.lua
+++ b/profiler.lua
@@ -46,23 +46,28 @@ function profiler.decor(model, functionsToDecorate)
       }
 
    for _, name in pairs(functionsToDecorate) do
-      model.accTime = 0
+      model.accTime = {}
 
       local functionTable = model
 
-      if not rawget(functionTable, name) then
-         functionTable = getmetatable(model)
+      -- We decorate the function where it is defined in the class
+      -- hierarchy, so we have to go up the metatables until we find
+      -- it with rawget
+
+      while functionTable and not rawget(functionTable, name) do
+         functionTable = getmetatable(functionTable)
       end
 
-      if functionTable[name] and not (functionTable.orig and functionTable.orig[name]) then
+      local nameOrig = name .. '__orig'
+
+      if functionTable[name] and not functionTable[nameOrig] then
          print('Profiler decoring ' .. functionTable.__typename .. '.' .. name)
-         functionTable.orig = functionTable.orig or {}
-         functionTable.orig[name] = functionTable[name]
+         functionTable[nameOrig] = functionTable[name]
          functionTable[name] = function(self, ...)
             local startTime = sys.clock()
-            local result = { self.orig[name](self, unpack({...})) }
+            local result = { self[nameOrig](self, unpack({...})) }
             local endTime = sys.clock()
-            self.accTime = self.accTime + endTime - startTime
+            self.accTime[name] = (self.accTime[name] or 0) + endTime - startTime
             return unpack(result)
          end
       end
@@ -77,20 +82,31 @@ function profiler.decor(model, functionsToDecorate)
 
 end
 
-function profiler.print(model, nbSamples)
-   print('----------------------------------------------------------------------')
-   print(model)
+function profiler.print(model, nbSamples, indent)
+   local indent = indent or ''
+
+   print(string.format('%s* %s', indent, model.__typename))
+
    if nbSamples then
-      print(string.format('acc_time %.02fs (%.01fmus/sample)',
-                          model.accTime,
-                          1e6 * model.accTime / nbSamples))
+      for l, t in pairs(model.accTime) do
+         print(string.format('%s  %s %.02fs (%.01fmus/sample)',
+                             indent,
+                             l,
+                             t,
+                             1e6 * t / nbSamples))
+      end
    else
-      print(string.format('acc_time %.02fs', model.accTime))
+      for l, t in pairs(model.accTime) do
+         print(string.format('%s  %s %.02fs',
+                             indent,
+                             l,
+                             t))
+      end
    end
 
    if torch.isTypeOf(model, nn.Container) then
       for _, m in ipairs(model.modules) do
-         profiler.print(m, nbSamples)
+         profiler.print(m, nbSamples, indent .. '  ')
       end
    end
 end