X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=profiler.lua;h=77461b3005cb7e33cca49fc3d03cc578f4030cde;hb=7c5787015c28b2c551bbd1016512fcb8baf5d3e8;hp=b95d7507575da856f5f4919e825a05a82b2eafb6;hpb=545f83595445ffd1212cbe7f23e76f906b1ff4b4;p=profiler-torch.git

diff --git a/profiler.lua b/profiler.lua
index b95d750..77461b3 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,26 @@ 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 classes, not the objects, and there is a `'
+                  .. name
+                  .. '\' function in '
+                  .. tostring(model))
+      end
+
+      local toDecorate = model
+
+      while not rawget(toDecorate, name) do
+         toDecorate = getmetatable(toDecorate)
+      end
+
+      if not toDecorate[nameOrig] then
+         print('Decorating ' .. toDecorate.__typename .. '.' .. name)
+         toDecorate[nameOrig] = toDecorate[name]
+         toDecorate[name] = function(self, ...)
             local startTime = sys.clock()
             local result = { self[nameOrig](self, unpack({...})) }
             local endTime = sys.clock()
@@ -65,37 +92,68 @@ 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)
-   local indent = indent or ''
+function profiler.timing(l, t, nbSamples, totalTime)
+   local s
 
-   print(string.format('%s* %s', indent, model.__typename))
+   s = string.format('%s %.02fs %s[%.02f%%]',
+                     l, t,
+                     profiler.colors('blue'),
+                     100 * t / totalTime
+   )
 
    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))
-      end
+      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
+
+   if not model.accTime then
+      error('The model does not seem decorated for profiling.')
+   end
+
+   local localTotal = 0
+   for _, t in pairs(model.accTime) do
+      localTotal = localTotal + t
+   end
+
+   totalTime = totalTime or localTotal
+
+   if torch.isTypeOf(model, nn.Container) then
+      hint = ' '
    else
-      for l, t in pairs(model.accTime) do
-         print(string.format('%s  %s %.02fs',
-                             indent,
-                             l,
-                             t))
+      if profiler.color then
+         hint = ' '
+      else
+         hint = '*'
       end
+      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