X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=profiler-torch.git;a=blobdiff_plain;f=profiler.lua;h=b363a60a3cb76b7af10ddde42b431be6566f15ca;hp=77398a01e3b1c21abcd2a17ef000c55f042a24a3;hb=HEAD;hpb=78ce9a217ef066c8f01b1531c27c6ef38c45ece1

diff --git a/profiler.lua b/profiler.lua
index 77398a0..b363a60 100644
--- a/profiler.lua
+++ b/profiler.lua
@@ -1,33 +1,20 @@
 
 --[[
 
-   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/>
+   Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+   Written by Francois Fleuret <francois.fleuret@idiap.ch>
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 3 as
+   published by the Free Software Foundation.
+
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 ]]--
 
@@ -58,18 +45,26 @@ function profiler.decorate(model, functionsToDecorate)
    for _, name in pairs(functionsToDecorate) do
       model.accTime = {}
 
-      local nameOrig = name .. '__orig'
-
       -- 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 .. ' in ' .. model)
+         error('We decorate the classes, 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
+      while not rawget(toDecorate, name) do
+         toDecorate = getmetatable(toDecorate)
+      end
+
+      local nameOrig = name .. '__orig'
+
+      if not toDecorate[nameOrig] then
+         -- print('Decorating ' .. toDecorate.__typename .. '.' .. name)
          toDecorate[nameOrig] = toDecorate[name]
          toDecorate[name] = function(self, ...)
             local startTime = sys.clock()
@@ -90,15 +85,22 @@ function profiler.decorate(model, functionsToDecorate)
 
 end
 
-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
+function profiler.timingString(l, t, nbSamples, totalTime)
+   local s
+
+   s = string.format('%s %.02fs %s[%.02f%%]',
+                     l, t,
+                     profiler.colors('blue'),
+                     100 * t / totalTime
+   )
+
    if nbSamples then
-      s = s .. string.format(profiler.colors('green') .. ' (%.01fmus/sample)', 1e6 * t / nbSamples)
+      s = s .. string.format(profiler.colors('green') .. ' (%.01fmus/sample)',
+                             1e6 * t / nbSamples)
    end
+
    s = s .. profiler.colors('black')
+
    return s
 end
 
@@ -106,26 +108,32 @@ 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
       if profiler.color then
-         hint = ' '
+         hint = '  ' .. profiler.colors('red')
       else
-         hint = '*'
+         hint = '* '
       end
-      hint = hint .. profiler.colors('red')
    end
 
-   print(profiler.timing(indent .. hint .. ' ' .. model.__typename, localTotal, nbSamples, totalTime))
+   print(profiler.timingString(indent .. hint .. model.__typename,
+                               localTotal, nbSamples, totalTime))
 
    for l, t in pairs(model.accTime) do
-      print(profiler.timing(indent .. '  ' .. l, t, nbSamples, totalTime))
+      print(profiler.timingString(indent .. '  :' .. l, t, nbSamples, totalTime))
    end
 
    print()