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

diff --git a/test-profiler.lua b/test-profiler.lua
index a78c944..6d79e91 100755
--- a/test-profiler.lua
+++ b/test-profiler.lua
@@ -39,23 +39,25 @@ 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
+-- Decorate it for profiling
 
 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()
 
@@ -88,9 +90,9 @@ end
 
 -- Print the accumulated timings
 
+print()
 profiler.print(model, nbSamples)
 -- profiler.print(model)
 
-print()
 print(string.format('Total model time %.02fs', modelTime))
 print(string.format('Total data time %.02fs', dataTime))