diff options
| author | txh18 <cloudygooseg@gmail.com> | 2015-12-10 22:31:10 +0800 |
|---|---|---|
| committer | txh18 <cloudygooseg@gmail.com> | 2015-12-10 22:31:10 +0800 |
| commit | 217c7f5b5c5193cfc7db20b2ee25fc66c54569b6 (patch) | |
| tree | 39d9237cd3a53cd5072cea42fc19f8b1dec2e209 /nerv/examples | |
| parent | 5cf7e88df3aa4cf60819e955f0f537d2cfeccaac (diff) | |
| parent | 1b0f2ab768e34f126ce946e1689cd47c86f41645 (diff) | |
merge conflict resolve
Diffstat (limited to 'nerv/examples')
| -rw-r--r-- | nerv/examples/mmi_chime3.lua | 1 | ||||
| -rw-r--r-- | nerv/examples/mpe_chime3.lua | 10 | ||||
| -rw-r--r-- | nerv/examples/swb_baseline.lua | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/nerv/examples/mmi_chime3.lua b/nerv/examples/mmi_chime3.lua index 6ac7f28..3daaafa 100644 --- a/nerv/examples/mmi_chime3.lua +++ b/nerv/examples/mmi_chime3.lua @@ -160,6 +160,7 @@ function make_readers(feature_rspecifier, layer_repo) feature_rspecifier = feature_rspecifier, frm_ext = gconf.frm_ext, global_transf = layer_repo:get_layer("global_transf"), + need_key = true, mlfs = {} }) } diff --git a/nerv/examples/mpe_chime3.lua b/nerv/examples/mpe_chime3.lua index ec095b0..f9a2855 100644 --- a/nerv/examples/mpe_chime3.lua +++ b/nerv/examples/mpe_chime3.lua @@ -7,6 +7,8 @@ gconf = {lrate = 0.00001, wcost = 0, momentum = 0.0, tr_scp = "ark,s,cs:/slfs6/users/ymz09/kaldi/src/featbin/copy-feats scp:/slfs5/users/ymz09/chime/baseline/ASR/exp/tri4a_dnn_tr05_multi_enhanced_smbr/train.scp ark:- |", initialized_param = {"/slfs6/users/ymz09/nerv-project/nerv/nerv-speech/kaldi_seq/test/chime3_init.nerv", "/slfs6/users/ymz09/nerv-project/nerv/nerv-speech/kaldi_seq/test/chime3_global_transf.nerv"}, + decode_param = {"/slfs6/users/ymz09/nerv-project/test_mpe/1.nerv", + "/slfs6/users/ymz09/nerv-project/nerv/nerv-speech/kaldi_seq/test/chime3_global_transf.nerv"}, debug = false} function make_layer_repo(param_repo) @@ -125,13 +127,12 @@ function make_layer_repo(param_repo) ["mpe_crit[1]"] = "<output>[1]" } }}, - softmax_output = {{}, { + decode_output = {{}, { dim_in = {440}, dim_out = {2011}, sub_layers = layer_repo, connections = { ["<input>[1]"] = "main[1]", - ["main[1]"] = "softmax[1]", - ["softmax[1]"] = "<output>[1]" + ["main[1]"] = "<output>[1]" } }} } @@ -145,7 +146,7 @@ function get_network(layer_repo) end function get_decode_network(layer_repo) - return layer_repo:get_layer("softmax_output") + return layer_repo:get_layer("decode_output") end function get_global_transf(layer_repo) @@ -160,6 +161,7 @@ function make_readers(feature_rspecifier, layer_repo) feature_rspecifier = feature_rspecifier, frm_ext = gconf.frm_ext, global_transf = layer_repo:get_layer("global_transf"), + need_key = true, mlfs = {} }) } diff --git a/nerv/examples/swb_baseline.lua b/nerv/examples/swb_baseline.lua index 8f72200..51052ba 100644 --- a/nerv/examples/swb_baseline.lua +++ b/nerv/examples/swb_baseline.lua @@ -2,9 +2,9 @@ require 'htk_io' gconf = {lrate = 0.8, wcost = 1e-6, momentum = 0.9, cumat_type = nerv.CuMatrixFloat, mmat_type = nerv.MMatrixFloat, - direct_update = true, + rearrange = true, -- just to make the context order consistent with old results, deprecated frm_ext = 5, - frm_trim = 5, + frm_trim = 5, -- trim the first and last 5 frames, TNet just does this, deprecated 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", |