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

diff --git a/test-profiler.lua b/test-profiler.lua
index c43995d..92f186e 100755
--- a/test-profiler.lua
+++ b/test-profiler.lua
@@ -2,33 +2,20 @@
 
 --[[
 
-   Written by Francois Fleuret (francois@fleuret.org)
-
-   This is free and unencumbered software released into the public
-   domain.
-
-   Anyone is free to copy, modify, publish, use, compile, sell, or
-   distribute this software, either in source code form or as a
-   compiled binary, for any purpose, commercial or non-commercial, and
-   by any means.
-
-   In jurisdictions that recognize copyright laws, the author or
-   authors of this software dedicate any and all copyright interest in
-   the software to the public domain. We make this dedication for the
-   benefit of the public at large and to the detriment of our heirs
-   and successors. We intend this dedication to be an overt act of
-   relinquishment in perpetuity of all present and future rights to
-   this software under copyright law.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
-   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-   CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-   For more information, please refer to <http://unlicense.org/>
+   Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+   Written by Francois Fleuret <francois.fleuret@idiap.ch>
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 3 as
+   published by the Free Software Foundation.
+
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 ]]--
 
@@ -55,10 +42,6 @@ local model = nn.Sequential()
 
 profiler.decorate(model)
 
-print()
-
--- torch.save('model.t7', model)
-
 -- Create the data and criterion
 
 local input = torch.Tensor(1000, 1, h, w)
@@ -94,8 +77,10 @@ end
 
 -- Print the accumulated timings
 
--- profiler.print(model, nbSamples)
-profiler.print(model)
+print()
+-- profiler.color = false
+profiler.print(model, nbSamples)
+-- profiler.print(model)
 
 print(string.format('Total model time %.02fs', modelTime))
 print(string.format('Total data time %.02fs', dataTime))