diff options
author | Determinant <[email protected]> | 2015-08-06 14:08:26 +0800 |
---|---|---|
committer | Determinant <[email protected]> | 2015-08-06 14:08:26 +0800 |
commit | b4d9cfa8e3a4735687311577dded97d889340134 (patch) | |
tree | 49e0f000719705c563a357e0b89d62a66c84ce75 /nerv/nn | |
parent | 2dc87bc02a1242dd5e029d0baaf4e0ae7173184f (diff) |
make network configuration example file clearer
Diffstat (limited to 'nerv/nn')
-rw-r--r-- | nerv/nn/layer_dag.lua | 3 | ||||
-rw-r--r-- | nerv/nn/layer_repo.lua | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/nerv/nn/layer_dag.lua b/nerv/nn/layer_dag.lua index e5c1ac7..e9d4d86 100644 --- a/nerv/nn/layer_dag.lua +++ b/nerv/nn/layer_dag.lua @@ -112,7 +112,7 @@ function DAGLayer:__init(id, global_conf, layer_conf) end end for i = 1, #queue do - nerv.info("enqueued layer: %s", queue[i].layer.id) + nerv.info("enqueued layer: %s %s", queue[i].layer, queue[i].layer.id) end for id, ref in pairs(layers) do @@ -125,6 +125,7 @@ function DAGLayer:__init(id, global_conf, layer_conf) self.layers = layers self.inputs = inputs self.outputs = outputs + self.id = id self.dim_in = dim_in self.dim_out = dim_out self.parsed_conn = parsed_conn diff --git a/nerv/nn/layer_repo.lua b/nerv/nn/layer_repo.lua index 602c37c..ef333a7 100644 --- a/nerv/nn/layer_repo.lua +++ b/nerv/nn/layer_repo.lua @@ -1,7 +1,12 @@ local LayerRepo = nerv.class("nerv.LayerRepo") function LayerRepo:__init(layer_spec, param_repo, global_conf) - local layers = {} + self.layers = {} + self:add_layers(layer_spec, param_repo, global_conf) +end + +function LayerRepo:add_layers(layer_spec, param_repo, global_conf) + local layers = self.layers for ltype, llist in pairs(layer_spec) do local layer_type = nerv.get_type(ltype) for id, spec in pairs(llist) do @@ -22,7 +27,6 @@ function LayerRepo:__init(layer_spec, param_repo, global_conf) layers[id] = layer_type(id, global_conf, layer_config) end end - self.layers = layers end function LayerRepo:get_layer(lid) |