X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=test-profiler.lua;h=71127a0a7965e03b1c47c5d5ec16f5ee19f628cb;hb=3debf6e5063b03dc620d2ed67c6c155245bfedd8;hp=a78c944464b8a147894650924b34256ab8ebbba6;hpb=c2a852c17eb19f472762343ee8dfe3e0d1b40dbf;p=profiler-torch.git

diff --git a/test-profiler.lua b/test-profiler.lua
index a78c944..71127a0 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,9 +93,8 @@ end
 
 -- Print the accumulated timings
 
-profiler.print(model, nbSamples)
--- profiler.print(model)
+-- profiler.print(model, nbSamples)
+profiler.print(model)
 
-print()
 print(string.format('Total model time %.02fs', modelTime))
 print(string.format('Total data time %.02fs', dataTime))