From e935fd6d49b81b0c83d5ad112bfd0a8a68a67175 Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 5 Aug 2015 08:04:40 +0800 Subject: put global transformation into a separate library --- speech | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'speech') diff --git a/speech b/speech index 08e33af..acd1bc3 160000 --- a/speech +++ b/speech @@ -1 +1 @@ -Subproject commit 08e33afa533af1f026ac271446a0c873fe0bb5cb +Subproject commit acd1bc3cf812f69a6260179b584f2a3f0e6d6b80 -- cgit v1.2.3-70-g09d2 From bca6cfa05af1dfc898bdb35f9f481048840e9217 Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 5 Aug 2015 08:10:24 +0800 Subject: keep up with speech repo --- speech | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'speech') diff --git a/speech b/speech index acd1bc3..261aed4 160000 --- a/speech +++ b/speech @@ -1 +1 @@ -Subproject commit acd1bc3cf812f69a6260179b584f2a3f0e6d6b80 +Subproject commit 261aed43b863c85ecf709dcac2739c388ec491d2 -- cgit v1.2.3-70-g09d2 From 7579ff4941d7019d4e911978879ec07b62a4e523 Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 5 Aug 2015 09:29:24 +0800 Subject: use expanded features and do global transf in embedding_example --- embedding_example/setup_nerv.lua | 10 ++++++---- embedding_example/swb_baseline_decode.lua | 5 +++++ speech | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'speech') diff --git a/embedding_example/setup_nerv.lua b/embedding_example/setup_nerv.lua index 3ae878d..49a5dd6 100644 --- a/embedding_example/setup_nerv.lua +++ b/embedding_example/setup_nerv.lua @@ -7,17 +7,19 @@ 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 global_transf = get_global_transf(layer_repo) local batch_size = 1 network:init(batch_size) function propagator(input, output) - local gpu_input = nerv.CuMatrixFloat(input:nrow(), input:ncol()) + local transformed = nerv.speech_utils.global_transf(input, + global_transf, 0, gconf) -- preprocessing + local gpu_input = nerv.CuMatrixFloat(transformed:nrow(), transformed:ncol()) local gpu_output = nerv.CuMatrixFloat(output:nrow(), output:ncol()) - gpu_input:copy_fromh(input) - print(gpu_input) + print(transformed) + gpu_input:copy_fromh(transformed) network:propagate({gpu_input}, {gpu_output}) gpu_output:copy_toh(output) - print(output) -- collect garbage in-time to save GPU memory collectgarbage("collect") end diff --git a/embedding_example/swb_baseline_decode.lua b/embedding_example/swb_baseline_decode.lua index 14a463b..8cdb320 100644 --- a/embedding_example/swb_baseline_decode.lua +++ b/embedding_example/swb_baseline_decode.lua @@ -107,3 +107,8 @@ 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 diff --git a/speech b/speech index 261aed4..c6c6442 160000 --- a/speech +++ b/speech @@ -1 +1 @@ -Subproject commit 261aed43b863c85ecf709dcac2739c388ec491d2 +Subproject commit c6c644223dc9168befd189bf6f33243390671c99 -- cgit v1.2.3-70-g09d2 From ddc52b089a29dbe805ccbe499460b3e5d5b060c7 Mon Sep 17 00:00:00 2001 From: Determinant Date: Thu, 6 Aug 2015 10:25:26 +0800 Subject: do not use submodule for nerv-speech --- .gitmodules | 3 --- README.md | 4 ++-- speech | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 160000 speech (limited to 'speech') diff --git a/.gitmodules b/.gitmodules index 217ded3..9f556c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "luajit-2.0"] path = luajit-2.0 url = http://luajit.org/git/luajit-2.0.git -[submodule "nerv-speech"] - path = speech - url = https://github.com/Nerv-SJTU/nerv-speech.git [submodule "luarocks"] path = luarocks url = https://github.com/keplerproject/luarocks.git diff --git a/README.md b/README.md index 10d531c..efec2c4 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ First make sure you have __lua__ and __CUDA__ installed on your computer. __Nerv__ is currently developed via github.You can download and make __Nerv__ by doing the following: ``` cd ~ -git clone https://github.com/Determinant/nerv.git +git clone https://github.com/Nerv-SJTU/nerv.git cd nerv -git submodule init && git submodule update +git clone https://github.com/Nerv-SJTU/nerv-speech.git make ``` The `git submodule` command is for the __luajit__ repository inside __Nerv__. diff --git a/speech b/speech deleted file mode 160000 index c6c6442..0000000 --- a/speech +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c6c644223dc9168befd189bf6f33243390671c99 -- cgit v1.2.3-70-g09d2