diff options
| author | txh18 <cloudygooseg@gmail.com> | 2015-11-17 21:58:05 +0800 |
|---|---|---|
| committer | txh18 <cloudygooseg@gmail.com> | 2015-11-17 21:58:05 +0800 |
| commit | fc4c5a71053b837ed6143659a6e7b45792ed9e51 (patch) | |
| tree | a5d3fbf7c59dfb08f67b2156d70def64f98925ad /nerv/examples | |
| parent | b8b6bb0a6b9fb9b8d72de42d27f598bfddd1cd0e (diff) | |
added atomicAdd for select_linear update, however, the result still seems unreproducable, I changed select_linear layer update back to line-by-line
Diffstat (limited to 'nerv/examples')
| -rw-r--r-- | nerv/examples/lmptb/lmptb/layer/select_linear.lua | 13 | ||||
| -rw-r--r-- | nerv/examples/lmptb/tnn_ptb_main.lua | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/nerv/examples/lmptb/lmptb/layer/select_linear.lua b/nerv/examples/lmptb/lmptb/layer/select_linear.lua index 672b7e2..a0ae207 100644 --- a/nerv/examples/lmptb/lmptb/layer/select_linear.lua +++ b/nerv/examples/lmptb/lmptb/layer/select_linear.lua @@ -30,13 +30,12 @@ function SL:init(batch_size) end function SL:update(bp_err, input, output) - --for i = 1, input[1]:ncol(), 1 do - -- if (input[1][0][i - 1] ~= 0) then - -- local word_vec = self.ltp.trans[input[1][0][i - 1]] - --word_vec:add(word_vec, bp_err[1][i - 1], 1, - self.gconf.lrate / self.gconf.batch_size) - -- end - --end - self.ltp.trans:update_select_rows(bp_err[1], input[1]:trans(), - self.gconf.lrate / self.gconf.batch_size, 0) + for i = 1, input[1]:ncol(), 1 do + local word_vec = self.ltp.trans[input[1][0][i - 1]] + word_vec:add(word_vec, bp_err[1][i - 1], 1, - self.gconf.lrate / self.gconf.batch_size) + end + --I tried the update_select_rows kernel which uses atomicAdd, but it generates unreproducable result + --self.ltp.trans:update_select_rows(bp_err[1], input[1]:trans(), - self.gconf.lrate / self.gconf.batch_size, 0) self.ltp.trans:add(self.ltp.trans, self.ltp.trans, 1.0, - self.gconf.lrate * self.gconf.wcost / self.gconf.batch_size) end diff --git a/nerv/examples/lmptb/tnn_ptb_main.lua b/nerv/examples/lmptb/tnn_ptb_main.lua index c37b217..50286c9 100644 --- a/nerv/examples/lmptb/tnn_ptb_main.lua +++ b/nerv/examples/lmptb/tnn_ptb_main.lua @@ -228,7 +228,7 @@ vocab_fn = '/home/slhome/txh18/workspace/nerv/nerv/nerv/examples/lmptb/m-tests/s global_conf = { lrate = 1, wcost = 1e-5, momentum = 0, cumat_type = nerv.CuMatrixFloat, - mmat_type = nerv.CuMatrixFloat, + mmat_type = nerv.MMatrixFloat, nn_act_default = 0, hidden_size = 20, |