shithub: opus

Info  •  Files  •  Log  •  Branches

Fix warnings about undeclared memcpy()

--- a/dnn/dred_rdovae_dec.c

+++ b/dnn/dred_rdovae_dec.c

@@ -29,7 +29,7 @@

 #include "config.h"

 #endif

-

+#include "common.h"

 #include "dred_rdovae_dec.h"

 #include "dred_rdovae_constants.h"

@@ -63,7 +63,7 @@

     output_index += DEC_DENSE1_OUT_SIZE;

     compute_gruB(&dec_dense2, zero_vector, dec_state->dense2_state, &buffer[input_index]);

-    memcpy(&buffer[output_index], dec_state->dense2_state, DEC_DENSE2_OUT_SIZE * sizeof(float));

+    RNN_COPY(&buffer[output_index], dec_state->dense2_state, DEC_DENSE2_OUT_SIZE);

     input_index = output_index;

     output_index += DEC_DENSE2_OUT_SIZE;

@@ -72,7 +72,7 @@

     output_index += DEC_DENSE3_OUT_SIZE;

     compute_gruB(&dec_dense4, zero_vector, dec_state->dense4_state, &buffer[input_index]);

-    memcpy(&buffer[output_index], dec_state->dense4_state, DEC_DENSE4_OUT_SIZE * sizeof(float));

+    RNN_COPY(&buffer[output_index], dec_state->dense4_state, DEC_DENSE4_OUT_SIZE);

     input_index = output_index;

     output_index += DEC_DENSE4_OUT_SIZE;

@@ -81,7 +81,7 @@

     output_index += DEC_DENSE5_OUT_SIZE;

     compute_gruB(&dec_dense6, zero_vector, dec_state->dense6_state, &buffer[input_index]);

-    memcpy(&buffer[output_index], dec_state->dense6_state, DEC_DENSE6_OUT_SIZE * sizeof(float));

+    RNN_COPY(&buffer[output_index], dec_state->dense6_state, DEC_DENSE6_OUT_SIZE);

     input_index = output_index;

     output_index += DEC_DENSE6_OUT_SIZE;

@@ -93,4 +93,4 @@

     output_index += DEC_DENSE8_OUT_SIZE;

     _lpcnet_compute_dense(&dec_final, qframe, buffer);

-}

\ No newline at end of file

+}

--- a/dnn/dred_rdovae_enc.c

+++ b/dnn/dred_rdovae_enc.c

@@ -33,8 +33,8 @@

 #include "dred_rdovae_enc.h"

+#include "common.h"

-

 void dred_rdovae_encode_dframe(

     RDOVAEEnc *enc_state,           /* io: encoder state */

     float *latents,                 /* o: latent vector */

@@ -53,7 +53,7 @@

     output_index += ENC_DENSE1_OUT_SIZE;

     compute_gruB(&enc_dense2, zero_vector, enc_state->dense2_state, &buffer[input_index]);

-    memcpy(&buffer[output_index], enc_state->dense2_state, ENC_DENSE2_OUT_SIZE * sizeof(float));

+    RNN_COPY(&buffer[output_index], enc_state->dense2_state, ENC_DENSE2_OUT_SIZE);

     input_index = output_index;

     output_index += ENC_DENSE2_OUT_SIZE;

@@ -62,7 +62,7 @@

     output_index += ENC_DENSE3_OUT_SIZE;

     compute_gruB(&enc_dense4, zero_vector, enc_state->dense4_state, &buffer[input_index]);

-    memcpy(&buffer[output_index], enc_state->dense4_state, ENC_DENSE4_OUT_SIZE * sizeof(float));

+    RNN_COPY(&buffer[output_index], enc_state->dense4_state, ENC_DENSE4_OUT_SIZE);

     input_index = output_index;

     output_index += ENC_DENSE4_OUT_SIZE;

@@ -71,7 +71,7 @@

     output_index += ENC_DENSE5_OUT_SIZE;

     compute_gruB(&enc_dense6, zero_vector, enc_state->dense6_state, &buffer[input_index]);

-    memcpy(&buffer[output_index], enc_state->dense6_state, ENC_DENSE6_OUT_SIZE * sizeof(float));

+    RNN_COPY(&buffer[output_index], enc_state->dense6_state, ENC_DENSE6_OUT_SIZE);

     input_index = output_index;

     output_index += ENC_DENSE6_OUT_SIZE;

--- a/dnn/write_lpcnet_weights.c

+++ b/dnn/write_lpcnet_weights.c

@@ -29,6 +29,7 @@

 #endif

 #include <stdio.h>

+#include <string.h>

 #include "nnet.h"

 /* This is a bit of a hack because we need to build nnet_data.c and plc_data.c without USE_WEIGHTS_FILE,

@@ -62,7 +63,7 @@

   }

 }

-int main()

+int main(void)

 {

   FILE *fout = fopen("weights_blob.bin", "w");

   write_weights(lpcnet_arrays, fout);

-- 

⑨