From 49caeba74bd90f359e3d0831df5f4e3613b03e99 Mon Sep 17 00:00:00 2001 From: Determinant Date: Tue, 25 Aug 2015 11:10:47 +0800 Subject: allow proceeding global transf without frm ext --- speech_utils/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'speech_utils/init.lua') diff --git a/speech_utils/init.lua b/speech_utils/init.lua index 3500eb4..a2d1dc9 100644 --- a/speech_utils/init.lua +++ b/speech_utils/init.lua @@ -4,7 +4,7 @@ function nerv.speech_utils.global_transf(feat_utter, global_transf, frm_ext, frm_trim, gconf) local rearranged feat_utter = gconf.cumat_type.new_from_host(feat_utter) - if frm_ext > 0 then + if frm_ext ~= nil and frm_ext > 0 then local step = frm_ext * 2 + 1 -- expand the feature local expanded = gconf.cumat_type(feat_utter:nrow(), feat_utter:ncol() * step) -- cgit v1.2.3 From 6495879e76dc0a2efe7b214b58d1d73a4ed3a931 Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 26 Aug 2015 14:25:56 +0800 Subject: remove global_transf in IO modules; see asr_trainer.lua --- speech_utils/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'speech_utils/init.lua') diff --git a/speech_utils/init.lua b/speech_utils/init.lua index a2d1dc9..7d5651f 100644 --- a/speech_utils/init.lua +++ b/speech_utils/init.lua @@ -3,7 +3,7 @@ nerv.speech_utils = {} function nerv.speech_utils.global_transf(feat_utter, global_transf, frm_ext, frm_trim, gconf) local rearranged - feat_utter = gconf.cumat_type.new_from_host(feat_utter) +-- feat_utter = gconf.cumat_type.new_from_host(feat_utter) if frm_ext ~= nil and frm_ext > 0 then local step = frm_ext * 2 + 1 -- expand the feature @@ -26,8 +26,8 @@ function nerv.speech_utils.global_transf(feat_utter, global_transf, global_transf:init(input[1]:nrow()) global_transf:propagate(input, output) -- trim frames - expanded = gconf.mmat_type(output[1]:nrow() - frm_trim * 2, output[1]:ncol()) - output[1]:copy_toh(expanded, frm_trim, feat_utter:nrow() - frm_trim) + expanded = gconf.cumat_type(output[1]:nrow() - frm_trim * 2, output[1]:ncol()) + expanded:copy_fromd(output[1], frm_trim, feat_utter:nrow() - frm_trim) collectgarbage("collect") return expanded end -- cgit v1.2.3