-- save models anymore.
if rawget(model, name) then
- error('We decorate the class, not the objects, and there is a ' .. name .. ' in ' .. model)
+ error('We decorate the classes, not the objects, and there is a `'
+ .. name
+ .. '\' function in '
+ .. tostring(model))
end
- local toDecorate = getmetatable(model)
+ local toDecorate = model
- if toDecorate[name] and not toDecorate[nameOrig] then
+ 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()
end
function profiler.timing(l, t, nbSamples, totalTime)
- local s = string.format('%s %.02fs', l, t)
- if totalTime then
- s = s .. string.format(profiler.colors('blue') .. ' [%.02f%%]', 100 * t / totalTime)
- end
+ 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
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
hint = hint .. profiler.colors('red')
end
- print(profiler.timing(indent .. hint .. ' ' .. model.__typename, localTotal, nbSamples, totalTime))
+ 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))
+ print(profiler.timing(indent .. ' :' .. l, t, nbSamples, totalTime))
end
print()