shithub: opus

Info  •  Files  •  Log  •  Branches

Fix DRED conv layer buffering

--- a/dnn/dred_rdovae_dec.c

+++ b/dnn/dred_rdovae_dec.c

@@ -104,7 +104,7 @@

     compute_glu(&model->dec_glu1, &buffer[output_index], dec_state->gru1_state, arch);

     output_index += DEC_GRU1_OUT_SIZE;

     conv1_cond_init(dec_state->conv1_state, output_index, 1, &dec_state->initialized);

-    compute_generic_conv1d(&model->dec_conv1, &buffer[output_index], dec_state->conv1_state, buffer, output_index, ACTIVATION_TANH, arch);

+    compute_generic_conv1d(&model->dec_conv1, &buffer[output_index], dec_state->conv1_state, buffer, DEC_CONV1_IN_SIZE, ACTIVATION_TANH, arch);

     output_index += DEC_CONV1_OUT_SIZE;

     compute_generic_gru(&model->dec_gru2_input, &model->dec_gru2_recurrent, dec_state->gru2_state, buffer, arch);

@@ -111,7 +111,7 @@

     compute_glu(&model->dec_glu2, &buffer[output_index], dec_state->gru2_state, arch);

     output_index += DEC_GRU2_OUT_SIZE;

     conv1_cond_init(dec_state->conv2_state, output_index, 1, &dec_state->initialized);

-    compute_generic_conv1d(&model->dec_conv2, &buffer[output_index], dec_state->conv2_state, buffer, output_index, ACTIVATION_TANH, arch);

+    compute_generic_conv1d(&model->dec_conv2, &buffer[output_index], dec_state->conv2_state, buffer, DEC_CONV2_IN_SIZE, ACTIVATION_TANH, arch);

     output_index += DEC_CONV2_OUT_SIZE;

     compute_generic_gru(&model->dec_gru3_input, &model->dec_gru3_recurrent, dec_state->gru3_state, buffer, arch);

@@ -118,7 +118,7 @@

     compute_glu(&model->dec_glu3, &buffer[output_index], dec_state->gru3_state, arch);

     output_index += DEC_GRU3_OUT_SIZE;

     conv1_cond_init(dec_state->conv3_state, output_index, 1, &dec_state->initialized);

-    compute_generic_conv1d(&model->dec_conv3, &buffer[output_index], dec_state->conv3_state, buffer, output_index, ACTIVATION_TANH, arch);

+    compute_generic_conv1d(&model->dec_conv3, &buffer[output_index], dec_state->conv3_state, buffer, DEC_CONV3_IN_SIZE, ACTIVATION_TANH, arch);

     output_index += DEC_CONV3_OUT_SIZE;

     compute_generic_gru(&model->dec_gru4_input, &model->dec_gru4_recurrent, dec_state->gru4_state, buffer, arch);

@@ -125,7 +125,7 @@

     compute_glu(&model->dec_glu4, &buffer[output_index], dec_state->gru4_state, arch);

     output_index += DEC_GRU4_OUT_SIZE;

     conv1_cond_init(dec_state->conv4_state, output_index, 1, &dec_state->initialized);

-    compute_generic_conv1d(&model->dec_conv4, &buffer[output_index], dec_state->conv4_state, buffer, output_index, ACTIVATION_TANH, arch);

+    compute_generic_conv1d(&model->dec_conv4, &buffer[output_index], dec_state->conv4_state, buffer, DEC_CONV4_IN_SIZE, ACTIVATION_TANH, arch);

     output_index += DEC_CONV4_OUT_SIZE;

     compute_generic_gru(&model->dec_gru5_input, &model->dec_gru5_recurrent, dec_state->gru5_state, buffer, arch);

@@ -132,7 +132,7 @@

     compute_glu(&model->dec_glu5, &buffer[output_index], dec_state->gru5_state, arch);

     output_index += DEC_GRU5_OUT_SIZE;

     conv1_cond_init(dec_state->conv5_state, output_index, 1, &dec_state->initialized);

-    compute_generic_conv1d(&model->dec_conv5, &buffer[output_index], dec_state->conv5_state, buffer, output_index, ACTIVATION_TANH, arch);

+    compute_generic_conv1d(&model->dec_conv5, &buffer[output_index], dec_state->conv5_state, buffer, DEC_CONV5_IN_SIZE, ACTIVATION_TANH, arch);

     output_index += DEC_CONV5_OUT_SIZE;

     compute_generic_dense(&model->dec_output, qframe, buffer, ACTIVATION_LINEAR, arch);

--- a/dnn/dred_rdovae_enc.c

+++ b/dnn/dred_rdovae_enc.c

@@ -69,7 +69,7 @@

     OPUS_COPY(&buffer[output_index], enc_state->gru1_state, ENC_GRU1_OUT_SIZE);

     output_index += ENC_GRU1_OUT_SIZE;

     conv1_cond_init(enc_state->conv1_state, output_index, 1, &enc_state->initialized);

-    compute_generic_conv1d(&model->enc_conv1, &buffer[output_index], enc_state->conv1_state, buffer, output_index, ACTIVATION_TANH, arch);

+    compute_generic_conv1d(&model->enc_conv1, &buffer[output_index], enc_state->conv1_state, buffer, ENC_CONV1_IN_SIZE, ACTIVATION_TANH, arch);

     output_index += ENC_CONV1_OUT_SIZE;

     compute_generic_gru(&model->enc_gru2_input, &model->enc_gru2_recurrent, enc_state->gru2_state, buffer, arch);

@@ -76,7 +76,7 @@

     OPUS_COPY(&buffer[output_index], enc_state->gru2_state, ENC_GRU2_OUT_SIZE);

     output_index += ENC_GRU2_OUT_SIZE;

     conv1_cond_init(enc_state->conv2_state, output_index, 2, &enc_state->initialized);

-    compute_generic_conv1d_dilation(&model->enc_conv2, &buffer[output_index], enc_state->conv2_state, buffer, output_index, 2, ACTIVATION_TANH, arch);

+    compute_generic_conv1d_dilation(&model->enc_conv2, &buffer[output_index], enc_state->conv2_state, buffer, ENC_CONV2_IN_SIZE, 2, ACTIVATION_TANH, arch);

     output_index += ENC_CONV2_OUT_SIZE;

     compute_generic_gru(&model->enc_gru3_input, &model->enc_gru3_recurrent, enc_state->gru3_state, buffer, arch);

@@ -83,7 +83,7 @@

     OPUS_COPY(&buffer[output_index], enc_state->gru3_state, ENC_GRU3_OUT_SIZE);

     output_index += ENC_GRU3_OUT_SIZE;

     conv1_cond_init(enc_state->conv3_state, output_index, 2, &enc_state->initialized);

-    compute_generic_conv1d_dilation(&model->enc_conv3, &buffer[output_index], enc_state->conv3_state, buffer, output_index, 2, ACTIVATION_TANH, arch);

+    compute_generic_conv1d_dilation(&model->enc_conv3, &buffer[output_index], enc_state->conv3_state, buffer, ENC_CONV3_IN_SIZE, 2, ACTIVATION_TANH, arch);

     output_index += ENC_CONV3_OUT_SIZE;

     compute_generic_gru(&model->enc_gru4_input, &model->enc_gru4_recurrent, enc_state->gru4_state, buffer, arch);

@@ -90,7 +90,7 @@

     OPUS_COPY(&buffer[output_index], enc_state->gru4_state, ENC_GRU4_OUT_SIZE);

     output_index += ENC_GRU4_OUT_SIZE;

     conv1_cond_init(enc_state->conv4_state, output_index, 2, &enc_state->initialized);

-    compute_generic_conv1d_dilation(&model->enc_conv4, &buffer[output_index], enc_state->conv4_state, buffer, output_index, 2, ACTIVATION_TANH, arch);

+    compute_generic_conv1d_dilation(&model->enc_conv4, &buffer[output_index], enc_state->conv4_state, buffer, ENC_CONV4_IN_SIZE, 2, ACTIVATION_TANH, arch);

     output_index += ENC_CONV4_OUT_SIZE;

     compute_generic_gru(&model->enc_gru5_input, &model->enc_gru5_recurrent, enc_state->gru5_state, buffer, arch);

@@ -97,7 +97,7 @@

     OPUS_COPY(&buffer[output_index], enc_state->gru5_state, ENC_GRU5_OUT_SIZE);

     output_index += ENC_GRU5_OUT_SIZE;

     conv1_cond_init(enc_state->conv5_state, output_index, 2, &enc_state->initialized);

-    compute_generic_conv1d_dilation(&model->enc_conv5, &buffer[output_index], enc_state->conv5_state, buffer, output_index, 2, ACTIVATION_TANH, arch);

+    compute_generic_conv1d_dilation(&model->enc_conv5, &buffer[output_index], enc_state->conv5_state, buffer, ENC_CONV5_IN_SIZE, 2, ACTIVATION_TANH, arch);

     output_index += ENC_CONV5_OUT_SIZE;

     compute_generic_dense(&model->enc_zdense, padded_latents, buffer, ACTIVATION_LINEAR, arch);

-- 

⑨