Add mnist download, change ERROR_TKDNN into ERROR_TENSORRT

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

include/tkDNN/utils.h

@@ -95,7 +95,7 @@
 
 typedef enum {
   ERROR_CUDNN = 2,
-  ERROR_TKDNN = 4,
+  ERROR_TENSORRT = 4,
   ERROR_CUDNNvsTENSORRT = 8    
 } resultError_t;
 

scripts/test_all_tests.sh

@@ -32,13 +32,13 @@ function print_output {
 out_file=results.log
 rm $out_file
 
-modes=( 1 ) # only FP32
-# modes=( 1 2 ) # FP32 and FP16
+# modes=( 1 ) # only FP32
+modes=( 1 2 ) # FP32 and FP16
 # modes=( 1 2 3 ) # FP32, FP16 and INT8
 
 for i in "${modes[@]}"
 do
-    rm *rt
+    # rm *rt
     if [ $i -eq 1 ]
     then
         export TKDNN_MODE=FP32

tests/csresnext50-panet-spp/csresnext50-panet-spp.cpp

@@ -546,7 +546,7 @@ int main()
         std::cout<<"CUDNN vs correct"; 
         ret_cudnn |= checkResult(odim, cudnn_out[i], out) == 0 ? 0: ERROR_CUDNN;
         std::cout<<"TRT   vs correct"; 
-        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TKDNN;
+        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TENSORRT;
         std::cout<<"CUDNN vs TRT    "; 
         ret_cudnn_tensorrt |= checkResult(odim, cudnn_out[i], rt_out[i]) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
     }

tests/dla34/dla34.cpp

@@ -342,7 +342,7 @@ int main()
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(odim, cudnn_out, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(odim, rt_out, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(odim, rt_out, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(odim, cudnn_out, rt_out) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/dla34_cnet/dla34_cnet.cpp

@@ -524,7 +524,7 @@ int main()
         std::cout<<"CUDNN vs correct"; 
         ret_cudnn |= checkResult(odim, cudnn_out, out) == 0 ? 0: ERROR_CUDNN;
         std::cout<<"TRT   vs correct"; 
-        ret_tensorrt |= checkResult(odim, rt_out, out) == 0 ? 0 : ERROR_TKDNN;
+        ret_tensorrt |= checkResult(odim, rt_out, out) == 0 ? 0 : ERROR_TENSORRT;
         std::cout<<"CUDNN vs TRT    "; 
         ret_cudnn_tensorrt |= checkResult(odim, cudnn_out, rt_out) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
     }

tests/mnist/test_mnist.cpp

@@ -10,6 +10,8 @@ const char *output_bin   = "../tests/mnist/output.bin";
 
 int main() {
 
+    downloadWeightsifDoNotExist(input_bin, "../tests/mnist", "https://cloud.hipert.unimore.it/s/2TyQkMJL3LArLAS/download");
+
     // Network layout
     tk::dnn::dataDim_t dim(1, 1, 28, 28, 1);
     tk::dnn::Network net(dim);
@@ -58,7 +60,7 @@ int main() {
     //printDeviceVector(10, out_data);
 
     std::cout<<"\n======= CHECK RESULT =======\n";
-    checkResult(dim.tot(), out_data, out_data2);
+    int ret_tensorrt = checkResult(dim.tot(), out_data, out_data2) == 0 ? 0 : ERROR_TENSORRT;
 
  /*
     // Print real test
@@ -68,5 +70,5 @@ int main() {
     readBinaryFile(output_bin, dim.tot(), &out_h, &out);
     printDeviceVector(dim.tot(), out);
 */ 
-    return 0;
+    return ret_tensorrt;
 }

tests/mnist/test_mnistRT.cpp

@@ -25,6 +25,8 @@ class Logger : public ILogger
 
 int main() {
 
+	downloadWeightsifDoNotExist(input_bin, "../tests/mnist", "https://cloud.hipert.unimore.it/s/2TyQkMJL3LArLAS/download");
+
     std::cout<<"\n==== CUDNN ====\n";
     // Network layout
     tk::dnn::dataDim_t dim(1, 1, 28, 28, 1);

tests/mobilenetv2ssd/mobilenetv2ssd.cpp

@@ -518,8 +518,8 @@ int main()
     ret_cudnn |= checkResult(odim2, cudnn_out2, out2) == 0 ? 0 : ERROR_CUDNN;
 
     std::cout << "TRT   vs correct" << std::endl;
-    ret_tensorrt |= checkResult(odim1, rt_out1, out1) == 0 ? 0 : ERROR_TKDNN;
-    ret_tensorrt |= checkResult(odim2, rt_out2, out2) == 0 ? 0 : ERROR_TKDNN;
+    ret_tensorrt |= checkResult(odim1, rt_out1, out1) == 0 ? 0 : ERROR_TENSORRT;
+    ret_tensorrt |= checkResult(odim2, rt_out2, out2) == 0 ? 0 : ERROR_TENSORRT;
 
     std::cout << "CUDNN vs TRT    " << std::endl;
     ret_cudnn_tensorrt |= checkResult(odim1, cudnn_out1, rt_out1) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;

tests/mobilenetv2ssd512/mobilenetv2ssd512.cpp

@@ -517,8 +517,8 @@ int main()
     ret_cudnn |= checkResult(odim2, cudnn_out2, out2) == 0 ? 0 : ERROR_CUDNN;
 
     std::cout << "TRT   vs correct" << std::endl;
-    ret_tensorrt |= checkResult(odim1, rt_out1, out1) == 0 ? 0 : ERROR_TKDNN;
-    ret_tensorrt |= checkResult(odim2, rt_out2, out2) == 0 ? 0 : ERROR_TKDNN;
+    ret_tensorrt |= checkResult(odim1, rt_out1, out1) == 0 ? 0 : ERROR_TENSORRT;
+    ret_tensorrt |= checkResult(odim2, rt_out2, out2) == 0 ? 0 : ERROR_TENSORRT;
 
     std::cout << "CUDNN vs TRT    " << std::endl;
     ret_cudnn_tensorrt |= checkResult(odim1, cudnn_out1, rt_out1) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;

tests/resnet101/resnet101.cpp

@@ -330,7 +330,7 @@ int main()
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(odim, cudnn_out, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(odim, rt_out, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(odim, rt_out, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(odim, cudnn_out, rt_out) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/resnet101_cnet/resnet101_cnet.cpp

@@ -405,7 +405,7 @@ int main()
         std::cout<<"CUDNN vs correct"; 
         ret_cudnn |= checkResult(odim, cudnn_out, out) == 0 ? 0: ERROR_CUDNN;
         std::cout<<"TRT   vs correct"; 
-        ret_tensorrt |= checkResult(odim, rt_out, out) == 0 ? 0 : ERROR_TKDNN;
+        ret_tensorrt |= checkResult(odim, rt_out, out) == 0 ? 0 : ERROR_TENSORRT;
         std::cout<<"CUDNN vs TRT    "; 
         ret_cudnn_tensorrt |= checkResult(odim, cudnn_out, rt_out) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
     }

tests/simple/test_simple.cpp

@@ -65,7 +65,7 @@ int main() {
     // std::cout<<"CUDNN vs correct"; 
     // int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     // std::cout<<"TRT   vs correct"; 
-    // int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    // int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo/yolo.cpp

@@ -149,7 +149,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo3/yolo3.cpp

@@ -91,7 +91,7 @@ int main() {
         std::cout<<"CUDNN vs correct"; 
         ret_cudnn |= checkResult(odim, cudnn_out[i], out) == 0 ? 0: ERROR_CUDNN;
         std::cout<<"TRT   vs correct"; 
-        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TKDNN;
+        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TENSORRT;
         std::cout<<"CUDNN vs TRT    "; 
         ret_cudnn_tensorrt |= checkResult(odim, cudnn_out[i], rt_out[i]) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
     }

tests/yolo3_512/yolo3_512.cpp

@@ -91,7 +91,7 @@ int main() {
         std::cout<<"CUDNN vs correct"; 
         ret_cudnn |= checkResult(odim, cudnn_out[i], out) == 0 ? 0: ERROR_CUDNN;
         std::cout<<"TRT   vs correct"; 
-        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TKDNN;
+        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TENSORRT;
         std::cout<<"CUDNN vs TRT    "; 
         ret_cudnn_tensorrt |= checkResult(odim, cudnn_out[i], rt_out[i]) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
     }

tests/yolo3_512tp/yolo3_512tp.cpp

@@ -89,7 +89,7 @@ int main() {
         std::cout<<"CUDNN vs correct"; 
         ret_cudnn |= checkResult(odim, cudnn_out[i], out) == 0 ? 0: ERROR_CUDNN;
         std::cout<<"TRT   vs correct"; 
-        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TKDNN;
+        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TENSORRT;
         std::cout<<"CUDNN vs TRT    "; 
         ret_cudnn_tensorrt |= checkResult(odim, cudnn_out[i], rt_out[i]) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
     }

tests/yolo3_berkeley/yolo3_berkeley.cpp

@@ -91,7 +91,7 @@ int main() {
         std::cout<<"CUDNN vs correct"; 
         ret_cudnn |= checkResult(odim, cudnn_out[i], out) == 0 ? 0: ERROR_CUDNN;
         std::cout<<"TRT   vs correct"; 
-        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TKDNN;
+        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TENSORRT;
         std::cout<<"CUDNN vs TRT    "; 
         ret_cudnn_tensorrt |= checkResult(odim, cudnn_out[i], rt_out[i]) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
     }

tests/yolo3_coco4/yolo3_coco4.cpp

@@ -89,7 +89,7 @@ int main() {
         std::cout<<"CUDNN vs correct"; 
         ret_cudnn |= checkResult(odim, cudnn_out[i], out) == 0 ? 0: ERROR_CUDNN;
         std::cout<<"TRT   vs correct"; 
-        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TKDNN;
+        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TENSORRT;
         std::cout<<"CUDNN vs TRT    "; 
         ret_cudnn_tensorrt |= checkResult(odim, cudnn_out[i], rt_out[i]) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
     }

tests/yolo3_flir/yolo3_flir.cpp

@@ -92,7 +92,7 @@ int main() {
         std::cout<<"CUDNN vs correct"; 
         ret_cudnn |= checkResult(odim, cudnn_out[i], out) == 0 ? 0: ERROR_CUDNN;
         std::cout<<"TRT   vs correct"; 
-        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TKDNN;
+        ret_tensorrt |= checkResult(odim, rt_out[i], out) == 0 ? 0 : ERROR_TENSORRT;
         std::cout<<"CUDNN vs TRT    "; 
         ret_cudnn_tensorrt |= checkResult(odim, cudnn_out[i], rt_out[i]) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
     }

tests/yolo3_tiny/yolo3_tiny.cpp

@@ -122,7 +122,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo3_tiny512/yolo3_tiny512.cpp

@@ -120,7 +120,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo3_tiny512tp/yolo3_tiny512tp.cpp

@@ -119,7 +119,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo3_tinyNM512/yolo3_tinyNM512.cpp

@@ -119,7 +119,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo_224/yolo_224.cpp

@@ -148,7 +148,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo_berkeley/yolo_berkeley.cpp

@@ -148,7 +148,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo_relu/yolo_relu.cpp

@@ -147,7 +147,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo_tiny/yolo_tiny.cpp

@@ -92,7 +92,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;
 

tests/yolo_voc/yolo_voc.cpp

@@ -141,7 +141,7 @@ int main() {
     std::cout<<"CUDNN vs correct"; 
     int ret_cudnn = checkResult(out_dim, out_data, out) == 0 ? 0: ERROR_CUDNN;
     std::cout<<"TRT   vs correct"; 
-    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TKDNN;
+    int ret_tensorrt = checkResult(out_dim, out_data2, out) == 0 ? 0 : ERROR_TENSORRT;
     std::cout<<"CUDNN vs TRT    "; 
     int ret_cudnn_tensorrt = checkResult(out_dim, out_data, out_data2) == 0 ? 0 : ERROR_CUDNNvsTENSORRT;