Add GruNonlinearityComponent(by Dan) and OutputGruNonlinearityCompone…

…nt; moving aroun some sources in nnet3 to avoid very large files small fix rename nnet-combined-component.{h,cc} and str case small fix fix annotation
kaldi-asr · Oct 12, 2018 · 3f9a35b · 3f9a35b
1 parent 2cfcfda
commit 3f9a35b
Show file tree

Hide file tree

Showing 9 changed files with 4,531 additions and 1,830 deletions.
diff --git a/egs/wsj/s5/steps/libs/nnet3/xconfig/gru.py b/egs/wsj/s5/steps/libs/nnet3/xconfig/gru.py
diff --git a/egs/wsj/s5/steps/libs/nnet3/xconfig/parser.py b/egs/wsj/s5/steps/libs/nnet3/xconfig/parser.py
@@ -68,6 +68,11 @@
         'opgru-layer' : xlayers.XconfigOpgruLayer,
         'norm-pgru-layer' : xlayers.XconfigNormPgruLayer,
         'norm-opgru-layer' : xlayers.XconfigNormOpgruLayer,
+        'fast-gru-layer' : xlayers.XconfigFastGruLayer,
+        'fast-pgru-layer' : xlayers.XconfigFastPgruLayer,
+        'fast-norm-pgru-layer' : xlayers.XconfigFastNormPgruLayer,
+        'fast-opgru-layer' : xlayers.XconfigFastOpgruLayer,
+        'fast-norm-opgru-layer' : xlayers.XconfigFastNormOpgruLayer,
         'tdnnf-layer': xlayers.XconfigTdnnfLayer,
         'prefinal-layer': xlayers.XconfigPrefinalLayer,
         'renorm-component': xlayers.XconfigRenormComponent,

diff --git a/src/nnet3/Makefile b/src/nnet3/Makefile
@@ -15,7 +15,7 @@ TESTFILES = natural-gradient-online-test nnet-graph-test \
   nnet-common-test convolution-test attention-test
 
 OBJFILES = nnet-common.o nnet-compile.o nnet-component-itf.o \
-  nnet-simple-component.o nnet-normalize-component.o \
+  nnet-simple-component.o nnet-combined-component.o nnet-normalize-component.o \
   nnet-general-component.o nnet-parse.o natural-gradient-online.o \
   nnet-descriptor.o nnet-optimize.o nnet-computation.o \
   nnet-computation-graph.o nnet-graph.o am-nnet-simple.o \