Add GruNonlinearityComponent(by Dan) and OutputGruNonlinearityCompone…

…nt; moving aroun some sources in nnet3 to avoid very large files small fix
kaldi-asr · Sep 18, 2018 · 5836b9b · 5836b9b
1 parent 2cfcfda
commit 5836b9b
Show file tree

Hide file tree

Showing 9 changed files with 4,528 additions and 1,826 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.XconfigFastPgruLayer,
+ '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-special-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 \

diff --git a/src/nnet3/nnet-component-itf.cc b/src/nnet3/nnet-component-itf.cc
@@ -23,6 +23,7 @@
 #include <iomanip>
 #include "nnet3/nnet-component-itf.h"
 #include "nnet3/nnet-simple-component.h"
+#include "nnet3/nnet-special-component.h"
 #include "nnet3/nnet-normalize-component.h"
 #include "nnet3/nnet-general-component.h"
 #include "nnet3/nnet-convolutional-component.h"
@@ -178,6 +179,10 @@ Component* Component::NewComponentOfType(const std::string &component_type) {
  ans = new RestrictedAttentionComponent();
  } else if (component_type == "SumBlockComponent") {
  ans = new SumBlockComponent();
+ } else if (component_type == "GruNonlinearityComponent") {
+ ans = new GruNonlinearityComponent();
+ } else if (component_type == "OutputGruNonlinearityComponent") {
+ ans = new OutputGruNonlinearityComponent();
  } else if (component_type == "ScaleAndOffsetComponent") {
  ans = new ScaleAndOffsetComponent();
  }