X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=profiler-torch.git;a=blobdiff_plain;f=test-profiler.lua;h=18677ec0f0bf40c5d651ce969d85779e0033d124;hp=6d98b2a22a9c6badb4ce4e3a48dda9f69d7041d5;hb=e927faab65fb190dc01959236c07df46f3d28946;hpb=ac1c4d6fc4926dadc6b69fd17a54419e403530a6

diff --git a/test-profiler.lua b/test-profiler.lua
index 6d98b2a..18677ec 100755
--- a/test-profiler.lua
+++ b/test-profiler.lua
@@ -39,21 +39,28 @@ require 'profiler'
 
 -- Create a model
 
+local w, h, fs = 50, 50, 3
+local nhu =  (w - fs + 1) * (h - fs + 1)
+
 local model = nn.Sequential()
    :add(nn.Sequential()
-           :add(nn.Linear(1000, 1000))
+           :add(nn.SpatialConvolution(1, 1, fs, fs))
+           :add(nn.Reshape(nhu))
+           :add(nn.Linear(nhu, 1000))
            :add(nn.ReLU())
        )
    :add(nn.Linear(1000, 100))
 
 -- Decor it for profiling
 
-profiler.decor(model)
+profiler.decorate(model)
 print()
 
+torch.save('model.t7', model)
+
 -- Create the data and criterion
 
-local input = torch.Tensor(1000, 1000)
+local input = torch.Tensor(1000, 1, h, w)
 local target = torch.Tensor(input:size(1), 100)
 local criterion = nn.MSECriterion()
 
@@ -86,8 +93,8 @@ end
 
 -- Print the accumulated timings
 
--- profiler.print(model, nbSamples)
-profiler.print(model)
+profiler.print(model, nbSamples, modelTime)
+-- profiler.print(model)
 
 print()
 print(string.format('Total model time %.02fs', modelTime))