X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=profiler-torch.git;a=blobdiff_plain;f=test-profiler.lua;h=18677ec0f0bf40c5d651ce969d85779e0033d124;hp=a78c944464b8a147894650924b34256ab8ebbba6;hb=b8c7166b9123735e8226d34b717d3cbc2dc1fa02;hpb=c2a852c17eb19f472762343ee8dfe3e0d1b40dbf

diff --git a/test-profiler.lua b/test-profiler.lua
index a78c944..18677ec 100755
--- a/test-profiler.lua
+++ b/test-profiler.lua
@@ -39,9 +39,14 @@ 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))
@@ -55,7 +60,7 @@ 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()
 
@@ -88,7 +93,7 @@ end
 
 -- Print the accumulated timings
 
-profiler.print(model, nbSamples)
+profiler.print(model, nbSamples, modelTime)
 -- profiler.print(model)
 
 print()