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
{
local nameOrig = name .. '__orig'
- if model[name] and not model[nameOrig] then
- model[nameOrig] = model[name]
- model[name] = function(self, ...)
+ -- 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
+ .. '\' function in '
+ .. tostring(model))
+ end
+
+ local toDecorate = getmetatable(model)
+
+ if toDecorate[name] and not toDecorate[nameOrig] then
+ toDecorate[nameOrig] = toDecorate[name]
+ toDecorate[name] = function(self, ...)
local startTime = sys.clock()
local result = { self[nameOrig](self, unpack({...})) }
local endTime = sys.clock()
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)
+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
+ 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
- print(string.format('%s* %s', indent, model.__typename))
+ if not model.accTime then
+ error('The model does not seem decorated for profiling.')
+ end
- for l, t in pairs(model.accTime) do
- local s
- if nbSamples then
- s = string.format(' (%.01fmus/sample)', 1e6 * t / nbSamples)
+ 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 = ' '
else
- s = ''
+ hint = '*'
end
- print(string.format('%s %s %.02fs%s', indent, l, t, s))
+ 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