Fix CUDA diff with develop

2020-08-13 14:15:54 +08:00
parent 96023eeb93
commit 10d52466a8
4 changed files with 4 additions and 223 deletions
@@ -23,13 +23,12 @@

 int32_t nrLDPC_decoder_LYC(t_nrLDPC_dec_params* p_decParams, int8_t* p_llr, int8_t* p_out, int block_length, time_stats_t *time_decoder);

-<<<<<<< HEAD
+
 void init_LLR_DMA_for_CUDA(t_nrLDPC_dec_params* p_decParams, int8_t* p_llr, int8_t* p_out, int block_length);

 void warmup_for_GPU(void);

 void set_compact_BG(int Zc, short BG);

-=======
->>>>>>> origin/develop
+
 #endif