X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=profiler-torch.git;a=blobdiff_plain;f=profiler.lua;h=4420af79b203464c276bc573bfb95459ddc461e9;hp=ad280d245ac3ddf6d03e34d4616fe35e04f20c67;hb=f59950ed20a2d471c59e2c23bc41b50111a54cd6;hpb=40c92fc3324ed00f30d0f01f6b6c4010b2a1e1fe

diff --git a/profiler.lua b/profiler.lua
index ad280d2..4420af7 100644
--- a/profiler.lua
+++ b/profiler.lua
@@ -37,7 +37,17 @@ require 'sys'
 
 profiler = {}
 
-function profiler.decor(model, functionsToDecorate)
+profiler.color = true
+
+profiler.colors = function(name)
+   if profiler.color then
+      return sys.COLORS[name]
+   else
+      return ''
+   end
+end
+
+function profiler.decorate(model, functionsToDecorate)
 
    local functionsToDecorate = functionsToDecorate or
       {
@@ -50,9 +60,21 @@ function profiler.decor(model, functionsToDecorate)
 
       local nameOrig = name .. '__orig'
 
-      if model[name] and not model[nameOrig] then
-         model[nameOrig] = model[name]
-         model[name] = function(self, ...)
+      -- 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
+                  .. '\' function in '
+                  .. tostring(model))
+      end
+
+      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[nameOrig](self, unpack({...})) }
             local endTime = sys.clock()
@@ -65,30 +87,55 @@ 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.timing(l, t, nbSamples, totalTime)
+   local s = string.format('%s %.02fs', l, t)
+   if totalTime then
+      s = s .. string.format(profiler.colors('blue') .. ' [%.02f%%]', 100 * t / totalTime)
+   end
+   if nbSamples then
+      s = s .. string.format(profiler.colors('green') .. ' (%.01fmus/sample)', 1e6 * t / nbSamples)
+   end
+   s = s .. profiler.colors('black')
+   return s
+end
+
+function profiler.print(model, nbSamples, totalTime, indent)
    local indent = indent or ''
+   local hint
 
-   print(string.format('%s* %s', indent, model.__typename))
+   local localTotal = 0
+   for _, t in pairs(model.accTime) do
+      localTotal = localTotal + t
+   end
 
-   for l, t in pairs(model.accTime) do
-      local s
-      if nbSamples then
-         s = string.format(' (%.01fmus/sample)', 1e6 * t / nbSamples)
+   if torch.isTypeOf(model, nn.Container) then
+      hint = ' '
+   else
+      if profiler.color then
+         hint = ' '
       else
-         s = ''
+         hint = '*'
       end
-      print(string.format('%s  %s %.02fs%s', indent, l, t, s))
+      hint = hint .. profiler.colors('red')
    end
 
+   print(profiler.timing(indent .. hint .. ' ' .. model.__typename, localTotal, nbSamples, totalTime))
+
+   for l, t in pairs(model.accTime) do
+      print(profiler.timing(indent .. '  ' .. l, t, nbSamples, totalTime))
+   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