X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=test-profiler.lua;h=c43995d9ab0640a06d1fe43e8aea278b8cc5078c;hb=b758f38fa8142256d754a5ba18d6a7932d6e203c;hp=2f1f0ec7883d993eb222ba5f7404da1257e7e41d;hpb=1cc41a13ae500ceaf037b3ff880a0eeb25472633;p=profiler-torch.git

diff --git a/test-profiler.lua b/test-profiler.lua
index 2f1f0ec..c43995d 100755
--- a/test-profiler.lua
+++ b/test-profiler.lua
@@ -39,20 +39,29 @@ 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()
 
-profiler.decor(model)
+-- 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()
 
@@ -85,8 +94,8 @@ end
 
 -- Print the accumulated timings
 
-profiler.print(model, nbSamples)
+-- profiler.print(model, nbSamples)
+profiler.print(model)
 
-print('----------------------------------------------------------------------')
 print(string.format('Total model time %.02fs', modelTime))
 print(string.format('Total data time %.02fs', dataTime))