X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=profiler-torch.git;a=blobdiff_plain;f=test-profiler.lua;h=aa6e800f39b2f1adbf2d1931cf237e243a68f7a9;hp=7c22576420c80875c0204e555708fdec9a5abe6a;hb=f59950ed20a2d471c59e2c23bc41b50111a54cd6;hpb=79b01297857422ced2157d7daa2849a04623cdba

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