TRT8 works with almost every nerual network now!!!!(including demo3d)

demo/demo/demo.cpp

@@ -43,19 +43,18 @@ int main(int argc, char *argv[]) {
         std::string input = "..\\..\\..\\demo\\yolo_test.mp4";
     #endif
 
-
-    if(argc > 2)
-        cfgPath = argv[3];
-    if(argc > 3)
-        namePath = argv[4];
-    if(argc > 4)
-        input = argv[5];
     char ntype = 'y';
-    if(argc > 5)
+    if(argc > 2)
         ntype = argv[2][0];
     int n_classes = 80;
+    if(argc > 3)
+        n_classes = atoi(argv[3]);
+    if(argc > 4)
+        cfgPath = argv[4];
+    if(argc > 5)
+        namePath = argv[5];
     if(argc > 6)
-        n_classes = atoi(argv[6]);
+        input = argv[6];
     int n_batch = 1;
     if(argc > 7)
         n_batch = atoi(argv[7]);
@@ -63,7 +62,7 @@ int main(int argc, char *argv[]) {
     if(argc > 8)
         show = atoi(argv[8]);
     float conf_thresh=0.3;
-    if(argc > 9)
+    if(argc >= 9)
         conf_thresh = atof(argv[9]);
 
     if(n_batch < 1 || n_batch > 64)
@@ -73,8 +72,8 @@ int main(int argc, char *argv[]) {
         SAVE_RESULT = true;
 
     if(ntype == 'c' || ntype == 'm'){
-        cfgPath = nullptr;
-        namePath = nullptr;
+        cfgPath = "";
+        namePath = "";
 
     }
     tk::dnn::Yolo3Detection yolo;

demo/demo/map.cpp

@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
 {
     char ntype = 'y';
     const char *config_filename = "../demo/config.yaml";
-    const char * net = "yolo3.rt";
+    const char * net = "yolo4tiny_fp32.rt";
     const char * labels_path = "../demo/COCO_val2017/all_labels.txt";
     int n_batches = 1;
     float confidence_thresh = 0.3;
@@ -45,7 +45,8 @@ int main(int argc, char *argv[])
     bool verbose;
     int classes, map_points, map_levels;
     float map_step, IoU_thresh, conf_thresh;
-
+    std::string cfg_path = "../tests/darknet/cfg/yolo4tiny.cfg";
+    std::string name_path = "../tests/darknet/names/coco.names";
     double vm_total = 0, rss_total = 0;
     double vm, rss;
 
@@ -53,15 +54,19 @@ int main(int argc, char *argv[])
     if(argc > 1)
         net = argv[1]; 
     if(argc > 2)
-        ntype = argv[2][0];    
+        ntype = argv[2][0];
     if(argc > 3)
-        labels_path = argv[3]; 
+        cfg_path = argv[3];
     if(argc > 4)
-        config_filename = argv[4]; 
+        name_path = argv[4];
     if(argc > 5)
-        n_batches = atoi(argv[5]); 
+        labels_path = argv[5];
     if(argc > 6)
-        confidence_thresh = atof(argv[6]); 
+        config_filename = argv[6];
+    if(argc > 7)
+        n_batches = atoi(argv[7]);
+    if(argc > 8)
+        confidence_thresh = atof(argv[8]);
 
     std::cout<<"conf t: "<<confidence_thresh<<std::endl;
 
@@ -116,7 +121,7 @@ int main(int argc, char *argv[])
         default:
             FatalError("Network type not allowed (3rd parameter)\n");
     }
-    detNN->init(net, n_classes, 1, conf_thresh);
+    detNN->init(net,cfg_path,name_path,n_classes, 1, conf_thresh);
 
     //read images 
     std::ifstream all_labels(labels_path);