projects
/
profiler-torch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e05c72d
)
Now decorate function as high as possible in the class hierarchy, and breaks down...
author
Francois Fleuret
<francois@fleuret.org>
Mon, 5 Dec 2016 09:49:47 +0000
(10:49 +0100)
committer
Francois Fleuret
<francois@fleuret.org>
Mon, 5 Dec 2016 09:49:47 +0000
(10:49 +0100)
profiler.lua
patch
|
blob
|
history
diff --git
a/profiler.lua
b/profiler.lua
index
5490651
..
6f63861
100755
(executable)
--- a/
profiler.lua
+++ b/
profiler.lua
@@
-46,23
+46,28
@@
function profiler.decor(model, functionsToDecorate)
}
for _, name in pairs(functionsToDecorate) do
}
for _, name in pairs(functionsToDecorate) do
- model.accTime =
0
+ model.accTime =
{}
local functionTable = model
local functionTable = model
- if not rawget(functionTable, name) then
- functionTable = getmetatable(model)
+ -- We decorate the function where it is defined in the class
+ -- hierarchy, so we have to go up the metatables until we find
+ -- it with rawget
+
+ while functionTable and not rawget(functionTable, name) do
+ functionTable = getmetatable(functionTable)
end
end
- if functionTable[name] and not (functionTable.orig and functionTable.orig[name]) then
+ local nameOrig = name .. '__orig'
+
+ if functionTable[name] and not functionTable[nameOrig] then
print('Profiler decoring ' .. functionTable.__typename .. '.' .. name)
print('Profiler decoring ' .. functionTable.__typename .. '.' .. name)
- functionTable.orig = functionTable.orig or {}
- functionTable.orig[name] = functionTable[name]
+ functionTable[nameOrig] = functionTable[name]
functionTable[name] = function(self, ...)
local startTime = sys.clock()
functionTable[name] = function(self, ...)
local startTime = sys.clock()
- local result = { self
.orig[name
](self, unpack({...})) }
+ local result = { self
[nameOrig
](self, unpack({...})) }
local endTime = sys.clock()
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
return unpack(result)
end
end
@@
-80,22
+85,28
@@
end
function profiler.print(model, nbSamples, indent)
local indent = indent or ''
function profiler.print(model, nbSamples, indent)
local indent = indent or ''
+ print(string.format('%s* %s', indent, model.__typename))
+
if nbSamples then
if nbSamples then
- print(string.format('%s%s %.02fs (%.01fmus/sample)',
- indent,
- model.__typename,
- 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
else
- print(string.format('%s%s %.02fs',
- indent,
- model.__typename,
- 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
end
if torch.isTypeOf(model, nn.Container) then
for _, m in ipairs(model.modules) do
- profiler.print(m, nbSamples, indent .. '
')
+ profiler.print(m, nbSamples, indent .. ' ')
end
end
end
end
end
end