Fix CUDA diff with develop

cmake_targets/build_oai

@@ -701,8 +701,8 @@ function main() {
   if [ "$SIMUS_PHY" = "1" ] ; then
     echo_info "Compiling physical unitary tests simulators"
     # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
-    simlist="dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim"
-	# simlist="ldpctest"
+    # simlist="dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim"
+	simlist="ldpctest"
     for f in $simlist ; do
       compilations \
         phy_simulators $f \

openair1/PHY/CODING/TESTBENCH/ldpctest.c

@@ -402,17 +402,9 @@ int test_ldpc(short No_iteration,
     	  start_meas(time_decoder);
 #ifdef CUDA_FLAG
         if(run_cuda){
-<<<<<<< HEAD
           n_iter = nrLDPC_decoder_LYC(&decParams, (int8_t*)channel_output_fixed[j], (int8_t*)estimated_output[j], block_length, time_decoder);
         }  
         else{ 
-=======
-          printf("***********run ldpc by cuda\n");
-          n_iter = nrLDPC_decoder_LYC(&decParams, (int8_t*)channel_output_fixed[j], (int8_t*)estimated_output[j], block_length, time_decoder);
-        }  
-        else{ 
-          printf("**************run ldpc by cpu\n");  
->>>>>>> origin/develop
         // decode the sequence
         // decoder supports BG2, Z=128 & 256
         //esimated_output=ldpc_decoder(channel_output_fixed, block_length, No_iteration, (double)((float)nom_rate/(float)denom_rate));

openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.h

@@ -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