Fixed merge errors

llvm/projects/hpvm-tensor-rt/CMakeLists.txt

@@ -13,7 +13,7 @@ set(
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   message("Debug mode")
-  set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-G;-g;-lineinfo;-Xcompiler;-ggdb;-lcurand)
+  set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-g;-lineinfo;-Xcompiler;-ggdb;-lcurand)
 else()
   set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-DNDEBUG;-Xcompiler;-DNDEBUG;-lcurand)
 endif()
@@ -64,13 +64,7 @@ find_library(SOC_SIMULATOR_LIB
 
 target_link_libraries(tensor_runtime cudnn cufft stdc++fs -lcurand)
 if(USE_GFLAGS)
-<<<<<<< HEAD
-  target_link_libraries(tensor_runtime  gflags cudnn -lcurand)
-else()
-  target_link_libraries(tensor_runtime  cudnn -lcurand)
-=======
   target_link_libraries(tensor_runtime gflags)
->>>>>>> approx_hpvm_img
 endif()
 
 
@@ -99,14 +93,11 @@ target_link_libraries(test_ops  tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULAT
 add_executable(fc2_cpu  dnn_sources/src/fc2_cpu.cc)
 target_link_libraries(fc2_cpu  tensor_cpu_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
 
-<<<<<<< HEAD
 
 #-- add_executable(mio_test  dnn_sources/src/mio_test.cc)
 #-- target_link_libraries(mio_test  tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
 
 
-=======
->>>>>>> approx_hpvm_img
 # Full-Precision versions
 #-- add_executable(lenet_tanh  dnn_sources/src/lenet2_tanh.cc)
 #-- target_link_libraries(lenet_tanh  tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})