major change: clearer param binding semantics; permit rebinding; enable

resuming from previous training

1 files changed, 32 insertions, 32 deletions

diff --git a/nerv/examples/timit_baseline2.lua b/nerv/examples/timit_baseline2.lua
index 103d89d..2d144b5 100644
--- a/nerv/examples/timit_baseline2.lua
+++ b/nerv/examples/timit_baseline2.lua
@@ -16,46 +16,46 @@ function make_layer_repo(param_repo)
         -- global transf
         ["nerv.BiasLayer"] =
         {
-            blayer1 = {{bias = "bias0"}, {dim_in = {440}, dim_out = {440}}}
+            blayer1 = {dim_in = {440}, dim_out = {440}, params = {bias = "bias0"}}
         },
         ["nerv.WindowLayer"] =
         {
-            wlayer1 = {{window = "window0"}, {dim_in = {440}, dim_out = {440}}}
+            wlayer1 = {dim_in = {440}, dim_out = {440}, params = {window = "window0"}}
         },
         -- biased linearity
         ["nerv.AffineLayer"] =
         {
-            affine0 = {{ltp = "affine0_ltp", bp = "affine0_bp"},
-            {dim_in = {440}, dim_out = {1024}}},
-            affine1 = {{ltp = "affine1_ltp", bp = "affine1_bp"},
-            {dim_in = {1024}, dim_out = {1024}}},
-            affine2 = {{ltp = "affine2_ltp", bp = "affine2_bp"},
-            {dim_in = {1024}, dim_out = {1024}}},
-            affine3 = {{ltp = "affine3_ltp", bp = "affine3_bp"},
-            {dim_in = {1024}, dim_out = {1024}}},
-            affine4 = {{ltp = "affine4_ltp", bp = "affine4_bp"},
-            {dim_in = {1024}, dim_out = {1024}}},
-            affine5 = {{ltp = "affine5_ltp", bp = "affine5_bp"},
-            {dim_in = {1024}, dim_out = {1024}}},
-            affine6 = {{ltp = "affine6_ltp", bp = "affine6_bp"},
-            {dim_in = {1024}, dim_out = {1959}}}
+            affine0 = {dim_in = {440}, dim_out = {1024},
+                        params = {ltp = "affine0_ltp", bp = "affine0_bp"}},
+            affine1 = {dim_in = {1024}, dim_out = {1024},
+                        params = {ltp = "affine1_ltp", bp = "affine1_bp"}},
+            affine2 = {dim_in = {1024}, dim_out = {1024},
+                        params = {ltp = "affine2_ltp", bp = "affine2_bp"}},
+            affine3 = {dim_in = {1024}, dim_out = {1024},
+                        params = {ltp = "affine3_ltp", bp = "affine3_bp"}},
+            affine4 = {dim_in = {1024}, dim_out = {1024},
+                        params = {ltp = "affine4_ltp", bp = "affine4_bp"}},
+            affine5 = {dim_in = {1024}, dim_out = {1024},
+                        params = {ltp = "affine5_ltp", bp = "affine5_bp"}},
+            affine6 = {dim_in = {1024}, dim_out = {1959},
+                        params = {ltp = "affine6_ltp", bp = "affine6_bp"}}
         },
         ["nerv.SigmoidLayer"] =
         {
-            sigmoid0 = {{}, {dim_in = {1024}, dim_out = {1024}}},
-            sigmoid1 = {{}, {dim_in = {1024}, dim_out = {1024}}},
-            sigmoid2 = {{}, {dim_in = {1024}, dim_out = {1024}}},
-            sigmoid3 = {{}, {dim_in = {1024}, dim_out = {1024}}},
-            sigmoid4 = {{}, {dim_in = {1024}, dim_out = {1024}}},
-            sigmoid5 = {{}, {dim_in = {1024}, dim_out = {1024}}}
+            sigmoid0 = {dim_in = {1024}, dim_out = {1024}},
+            sigmoid1 = {dim_in = {1024}, dim_out = {1024}},
+            sigmoid2 = {dim_in = {1024}, dim_out = {1024}},
+            sigmoid3 = {dim_in = {1024}, dim_out = {1024}},
+            sigmoid4 = {dim_in = {1024}, dim_out = {1024}},
+            sigmoid5 = {dim_in = {1024}, dim_out = {1024}}
         },
         ["nerv.SoftmaxCELayer"] = -- softmax + ce criterion layer for finetune output
         {
-            ce_crit = {{}, {dim_in = {1959, 1}, dim_out = {1}, compressed = true}}
+            ce_crit = {dim_in = {1959, 1}, dim_out = {1}, compressed = true}
         },
         ["nerv.SoftmaxLayer"] = -- softmax for decode output
         {
-            softmax = {{}, {dim_in = {1959}, dim_out = {1959}}}
+            softmax = {dim_in = {1959}, dim_out = {1959}}
         }
     }, param_repo, gconf)
 
@@ -63,7 +63,7 @@ function make_layer_repo(param_repo)
     {
         ["nerv.DAGLayer"] =
         {
-            global_transf = {{}, {
+            global_transf = {
                 dim_in = {440}, dim_out = {440},
                 sub_layers = layer_repo,
                 connections = {
@@ -71,8 +71,8 @@ function make_layer_repo(param_repo)
                     ["blayer1[1]"] = "wlayer1[1]",
                     ["wlayer1[1]"] = "<output>[1]"
                 }
-            }},
-            main = {{}, {
+            },
+            main = {
                 dim_in = {440}, dim_out = {1959},
                 sub_layers = layer_repo,
                 connections = {
@@ -91,7 +91,7 @@ function make_layer_repo(param_repo)
                     ["sigmoid5[1]"] = "affine6[1]",
                     ["affine6[1]"] = "<output>[1]"
                 }
-            }}
+            }
         }
     }, param_repo, gconf)
 
@@ -99,7 +99,7 @@ function make_layer_repo(param_repo)
     {
         ["nerv.DAGLayer"] =
         {
-            ce_output = {{}, {
+            ce_output = {
                 dim_in = {440, 1}, dim_out = {1},
                 sub_layers = layer_repo,
                 connections = {
@@ -108,8 +108,8 @@ function make_layer_repo(param_repo)
                     ["<input>[2]"] = "ce_crit[2]",
                     ["ce_crit[1]"] = "<output>[1]"
                 }
-            }},
-            softmax_output = {{}, {
+            },
+            softmax_output = {
                 dim_in = {440}, dim_out = {1959},
                 sub_layers = layer_repo,
                 connections = {
@@ -117,7 +117,7 @@ function make_layer_repo(param_repo)
                     ["main[1]"] = "softmax[1]",
                     ["softmax[1]"] = "<output>[1]"
                 }
-            }}
+            }
         }
     }, param_repo, gconf)