used os.clock() for timer

2 files changed, 11 insertions, 5 deletions

diff --git a/nerv/examples/lmptb/lm_trainer.lua b/nerv/examples/lmptb/lm_trainer.lua
index 2be97c8..7c11a34 100644
--- a/nerv/examples/lmptb/lm_trainer.lua
+++ b/nerv/examples/lmptb/lm_trainer.lua
@@ -22,6 +22,8 @@ function LMTrainer.lm_process_file(global_conf, fn, tnn, do_train)
     local next_log_wcn = global_conf.log_w_num
 
     while (1) do
+        global_conf.timer:tic('most_out_loop_lmprocessfile')
+
         local r, feeds
 
         r, feeds = tnn:getFeedFromReader(reader)
@@ -60,12 +62,17 @@ function LMTrainer.lm_process_file(global_conf, fn, tnn, do_train)
                 end
             end            
         end
+
+        tnn:moveRightToNextMB()
+        global_conf.timer:tic('most_out_loop_lmprocessfile')
+
+        --print log
         if (result["rnn"].cn_w > next_log_wcn) then
             next_log_wcn = next_log_wcn + global_conf.log_w_num
             printf("%s %d words processed %s.\n", global_conf.sche_log_pre, result["rnn"].cn_w, os.date()) 
             printf("\t%s log prob per sample :%f.\n", global_conf.sche_log_pre, result:logp_sample("rnn"))
             for key, value in pairs(global_conf.timer.rec) do
-                printf("\t [global_conf.timer]: time spent on %s:%.5fs\n", key, value)
+                printf("\t [global_conf.timer]: time spent on %s:%.5f clock time\n", key, value)
             end
             global_conf.timer:flush()
             nerv.LMUtil.wait(0.1)
@@ -77,7 +84,6 @@ function LMTrainer.lm_process_file(global_conf, fn, tnn, do_train)
         end
         ]]--
 
-        tnn:moveRightToNextMB()
 
         collectgarbage("collect")                                              
 
diff --git a/nerv/examples/lmptb/lmptb/lmutil.lua b/nerv/examples/lmptb/lmptb/lmutil.lua
index 77babef..821aa94 100644
--- a/nerv/examples/lmptb/lmptb/lmutil.lua
+++ b/nerv/examples/lmptb/lmptb/lmutil.lua
@@ -124,7 +124,7 @@ function Timer:__init()
 end
 
 function Timer:tic(item)
-    self.last[item] = os.time()
+    self.last[item] = os.clock()
 end
 
 function Timer:toc(item)
@@ -134,11 +134,11 @@ function Timer:toc(item)
     if (self.rec[item] == nil) then
         self.rec[item] = 0
     end
-    self.rec[item] = self.rec[item] + os.difftime(os.time(), self.last[item])
+    self.rec[item] = self.rec[item] + os.clock() - self.last[item]
 end
 
 function Timer:flush()
     for key, value in pairs(self.rec) do
-        self.rec[key] = 0
+        self.rec[key] = nil
     end
 end