Merge branch 'master' of https://github.com/ceccocats/tkDNN into cnet

include/tkDNN/Yolo3Detection.h

@@ -40,6 +40,9 @@ class Yolo3Detection {
         // this is filled with results
         std::vector<tk::dnn::box> detected;
 
+        // keep track of inference times (ms)
+        std::vector<double> stats;
+
         Yolo3Detection() {}
 
         virtual ~Yolo3Detection() {}

include/tkDNN/tkdnn.h

@@ -5,4 +5,4 @@
 #include "Layer.h"
 #include "NetworkRT.h"
 
-#define TKDNN_VERSION 300
+#define TKDNN_VERSION 400