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

diff --git a/profiler.lua b/profiler.lua
old mode 100755
new mode 100644
index 58100e7..4e45787
--- a/profiler.lua
+++ b/profiler.lua
@@ -37,7 +37,7 @@ require 'sys'
 
 profiler = {}
 
-function profiler.decor(model, functionsToDecorate)
+function profiler.decorate(model, functionsToDecorate)
 
    local functionsToDecorate = functionsToDecorate or
       {
@@ -46,23 +46,26 @@ function profiler.decor(model, functionsToDecorate)
       }
 
    for _, name in pairs(functionsToDecorate) do
-      model.accTime = 0
+      model.accTime = {}
 
-      local functionTable = model
+      local nameOrig = name .. '__orig'
 
-      if not rawget(functionTable, name) then
-         functionTable = getmetatable(model)
+      -- We decorate the class and not the object, otherwise we cannot
+      -- save models anymore.
+
+      if rawget(model, name) then
+         error('We decorate the class, not the objects, and there is a ' .. name .. ' in ' .. model)
       end
 
-      if functionTable[name] and not (functionTable.orig and functionTable.orig[name]) then
-         print('Profiler decoring ' .. functionTable.__typename .. '.' .. name)
-         functionTable.orig = functionTable.orig or {}
-         functionTable.orig[name] = functionTable[name]
-         functionTable[name] = function(self, ...)
+      local toDecorate = getmetatable(model)
+
+      if toDecorate[name] and not toDecorate[nameOrig] then
+         toDecorate[nameOrig] = toDecorate[name]
+         toDecorate[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
@@ -71,26 +74,33 @@ function profiler.decor(model, functionsToDecorate)
 
    if torch.isTypeOf(model, nn.Container) then
       for _, m in ipairs(model.modules) do
-         profiler.decor(m, functionsToDecorate)
+         profiler.decorate(m, functionsToDecorate)
       end
    end
 
 end
 
-function profiler.print(model, nbSamples)
-   print('----------------------------------------------------------------------')
-   print(model)
-   if nbSamples then
-      print(string.format('acc_time %.02fs (%.01fmus/sample)',
-                          model.accTime,
-                          1e6 * model.accTime / nbSamples))
-   else
-      print(string.format('acc_time %.02fs', model.accTime))
+function profiler.print(model, nbSamples, totalTime, indent)
+   local indent = indent or ''
+
+   print(string.format('%s* %s', indent, model.__typename))
+
+   for l, t in pairs(model.accTime) do
+      local s = string.format('%s  %s %.02fs', indent, l, t)
+      if totalTime then
+         s = s .. string.format(' [%.02f%%]', 100 * t / totalTime)
+      end
+      if nbSamples then
+         s = s .. string.format(' (%.01fmus/sample)', 1e6 * t / nbSamples)
+      end
+      print(s)
    end
 
+   print()
+
    if torch.isTypeOf(model, nn.Container) then
       for _, m in ipairs(model.modules) do
-         profiler.print(m, nbSamples)
+         profiler.print(m, nbSamples, totalTime, indent .. '  ')
       end
    end
 end