From 4ac2c87d1ccbad115c7b9898558cb3d8df69ed2b Mon Sep 17 00:00:00 2001 From: Micaela Verucchi Date: Mon, 28 Oct 2019 18:39:28 +0100 Subject: [PATCH] cmake fix --- CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31f5d5b..27fe9cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,15 +89,8 @@ target_link_libraries(test_yolo3_coco4 tkDNN) add_executable(test_yolo3_berkeley tests/yolo3_berkeley/yolo3_berkeley.cpp) target_link_libraries(test_yolo3_berkeley tkDNN) -<<<<<<< HEAD add_executable(test_yolo3_flir tests/yolo3_flir/yolo3_flir.cpp) target_link_libraries(test_yolo3_flir tkDNN) -======= -add_executable(test_yolo3_tetrapack tests/yolo3_tetrapack/yolo3_tetrapack.cpp) -target_link_libraries(test_yolo3_tetrapack tkDNN) - -add_executable(test_yolo3_tetrapack_resize tests/yolo3_tetrapack_resize/yolo3_tetrapack_resize.cpp) -target_link_libraries(test_yolo3_tetrapack_resize tkDNN) add_executable(test_yolo3_BCDS6 tests/yolo3_BCDS6/yolo3_BCDS6.cpp) target_link_libraries(test_yolo3_BCDS6 tkDNN) @@ -105,8 +98,6 @@ target_link_libraries(test_yolo3_BCDS6 tkDNN) add_executable(test_resnet101 tests/resnet101/resnet101.cpp) target_link_libraries(test_resnet101 tkDNN) - ->>>>>>> e1d0fa3... resnet first try ################################################################################