Resolve PR conflict with updated master

microsoft · Oct 27, 2020 · 18d062f · 18d062f
1 parent 06a1133
commit 18d062f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/c_reference/include/dscnn.h b/c_reference/include/dscnn.h
@@ -40,7 +40,7 @@ typedef int (*conv_layer)(float*, unsigned, unsigned, const float*,
 int phon_pred_lr_cnn(float* output_signal, float* input_signal,
   unsigned in_time, unsigned in_channels,
   const float* const mean, const float* const var,
-  unsigned affine_config, float* gamma, float* beta, unsigned in_place,
+  unsigned affine_config, const float* const gamma, const float* const beta, unsigned in_place,
   unsigned cnn_hidden, unsigned cnn_padding, unsigned cnn_kernel_size,
   const void* cnn_params, unsigned cnn_stride, unsigned cnn_activation);
 

diff --git a/c_reference/src/dscnn.c b/c_reference/src/dscnn.c
@@ -11,7 +11,7 @@
 int phon_pred_lr_cnn(float* output_signal, float* input_signal,
   unsigned in_time, unsigned in_channels,
   const float* const mean, const float* const var,
-  unsigned affine_config, float* gamma, float* beta, unsigned in_place,
+  unsigned affine_config, const float* const gamma, const float* const beta, unsigned in_place,
   unsigned cnn_hidden, unsigned cnn_padding, unsigned cnn_kernel_size,
   const void* cnn_params, unsigned cnn_stride, unsigned cnn_activation) {
 

diff --git a/c_reference/tests/kws/postcnn_params.h b/c_reference/tests/kws/postcnn_params.h
diff --git a/c_reference/tests/kws/precnn_params.h b/c_reference/tests/kws/precnn_params.h
diff --git a/c_reference/tests/kws/rnn_params.h b/c_reference/tests/kws/rnn_params.h