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

diff --git a/profiler.lua b/profiler.lua
index 91b0915..58100e7 100755
--- 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,16 +46,23 @@ function profiler.decor(model, functionsToDecorate)
       }
 
    for _, name in pairs(functionsToDecorate) do
-      model.orig = model.orig or {}
-      model.timings = 0
+      model.accTime = 0
 
-      if model[name] and not model.orig[name] then
-         model.orig[name] = model[name]
-         model[name] = function(self, ...)
+      local functionTable = model
+
+      if not rawget(functionTable, name) then
+         functionTable = getmetatable(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 startTime = sys.clock()
             local result = { self.orig[name](self, unpack({...})) }
             local endTime = sys.clock()
-            self.timings = self.timings + endTime - startTime
+            self.accTime = self.accTime + endTime - startTime
             return unpack(result)
          end
       end
@@ -38,12 +77,21 @@ function profiler.decor(model, functionsToDecorate)
 
 end
 
-function profiler.print(model)
+function profiler.print(model, nbSamples)
    print('----------------------------------------------------------------------')
    print(model)
-   print(string.format('TIMING %.02fs', model.timings))
+   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))
+   end
+
    if torch.isTypeOf(model, nn.Container) then
-      model:applyToModules(profiler.print)
+      for _, m in ipairs(model.modules) do
+         profiler.print(m, nbSamples)
+      end
    end
 end