Making dilation default parameter and adding it to unit tests

NVIDIA · Aug 24, 2018 · 79824be · 79824be
1 parent 0f8f86b
commit 79824be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/open_seq2seq/parts/cnns/conv_blocks.py b/open_seq2seq/parts/cnns/conv_blocks.py
@@ -13,7 +13,7 @@
 }
 
 def conv_actv(layer_type, name, inputs, filters, kernel_size, activation_fn, strides,
-              padding, dilation, regularizer, training, data_format):
+              padding, regularizer, training, data_format, dilation=1):
   """Helper function that applies convolution and activation.
     Args:
       layer_type: the following types are supported
@@ -41,8 +41,8 @@ def conv_actv(layer_type, name, inputs, filters, kernel_size, activation_fn, str
 
 
 def conv_bn_actv(layer_type, name, inputs, filters, kernel_size, activation_fn, strides,
-                 padding, dilation, regularizer, training, data_format, bn_momentum,
-                 bn_epsilon):
+                 padding, regularizer, training, data_format, bn_momentum,
+                 bn_epsilon, dilation=1):
   """Helper function that applies convolution, batch norm and activation.
     Args:
       layer_type: the following types are supported
@@ -91,7 +91,7 @@ def conv_bn_actv(layer_type, name, inputs, filters, kernel_size, activation_fn,
 
 
 def conv_ln_actv(layer_type, name, inputs, filters, kernel_size, activation_fn, strides,
-                 padding, dilation, regularizer, training, data_format):
+                 padding, regularizer, training, data_format, dilation=1):
   """Helper function that applies convolution, layer norm and activation.
     Args:
       layer_type: the following types are supported
@@ -132,7 +132,7 @@ def conv_ln_actv(layer_type, name, inputs, filters, kernel_size, activation_fn,
   return output
 
 def conv_in_actv(layer_type, name, inputs, filters, kernel_size, activation_fn, strides,
-                 padding, dilation, regularizer, training, data_format):
+                 padding, regularizer, training, data_format, dilation=1):
   """Helper function that applies convolution, instance norm and activation.
     Args:
       layer_type: the following types are supported
@@ -162,3 +162,4 @@ def conv_in_actv(layer_type, name, inputs, filters, kernel_size, activation_fn,
   if activation_fn is not None:
     output = activation_fn(output)
   return output
+
diff --git a/open_seq2seq/test_utils/test_speech_configs/w2l_test_config.py b/open_seq2seq/test_utils/test_speech_configs/w2l_test_config.py
@@ -46,12 +46,14 @@
             {
                 "type": "conv1d", "repeat": 3,
                 "kernel_size": [7], "stride": [1],
-                "num_channels": 200, "padding": "SAME"
+                "num_channels": 200, "padding": "SAME",
+                "dilation":[1]
             },
             {
                 "type": "conv1d", "repeat": 1,
                 "kernel_size": [1], "stride": [1],
-                "num_channels": 400, "padding": "SAME"  # n_hidden=num_channels
+                "num_channels": 400, "padding": "SAME",
+                "dilation":[1]
             },
         ],