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

diff --git a/profiler.lua b/profiler.lua
index 49eaed4..5490651 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,7 +46,7 @@ function profiler.decor(model, functionsToDecorate)
       }
 
    for _, name in pairs(functionsToDecorate) do
-      model.timings = 0
+      model.accTime = 0
 
       local functionTable = model
 
@@ -30,7 +62,7 @@ function profiler.decor(model, functionsToDecorate)
             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
@@ -45,18 +77,25 @@ function profiler.decor(model, functionsToDecorate)
 
 end
 
-function profiler.print(model, nbSamples)
-   print('----------------------------------------------------------------------')
-   print(model)
+function profiler.print(model, nbSamples, indent)
+   local indent = indent or ''
+
    if nbSamples then
-      print(string.format('acc_time %.02fs (%.1ems/sample)', model.timings, 1000 * model.timings / nbSamples))
+      print(string.format('%s%s %.02fs (%.01fmus/sample)',
+                          indent,
+                          model.__typename,
+                          model.accTime,
+                          1e6 * model.accTime / nbSamples))
    else
-      print(string.format('acc_time %.02fs', model.timings))
+      print(string.format('%s%s %.02fs',
+                          indent,
+                          model.__typename,
+                          model.accTime))
    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