From 2f5b51c94a43afc544659e71a976f55d101c8ab8 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Mon, 24 Jan 2022 23:21:31 -0500 Subject: [PATCH] Avoiding symbol clashes with Opus --- dnn/lpcnet.c | 8 ++++---- dnn/nnet.c | 2 +- dnn/nnet.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dnn/lpcnet.c b/dnn/lpcnet.c index bc27ee9c..bd61d6f7 100644 --- a/dnn/lpcnet.c +++ b/dnn/lpcnet.c @@ -100,11 +100,11 @@ void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b compute_conv1d(&feature_conv2, conv2_out, net->feature_conv2_state, conv1_out); celt_assert(FRAME_INPUT_SIZE == FEATURE_CONV2_OUT_SIZE); if (lpcnet->frame_count < FEATURES_DELAY) RNN_CLEAR(conv2_out, FEATURE_CONV2_OUT_SIZE); - compute_dense(&feature_dense1, dense1_out, conv2_out); - compute_dense(&feature_dense2, condition, dense1_out); + _lpcnet_compute_dense(&feature_dense1, dense1_out, conv2_out); + _lpcnet_compute_dense(&feature_dense2, condition, dense1_out); RNN_COPY(rc, condition, LPC_ORDER); - compute_dense(&gru_a_dense_feature, gru_a_condition, condition); - compute_dense(&gru_b_dense_feature, gru_b_condition, condition); + _lpcnet_compute_dense(&gru_a_dense_feature, gru_a_condition, condition); + _lpcnet_compute_dense(&gru_b_dense_feature, gru_b_condition, condition); #ifdef END2END rc2lpc(lpc, rc); #elif FEATURES_DELAY>0 diff --git a/dnn/nnet.c b/dnn/nnet.c index 59fdc4ad..8af88713 100644 --- a/dnn/nnet.c +++ b/dnn/nnet.c @@ -113,7 +113,7 @@ void compute_activation(float *output, const float *input, int N, int activation } } -void compute_dense(const DenseLayer *layer, float *output, const float *input) +void _lpcnet_compute_dense(const DenseLayer *layer, float *output, const float *input) { int i; int N, M; diff --git a/dnn/nnet.h b/dnn/nnet.h index a5d50e6c..7e2549b2 100644 --- a/dnn/nnet.h +++ b/dnn/nnet.h @@ -96,7 +96,7 @@ typedef struct { void compute_activation(float *output, const float *input, int N, int activation); -void compute_dense(const DenseLayer *layer, float *output, const float *input); +void _lpcnet_compute_dense(const DenseLayer *layer, float *output, const float *input); void compute_mdense(const MDenseLayer *layer, float *output, const float *input);