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

diff --git a/profiler.lua b/profiler.lua
old mode 100755
new mode 100644
index 49eaed4..6f63861
--- a/profiler.lua
+++ b/profiler.lua
@@ -1,4 +1,36 @@
 
+--[[
+
+   Written by Francois Fleuret (francois@fleuret.org)
+
+   This is free and unencumbered software released into the public
+   domain.
+
+   Anyone is free to copy, modify, publish, use, compile, sell, or
+   distribute this software, either in source code form or as a
+   compiled binary, for any purpose, commercial or non-commercial, and
+   by any means.
+
+   In jurisdictions that recognize copyright laws, the author or
+   authors of this software dedicate any and all copyright interest in
+   the software to the public domain. We make this dedication for the
+   benefit of the public at large and to the detriment of our heirs
+   and successors. We intend this dedication to be an overt act of
+   relinquishment in perpetuity of all present and future rights to
+   this software under copyright law.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+   CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   For more information, please refer to <http://unlicense.org/>
+
+]]--
+
 require 'torch'
 require 'nn'
 require 'sys'
@@ -14,23 +46,28 @@ function profiler.decor(model, functionsToDecorate)
       }
 
    for _, name in pairs(functionsToDecorate) do
-      model.timings = 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.timings = self.timings + endTime - startTime
+            self.accTime[name] = (self.accTime[name] or 0) + endTime - startTime
             return unpack(result)
          end
       end
@@ -45,18 +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 (%.1ems/sample)', model.timings, 1000 * model.timings / 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.timings))
+      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