merge with master

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

scripts/download_validation.py

@@ -0,0 +1,39 @@
+import os
+import urllib.request as dowReq
+import zipfile
+
+val = input("Enter BDD or COCO :")
+if(val == "COCO"):
+    url = "https://cloud.hipert.unimore.it/s/LNxBDk4wzqXPL8c/download"
+    lib = "..\demo\COCO_val2017"
+    lib_zip = "COCO_val2017.zip"
+elif(val == "BDD"):
+    url = "https://cloud.hipert.unimore.it/s/bikqk3FzCq2tg4D/download"
+    lib = "..\demo\BDD100k_val"
+    lib_zip = "BDD100k_val.zip"
+
+dowReq.urlretrieve(url,lib_zip)
+
+with zipfile.ZipFile(lib_zip,'r') as zip_ref:
+    zip_ref.extractall(lib)
+
+labelFolder = lib + "\labels"
+imageFolder = lib + "\images"
+
+file1 = open(".\\..\\demo\\all_labels.txt","a")
+path1 = os.path.realpath(labelFolder)
+for file in os.listdir(labelFolder):
+    valTemp = path1 + "\\" + file
+    valTemp = valTemp + '\n'
+    file1.write(valTemp)
+file1.close()
+
+file2 = open(".\\..\\demo\\all_images.txt","a")
+path2 = os.path.realpath(imageFolder)
+for file in os.listdir(imageFolder):
+    pathtemp = path2 + "\\" + file
+    pathtemp = pathtemp + '\n'
+    file2.write(pathtemp)
+file2.close()
+
+print("Completed")

scripts/test_all_tests.sh

@@ -69,12 +69,21 @@ do
     echo -e "${ORANGE}Batch $TKDNN_BATCHSIZE ${NC}"
     
     test_net mnist    
-    ./test_imuodom &>> $out_file
-    print_output $? imuodom
+    # ./test_imuodom &>> $out_file
+    # print_output $? imuodom
 
+    test_net shelfnet
+    test_net shelfnet_berkeley
     test_net yolo4
+    test_net yolo4_320
+    test_net yolo4_320_coco2
+    test_net yolo4_512
+    test_net yolo4_608
+    test_net yolo4-csp
+    test_net yolo4x
     test_net yolo4_berkeley
     test_net yolo4tiny
+    test_net yolo4tiny_512
     test_net yolo3
     test_net yolo3_berkeley
     test_net yolo3_coco4

scripts/test_inference.sh

@@ -42,7 +42,7 @@ do
     echo -e "${ORANGE}Batch $TKDNN_BATCHSIZE ${NC}"
     
     test_inference yolo4_320 $mode
-    test_inference yolo4_416 $mode
+    test_inference yolo4 $mode
     test_inference yolo4_512 $mode
     test_inference yolo4_608 $mode
     test_inference yolo4tiny $mode