Skip to content

Commit 18d062f

Browse files
Resolve PR conflict with updated master
1 parent 06a1133 commit 18d062f

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Diff for: c_reference/include/dscnn.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ typedef int (*conv_layer)(float*, unsigned, unsigned, const float*,
4040
int phon_pred_lr_cnn(float* output_signal, float* input_signal,
4141
unsigned in_time, unsigned in_channels,
4242
const float* const mean, const float* const var,
43-
unsigned affine_config, float* gamma, float* beta, unsigned in_place,
43+
unsigned affine_config, const float* const gamma, const float* const beta, unsigned in_place,
4444
unsigned cnn_hidden, unsigned cnn_padding, unsigned cnn_kernel_size,
4545
const void* cnn_params, unsigned cnn_stride, unsigned cnn_activation);
4646

Diff for: c_reference/src/dscnn.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
int phon_pred_lr_cnn(float* output_signal, float* input_signal,
1212
unsigned in_time, unsigned in_channels,
1313
const float* const mean, const float* const var,
14-
unsigned affine_config, float* gamma, float* beta, unsigned in_place,
14+
unsigned affine_config, const float* const gamma, const float* const beta, unsigned in_place,
1515
unsigned cnn_hidden, unsigned cnn_padding, unsigned cnn_kernel_size,
1616
const void* cnn_params, unsigned cnn_stride, unsigned cnn_activation) {
1717

Diff for: c_reference/tests/kws/postcnn_params.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1f25d6df179c6316dd0832e49b280ef5ff1f30b9c9508fcd8c79f54d4cab9036
3-
size 1395958
2+
oid sha256:0adca3c3658d5860193ae73f62468742dbc2c1f8b6508abdb2efa9311111165d
3+
size 1374545

Diff for: c_reference/tests/kws/precnn_params.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:00406a0d0e0ed8fb87d4f10a81728f282ffd959d3a1a218ac0998d86b5cc206b
3-
size 522657
2+
oid sha256:2e0f08784241de5829bf27b6436d30095847aef8dc96005e531804dfe20c3e13
3+
size 520803

Diff for: c_reference/tests/kws/rnn_params.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:54b39b200e68a9f8c73d1d45bb3a2b6094f490a16bf469773a2d982d6a2b2093
3-
size 1312526
2+
oid sha256:77b63ebcde61cdec096e0be6d83d60c679c63a7608047317672c10d3e478e5fe
3+
size 1302881

0 commit comments

Comments
 (0)