profiler = {}
-function profiler.decor(model, functionsToDecorate)
+profiler.color = true
+
+profiler.colors = function(name)
+ if profiler.color then
+ return sys.COLORS[name]
+ else
+ return ''
+ end
+end
+
+function profiler.decorate(model, functionsToDecorate)
local functionsToDecorate = functionsToDecorate or
{
}
for _, name in pairs(functionsToDecorate) do
- model.accTime = 0
+ model.accTime = {}
+
+ local nameOrig = name .. '__orig'
- local functionTable = model
+ -- We decorate the class and not the object, otherwise we cannot
+ -- save models anymore.
- if not rawget(functionTable, name) then
- functionTable = getmetatable(model)
+ if rawget(model, name) then
+ error('We decorate the classes, not the objects, and there is a `'
+ .. name
+ .. '\' function in '
+ .. tostring(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 toDecorate = model
+
+ while not rawget(toDecorate, name) do
+ toDecorate = getmetatable(toDecorate)
+ end
+
+ if not toDecorate[nameOrig] then
+ print('Decorating ' .. toDecorate.__typename .. '.' .. name)
+ toDecorate[nameOrig] = toDecorate[name]
+ toDecorate[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
if torch.isTypeOf(model, nn.Container) then
for _, m in ipairs(model.modules) do
- profiler.decor(m, functionsToDecorate)
+ profiler.decorate(m, functionsToDecorate)
end
end
end
-function profiler.print(model, nbSamples, indent)
- local indent = indent or ''
+function profiler.timing(l, t, nbSamples, totalTime)
+ local s
+
+ s = string.format('%s %.02fs %s[%.02f%%]',
+ l, t,
+ profiler.colors('blue'),
+ 100 * t / totalTime
+ )
if nbSamples then
- print(string.format('%s%s %.02fs (%.01fmus/sample)',
- indent,
- model.__typename,
- model.accTime,
- 1e6 * model.accTime / nbSamples))
+ s = s .. string.format(profiler.colors('green') .. ' (%.01fmus/sample)', 1e6 * t / nbSamples)
+ end
+
+ s = s .. profiler.colors('black')
+
+ return s
+end
+
+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
- print(string.format('%s%s %.02fs',
- indent,
- model.__typename,
- model.accTime))
+ if profiler.color then
+ hint = ' '
+ else
+ hint = '*'
+ end
+ hint = hint .. profiler.colors('red')
end
+ print(profiler.timing(indent .. hint .. ' ' .. model.__typename,
+ localTotal, nbSamples, totalTime))
+
+ for l, t in pairs(model.accTime) do
+ print(profiler.timing(indent .. ' :' .. l, t, nbSamples, totalTime))
+ end
+
+ print()
+
if torch.isTypeOf(model, nn.Container) then
for _, m in ipairs(model.modules) do
- profiler.print(m, nbSamples, indent .. ' ')
+ profiler.print(m, nbSamples, totalTime, indent .. ' ')
end
end
end