Modify yolov4_berkeley link for download, clean to merge with master

Signed-off-by: Micaela Verucchi <[email protected]>

Author: mive93

CMakeLists.txt

@@ -116,15 +116,6 @@ target_link_libraries(test_yolo3_flir tkDNN)
 add_executable(test_yolo4 tests/yolo4/yolo4.cpp)
 target_link_libraries(test_yolo4 tkDNN)
 
-add_executable(test_yolo4_320 tests/yolo4/yolo4_320.cpp)
-target_link_libraries(test_yolo4_320 tkDNN)
-
-add_executable(test_yolo4_512 tests/yolo4/yolo4_512.cpp)
-target_link_libraries(test_yolo4_512 tkDNN)
-
-add_executable(test_yolo4_608 tests/yolo4/yolo4_608.cpp)
-target_link_libraries(test_yolo4_608 tkDNN)
-
 add_executable(test_yolo4_berkeley tests/yolo4_berkeley/yolo4_berkeley.cpp)
 target_link_libraries(test_yolo4_berkeley tkDNN)
 

demo/demo/map.cpp

@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
     }
 
     if(write_coco_json){
-        coco_json.seekp (coco_json.tellp()-2);
+        coco_json.seekp (coco_json.tellp() - std::streampos(2));
         coco_json << "\n]\n";
         coco_json.close();
     }

include/tkDNN/DetectionNN.h

@@ -14,7 +14,7 @@
 
 #include "tkdnn.h"
 
-#define OPENCV_CUDACONTRIB //if OPENCV has been compiled with CUDA and contrib.
+// #define OPENCV_CUDACONTRIB //if OPENCV has been compiled with CUDA and contrib.
 
 #ifdef OPENCV_CUDACONTRIB
 #include <opencv2/cudawarping.hpp>
@@ -104,7 +104,7 @@ class DetectionNN {
                 FatalError("A batch size greater than nBatches cannot be used");
 
             originalSize.clear();
-            if(VERBOSE) printCenteredTitle(" TENSORRT detection ", '=', 30); 
+            if(TKDNN_VERBOSE) printCenteredTitle(" TENSORRT detection ", '=', 30); 
             {
                 TIMER_START
                 for(int bi=0; bi<cur_batches;++bi){
@@ -121,11 +121,11 @@ class DetectionNN {
             tk::dnn::dataDim_t dim = netRT->input_dim;
             dim.n = cur_batches;
             {
-                if(VERBOSE) dim.print();
+                if(TKDNN_VERBOSE) dim.print();
                 TIMER_START
                 netRT->infer(dim, input_d);
                 TIMER_STOP
-                if(VERBOSE) dim.print();
+                if(TKDNN_VERBOSE) dim.print();
                 stats.push_back(t_ns);
                 if(save_times) *times<<t_ns<<";";
             }

include/tkDNN/utils.h

@@ -36,7 +36,7 @@
 #define COL_PURPLEB "\033[1;35m"
 #define COL_CYANB "\033[1;36m"
 
-#define VERBOSE 0
+#define TKDNN_VERBOSE 0
 
 // Simple Timer 
 #define TIMER_START timespec start, end;                               \
@@ -47,7 +47,7 @@
                   (double)(end.tv_nsec - start.tv_nsec))/1.0e6;        \
     if(show) std::cout<<col<<"Time:"<<std::setw(16)<<t_ns<<" ms\n"<<COL_END; 
 
-#define TIMER_STOP TIMER_STOP_C(COL_CYANB, VERBOSE)
+#define TIMER_STOP TIMER_STOP_C(COL_CYANB, TKDNN_VERBOSE)
 
 /********************************************************
  * Prints the error message, and exits