}
for _, name in pairs(functionsToDecorate) do
- model.orig = model.orig or {}
model.timings = 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()
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 (%.1ems/sample)', model.timings, 1000 * model.timings / nbSamples))
+ else
+ print(string.format('acc_time %.02fs', model.timings))
+ 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