make network configuration example file clearer

3 files changed, 3 insertions, 118 deletions

diff --git a/embedding_example/main.c b/embedding_example/main.c
index b3c9bf2..8856d58 100644
--- a/embedding_example/main.c
+++ b/embedding_example/main.c
@@ -22,7 +22,7 @@ void setup_nerv() {
     luaL_openlibs(L);
     luaL_loadfile(L, "setup_nerv.lua");
     /* network configuration */
-    lua_pushstring(L, "swb_baseline_decode.lua");
+    lua_pushstring(L, "../nerv/examples/swb_baseline.lua");
     if (lua_pcall(L, 1, LUA_MULTRET, 0))
     {
         printf("%s\n", luaL_checkstring(L, 1));
diff --git a/embedding_example/setup_nerv.lua b/embedding_example/setup_nerv.lua
index 49a5dd6..5ade950 100644
--- a/embedding_example/setup_nerv.lua
+++ b/embedding_example/setup_nerv.lua
@@ -4,9 +4,8 @@ local arg = {...}
 dofile(arg[1])
 local param_repo = nerv.ParamRepo()
 param_repo:import(gconf.initialized_param, nil, gconf)
-local sublayer_repo = make_sublayer_repo(param_repo)
-local layer_repo = make_layer_repo(sublayer_repo, param_repo)
-local network = get_network(layer_repo)
+local layer_repo = make_layer_repo(param_repo)
+local network = get_decode_network(layer_repo)
 local global_transf = get_global_transf(layer_repo)
 local batch_size = 1
 network:init(batch_size)
diff --git a/embedding_example/swb_baseline_decode.lua b/embedding_example/swb_baseline_decode.lua
deleted file mode 100644
index 8cdb320..0000000
--- a/embedding_example/swb_baseline_decode.lua
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'htk_io'
-gconf = {lrate = 0.8, wcost = 1e-6, momentum = 0.9,
-        cumat_type = nerv.CuMatrixFloat,
-        mmat_type = nerv.MMatrixFloat,
-        frm_ext = 5,
-        tr_scp = "/slfs1/users/mfy43/swb_ivec/train_bp.scp",
-        cv_scp = "/slfs1/users/mfy43/swb_ivec/train_cv.scp",
-        htk_conf = "/slfs1/users/mfy43/swb_ivec/plp_0_d_a.conf",
-        initialized_param = {"/slfs1/users/mfy43/swb_init.nerv",
-                "/slfs1/users/mfy43/swb_global_transf.nerv"},
-        debug = false}
-
-function make_sublayer_repo(param_repo)
-    return nerv.LayerRepo(
-    {
-        -- global transf
-        ["nerv.BiasLayer"] =
-        {
-            blayer1 = {{bias = "bias1"}, {dim_in = {429}, dim_out = {429}}},
-            blayer2 = {{bias = "bias2"}, {dim_in = {429}, dim_out = {429}}}
-        },
-        ["nerv.WindowLayer"] =
-        {
-            wlayer1 = {{window = "window1"}, {dim_in = {429}, dim_out = {429}}},
-            wlayer2 = {{window = "window2"}, {dim_in = {429}, dim_out = {429}}}
-        },
-        -- biased linearity
-        ["nerv.AffineLayer"] =
-        {
-            affine0 = {{ltp = "affine0_ltp", bp = "affine0_bp"},
-            {dim_in = {429}, dim_out = {2048}}},
-            affine1 = {{ltp = "affine1_ltp", bp = "affine1_bp"},
-            {dim_in = {2048}, dim_out = {2048}}},
-            affine2 = {{ltp = "affine2_ltp", bp = "affine2_bp"},
-            {dim_in = {2048}, dim_out = {2048}}},
-            affine3 = {{ltp = "affine3_ltp", bp = "affine3_bp"},
-            {dim_in = {2048}, dim_out = {2048}}},
-            affine4 = {{ltp = "affine4_ltp", bp = "affine4_bp"},
-            {dim_in = {2048}, dim_out = {2048}}},
-            affine5 = {{ltp = "affine5_ltp", bp = "affine5_bp"},
-            {dim_in = {2048}, dim_out = {2048}}},
-            affine6 = {{ltp = "affine6_ltp", bp = "affine6_bp"},
-            {dim_in = {2048}, dim_out = {2048}}},
-            affine7 = {{ltp = "affine7_ltp", bp = "affine7_bp"},
-            {dim_in = {2048}, dim_out = {3001}}}
-        },
-        ["nerv.SigmoidLayer"] =
-        {
-            sigmoid0 = {{}, {dim_in = {2048}, dim_out = {2048}}},
-            sigmoid1 = {{}, {dim_in = {2048}, dim_out = {2048}}},
-            sigmoid2 = {{}, {dim_in = {2048}, dim_out = {2048}}},
-            sigmoid3 = {{}, {dim_in = {2048}, dim_out = {2048}}},
-            sigmoid4 = {{}, {dim_in = {2048}, dim_out = {2048}}},
-            sigmoid5 = {{}, {dim_in = {2048}, dim_out = {2048}}},
-            sigmoid6 = {{}, {dim_in = {2048}, dim_out = {2048}}}
-        },
-        ["nerv.SoftmaxLayer"] =
-        {
-            soutput = {{}, {dim_in = {3001}, dim_out = {3001}}}
-        }
-    }, param_repo, gconf)
-end
-
-function make_layer_repo(sublayer_repo, param_repo)
-    return nerv.LayerRepo(
-    {
-        ["nerv.DAGLayer"] =
-        {
-            global_transf = {{}, {
-                dim_in = {429}, dim_out = {429},
-                sub_layers = sublayer_repo,
-                connections = {
-                    ["<input>[1]"] = "blayer1[1]",
-                    ["blayer1[1]"] = "wlayer1[1]",
-                    ["wlayer1[1]"] = "blayer2[1]",
-                    ["blayer2[1]"] = "wlayer2[1]",
-                    ["wlayer2[1]"] = "<output>[1]"
-                }
-            }},
-            main = {{}, {
-                dim_in = {429}, dim_out = {3001},
-                sub_layers = sublayer_repo,
-                connections = {
-                    ["<input>[1]"] = "affine0[1]",
-                    ["affine0[1]"] = "sigmoid0[1]",
-                    ["sigmoid0[1]"] = "affine1[1]",
-                    ["affine1[1]"] = "sigmoid1[1]",
-                    ["sigmoid1[1]"] = "affine2[1]",
-                    ["affine2[1]"] = "sigmoid2[1]",
-                    ["sigmoid2[1]"] = "affine3[1]",
-                    ["affine3[1]"] = "sigmoid3[1]",
-                    ["sigmoid3[1]"] = "affine4[1]",
-                    ["affine4[1]"] = "sigmoid4[1]",
-                    ["sigmoid4[1]"] = "affine5[1]",
-                    ["affine5[1]"] = "sigmoid5[1]",
-                    ["sigmoid5[1]"] = "affine6[1]",
-                    ["affine6[1]"] = "sigmoid6[1]",
-                    ["sigmoid6[1]"] = "affine7[1]",
-                    ["affine7[1]"] = "soutput[1]",
-                    ["soutput[1]"] = "<output>[1]"
-                }
-            }}
-        }
-    }, param_repo, gconf)
-end
-
-function get_network(layer_repo)
-    return layer_repo:get_layer("main")
-end
-
-
-function get_global_transf(layer_repo)
-    return layer_repo:get_layer("global_transf")
-end