Merge with master, all tests passed

Signed-off-by: Micaela Verucchi <micaelaverucchi@gmail.com>

demo/demo/demo.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 #include <signal.h>
 #include <stdlib.h>     /* srand, rand */
-#include <unistd.h>
+//#include <unistd.h>
 #include <mutex>
 
 #include "CenternetDetection.h"
@@ -22,10 +22,15 @@ int main(int argc, char *argv[]) {
     signal(SIGINT, sig_handler);
 
 
-    std::string net = "yolo3_berkeley.rt";
+    std::string net = "yolo4tiny_fp32.rt";
     if(argc > 1)
         net = argv[1]; 
-    std::string input = "../demo/yolo_test.mp4";
+    #ifdef __linux__ 
+        std::string input = "../demo/yolo_test.mp4";
+    #elif _WIN32
+        std::string input = "..\\..\\..\\demo\\yolo_test.mp4";
+    #endif
+
     if(argc > 2)
         input = argv[2]; 
     char ntype = 'y';
@@ -40,6 +45,9 @@ int main(int argc, char *argv[]) {
     bool show = true;
     if(argc > 6)
         show = atoi(argv[6]); 
+    float conf_thresh=0.3;
+    if(argc > 7)
+        conf_thresh = atof(argv[7]);     
 
     if(n_batch < 1 || n_batch > 64)
         FatalError("Batch dim not supported");
@@ -69,7 +77,7 @@ int main(int argc, char *argv[]) {
         FatalError("Network type not allowed (3rd parameter)\n");
     }
 
-    detNN->init(net, n_classes, n_batch);
+    detNN->init(net, n_classes, n_batch, conf_thresh);
 
     gRun = true;
 
@@ -128,7 +136,7 @@ int main(int argc, char *argv[]) {
     double mean = 0; 
     
     std::cout<<COL_GREENB<<"\n\nTime stats:\n";
-    std::cout<<"Min: "<<*std::min_element(detNN->stats.begin(), detNN->stats.end())/n_batch<<" ms\n";    
+   std::cout<<"Min: "<<*std::min_element(detNN->stats.begin(), detNN->stats.end())/n_batch<<" ms\n";    
     std::cout<<"Max: "<<*std::max_element(detNN->stats.begin(), detNN->stats.end())/n_batch<<" ms\n";    
     for(int i=0; i<detNN->stats.size(); i++) mean += detNN->stats[i]; mean /= detNN->stats.size();
     std::cout<<"Avg: "<<mean/n_batch<<" ms\t"<<1000/(mean/n_batch)<<" FPS\n"<<COL_END;   

demo/demo/map.cpp

@@ -2,7 +2,10 @@
 #include <iostream>
 #include <signal.h>
 #include <stdlib.h>     /* srand, rand */
+#ifdef __linux__
 #include <unistd.h>
+#endif
+
 #include <mutex>
 #include "utils.h"
 
@@ -105,7 +108,7 @@ int main(int argc, char *argv[])
         default:
             FatalError("Network type not allowed (3rd parameter)\n");
     }
-    detNN->init(net, n_classes);
+    detNN->init(net, n_classes, 1, conf_thresh);
 
     //read images 
     std::ifstream all_labels(labels_path);