}
for _, name in pairs(functionsToDecorate) do
- model.accTime = 0
+ model.accTime = {}
- local functionTable = model
+ local nameOrig = name .. '__orig'
- 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, ...)
+ if model[name] and not model[nameOrig] then
+ model[nameOrig] = model[name]
+ model[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.accTime = self.accTime + endTime - startTime
+ self.accTime[name] = (self.accTime[name] or 0) + endTime - startTime
return unpack(result)
end
end
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 (%.01fmus/sample)',
- model.accTime,
- 1e6 * model.accTime / 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.accTime))
+ 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