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

diff --git a/profiler.lua b/profiler.lua
index 6f63861..4e45787 100644
--- 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
       {
@@ -48,22 +48,20 @@ function profiler.decor(model, functionsToDecorate)
    for _, name in pairs(functionsToDecorate) do
       model.accTime = {}
 
-      local functionTable = model
+      local nameOrig = name .. '__orig'
 
-      -- 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
+      -- We decorate the class and not the object, otherwise we cannot
+      -- save models anymore.
 
-      while functionTable and not rawget(functionTable, name) do
-         functionTable = getmetatable(functionTable)
+      if rawget(model, name) then
+         error('We decorate the class, not the objects, and there is a ' .. name .. ' in ' .. model)
       end
 
-      local nameOrig = name .. '__orig'
+      local toDecorate = getmetatable(model)
 
-      if functionTable[name] and not functionTable[nameOrig] then
-         print('Profiler decoring ' .. functionTable.__typename .. '.' .. name)
-         functionTable[nameOrig] = functionTable[name]
-         functionTable[name] = function(self, ...)
+      if toDecorate[name] and not toDecorate[nameOrig] then
+         toDecorate[nameOrig] = toDecorate[name]
+         toDecorate[name] = function(self, ...)
             local startTime = sys.clock()
             local result = { self[nameOrig](self, unpack({...})) }
             local endTime = sys.clock()
@@ -76,37 +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, indent)
+function profiler.print(model, nbSamples, totalTime, indent)
    local indent = indent or ''
 
    print(string.format('%s* %s', indent, model.__typename))
 
-   if nbSamples then
-      for l, t in pairs(model.accTime) do
-         print(string.format('%s  %s %.02fs (%.01fmus/sample)',
-                             indent,
-                             l,
-                             t,
-                             1e6 * t / nbSamples))
+   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
-   else
-      for l, t in pairs(model.accTime) do
-         print(string.format('%s  %s %.02fs',
-                             indent,
-                             l,
-                             t))
+      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, indent .. '  ')
+         profiler.print(m, nbSamples, totalTime, indent .. '  ')
       end
    end
 end