diff options
| author | txh18 <cloudygooseg@gmail.com> | 2015-11-25 23:42:37 +0800 |
|---|---|---|
| committer | txh18 <cloudygooseg@gmail.com> | 2015-11-25 23:42:37 +0800 |
| commit | 75a2d6a2a08caf987017f5a9043ac93afcd70980 (patch) | |
| tree | d3b08fa846de56f3cd8a3f9a7bd3add200840ea8 /nerv/layer/init.lua | |
| parent | ca3500f01ea7ce695a4dbf70d2be8244827097c9 (diff) | |
changed auto-generating params, won not save in global_conf.param
Diffstat (limited to 'nerv/layer/init.lua')
| -rw-r--r-- | nerv/layer/init.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nerv/layer/init.lua b/nerv/layer/init.lua index c6d0a98..b8b7ea1 100644 --- a/nerv/layer/init.lua +++ b/nerv/layer/init.lua @@ -72,27 +72,27 @@ end function Layer:find_param(pid, l_conf, gconf, p_type, p_dim) if l_conf[pid] ~= nil then - nerv.printf("Param [%s] of layer [%s] found in layer_conf.\n", pid, self.id) + nerv.info("Param [%s] of layer [%s] found in layer_conf.\n", pid, self.id) return l_conf[pid] end local pid_g = self.id .. '_' .. pid --global identifier - local pr = gconf.paramRepo + local pr = l_conf.pr local p - if pr:has_param(pid_g) == true then - nerv.printf("Param [%s] of layer [%s] found in paramRepo.\n", pid, self.id) + if pr ~= nil and pr:has_param(pid_g) == true then + nerv.info("Param [%s] of layer [%s] found in layer_conf.paramRepo.\n", pid, self.id) p = pr:get_param(pid_g) return p end - nerv.printf("Param [%s] of layer [%s] is not found in layer_conf or paramRepo, switch to auto-generate.\n", pid, self.id) + nerv.info("Param [%s] of layer [%s] is not found in layer_conf or layer_conf.paramRepo, switch to auto-generate.\n", pid, self.id) p = p_type(pid_g, gconf) p.trans = gconf.cumat_type(unpack(p_dim)) p.trans:generate(gconf.param_random) - pr:add(pid_g, p) --add the parameter into the paramRepo return p end nerv.include('affine.lua') nerv.include('sigmoid.lua') +nerv.include('tanh.lua') nerv.include('softmax_ce.lua') nerv.include('bias.lua') nerv.include('window.lua') |