Merge pull request #1127 from arrybn:accuracy_scripts

Author: vpisarev

modules/dnn/CMakeLists.txt

@@ -9,7 +9,7 @@ endif()
 
 set(the_description "Deep neural network module. It allows to load models from different frameworks and to make forward pass")
 
-ocv_add_module(dnn opencv_core opencv_imgproc)
+ocv_add_module(dnn opencv_core opencv_imgproc WRAP python matlab)
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-shadow -Wno-parentheses -Wmaybe-uninitialized -Wsign-promo
                                      -Wmissing-declarations -Wmissing-prototypes
 )

modules/dnn/include/opencv2/dnn/dnn.hpp

@@ -304,6 +304,16 @@ namespace dnn //! This namespace is used for dnn module functionlaity.
       */
     CV_EXPORTS_W Net readNetFromCaffe(const String &prototxt, const String &caffeModel = String());
 
+    /** @brief Reads a network model stored in Tensorflow model file.
+      * @details This is shortcut consisting from createTensorflowImporter and Net::populateNet calls.
+      */
+    CV_EXPORTS_W Net readNetFromTensorflow(const String &model);
+
+    /** @brief Reads a network model stored in Torch model file.
+      * @details This is shortcut consisting from createTorchImporter and Net::populateNet calls.
+      */
+    CV_EXPORTS_W Net readNetFromTorch(const String &model, bool isBinary = true);
+
     /** @brief Creates the importer of <a href="http://www.tensorflow.org">TensorFlow</a> framework network.
      *  @param model   path to the .pb file with binary protobuf description of the network architecture.
      *  @returns Pointer to the created importer, NULL in failure cases.

modules/dnn/misc/python/pyopencv_dnn.hpp

@@ -26,4 +26,10 @@ bool pyopencv_to(PyObject *o, dnn::DictValue &dv, const char *name)
         return false;
 }
 
+template<>
+bool pyopencv_to(PyObject *o, std::vector<Mat> &blobs, const char *name) //required for Layer::blobs RW
+{
+  return pyopencvVecConverter<Mat>::to(o, blobs, ArgInfo(name, false));
+}
+
 #endif

modules/dnn/samples/enet-classes.txt

@@ -0,0 +1,20 @@
+Unlabeled    0   0   0
+Road         128  64 128
+Sidewalk     244  35 232
+Building     70  70  70
+Wall         102 102 156
+Fence        190 153 153
+Pole         153 153 153
+TrafficLight 250 170  30
+TrafficSign  220 220   0
+Vegetation   107 142  35
+Terrain      152 251 152
+Sky          70 130 180
+Person       220  20  60
+Rider        255   0   0
+Car          0   0 142
+Truck        0   0  70
+Bus          0  60 100
+Train        0  80 100
+Motorcycle   0   0 230
+Bicycle      119  11  32

modules/dnn/samples/tf_inception.cpp

@@ -99,7 +99,7 @@ int main(int argc, char **argv)
 
     Mat inputBlob = blobFromImage(img);   //Convert Mat to image batch
     //! [Prepare blob]
-
+    inputBlob -= 117.0;
     //! [Set input blob]
     net.setBlob(inBlobName, inputBlob);        //set the network input
     //! [Set input blob]

modules/dnn/samples/torch_enet.cpp

@@ -26,9 +26,9 @@ const String keys =
         "{o_blob    || output blob's name. If empty, last blob's name in net is used}"
         ;
 
-std::vector<String> readClassNames(const char *filename);
 static void colorizeSegmentation(const Mat &score, Mat &segm,
-                                 Mat &legend, vector<String> &classNames);
+                                 Mat &legend, vector<String> &classNames, vector<Vec3b> &colors);
+static vector<Vec3b> readColors(const String &filename, vector<String>& classNames);
 
 int main(int argc, char **argv)
 {
@@ -52,43 +52,21 @@ int main(int argc, char **argv)
     String classNamesFile = parser.get<String>("c_names");
     String resultFile = parser.get<String>("result");
 
-    //! [Create the importer of TensorFlow model]
-    Ptr<dnn::Importer> importer;
-    try                                     //Try to import TensorFlow AlexNet model
-    {
-        importer = dnn::createTorchImporter(modelFile);
-    }
-    catch (const cv::Exception &err)        //Importer can throw errors, we will catch them
-    {
-        std::cerr << err.msg << std::endl;
-    }
-    //! [Create the importer of Caffe model]
-
-    if (!importer)
-    {
-        std::cerr << "Can't load network by using the mode file: " << std::endl;
-        std::cerr << modelFile << std::endl;
-        exit(-1);
-    }
-
-    //! [Initialize network]
-    dnn::Net net;
-    importer->populateNet(net);
-    importer.release();                     //We don't need importer anymore
-    //! [Initialize network]
+    //! [Read model and initialize network]
+    dnn::Net net = dnn::readNetFromTorch(modelFile);
 
     //! [Prepare blob]
-    Mat img = imread(imageFile, 1);
-
+    Mat img = imread(imageFile), input;
     if (img.empty())
     {
         std::cerr << "Can't read image from the file: " << imageFile << std::endl;
         exit(-1);
     }
 
-    Size inputImgSize(512, 512);
+    Size origSize = img.size();
+    Size inputImgSize = cv::Size(1024, 512);
 
-    if (inputImgSize != img.size())
+    if (inputImgSize != origSize)
         resize(img, img, inputImgSize);       //Resize image to input size
 
     Mat inputBlob = blobFromImage(img, 1./255, true);   //Convert Mat to image batch
@@ -135,20 +113,18 @@ int main(int argc, char **argv)
 
     if (parser.has("show"))
     {
-        size_t nclasses = result.size[1];
         std::vector<String> classNames;
+        vector<cv::Vec3b> colors;
         if(!classNamesFile.empty()) {
-            classNames = readClassNames(classNamesFile.c_str());
-            if (classNames.size() > nclasses)
-                classNames = std::vector<String>(classNames.begin() + classNames.size() - nclasses,
-                                                 classNames.end());
+            colors = readColors(classNamesFile, classNames);
         }
         Mat segm, legend;
-        colorizeSegmentation(result, segm, legend, classNames);
+        colorizeSegmentation(result, segm, legend, classNames, colors);
 
         Mat show;
-        addWeighted(img, 0.2, segm, 0.8, 0.0, show);
+        addWeighted(img, 0.1, segm, 0.9, 0.0, show);
 
+        cv::resize(show, show, origSize, 0, 0, cv::INTER_NEAREST);
         imshow("Result", show);
         if(classNames.size())
             imshow("Legend", legend);
@@ -158,44 +134,16 @@ int main(int argc, char **argv)
     return 0;
 } //main
 
-
-std::vector<String> readClassNames(const char *filename)
-{
-    std::vector<String> classNames;
-
-    std::ifstream fp(filename);
-    if (!fp.is_open())
-    {
-        std::cerr << "File with classes labels not found: " << filename << std::endl;
-        exit(-1);
-    }
-
-    std::string name;
-    while (!fp.eof())
-    {
-        std::getline(fp, name);
-        if (name.length())
-            classNames.push_back(name);
-    }
-
-    fp.close();
-    return classNames;
-}
-
-static void colorizeSegmentation(const Mat &score, Mat &segm, Mat &legend, vector<String> &classNames)
+static void colorizeSegmentation(const Mat &score, Mat &segm, Mat &legend, vector<String> &classNames, vector<Vec3b> &colors)
 {
     const int rows = score.size[2];
     const int cols = score.size[3];
     const int chns = score.size[1];
 
-    vector<Vec3i> colors;
-    RNG rng(12345678);
-
     cv::Mat maxCl(rows, cols, CV_8UC1);
     cv::Mat maxVal(rows, cols, CV_32FC1);
     for (int ch = 0; ch < chns; ch++)
     {
-        colors.push_back(Vec3i(rng.uniform(0, 256), rng.uniform(0, 256), rng.uniform(0, 256)));
         for (int row = 0; row < rows; row++)
         {
             const float *ptrScore = score.ptr<float>(0, ch, row);
@@ -235,3 +183,38 @@ static void colorizeSegmentation(const Mat &score, Mat &segm, Mat &legend, vecto
         }
     }
 }
+
+static vector<Vec3b> readColors(const String &filename, vector<String>& classNames)
+{
+    vector<cv::Vec3b> colors;
+    classNames.clear();
+
+    ifstream fp(filename.c_str());
+    if (!fp.is_open())
+    {
+        cerr << "File with colors not found: " << filename << endl;
+        exit(-1);
+    }
+
+    string line;
+    while (!fp.eof())
+    {
+        getline(fp, line);
+        if (line.length())
+        {
+            stringstream ss(line);
+
+            string name; ss >> name;
+            int temp;
+            cv::Vec3b color;
+            ss >> temp; color[0] = temp;
+            ss >> temp; color[1] = temp;
+            ss >> temp; color[2] = temp;
+            classNames.push_back(name);
+            colors.push_back(color);
+        }
+    }
+
+    fp.close();
+    return colors;
+}

modules/dnn/src/dnn.cpp

@@ -604,7 +604,10 @@ void Net::setBlob(String outputName, const Mat &blob_)
 
     LayerData &ld = impl->layers[pin.lid];
     ld.outputBlobs.resize( std::max(pin.oid+1, (int)ld.requiredOutputs.size()) );
+    MatSize prevShape = ld.outputBlobs[pin.oid].size;
     ld.outputBlobs[pin.oid] = blob_.clone();
+
+    impl->netWasAllocated = prevShape == blob_.size;
 }
 
 Mat Net::getBlob(String outputName)

modules/dnn/src/tensorflow/tf_importer.cpp

@@ -736,6 +736,23 @@ void TFImporter::populateNet(Net dstNet)
 
 } // namespace
 
+Net cv::dnn::readNetFromTensorflow(const String &model)
+{
+    Ptr<Importer> importer;
+    try
+    {
+        importer = createTensorflowImporter(model);
+    }
+    catch(...)
+    {
+    }
+
+    Net net;
+    if (importer)
+        importer->populateNet(net);
+    return net;
+}
+
 Ptr<Importer> cv::dnn::createTensorflowImporter(const String &model)
 {
     return Ptr<Importer>(new TFImporter(model.c_str()));

modules/dnn/src/torch/torch_importer.cpp

@@ -970,6 +970,24 @@ Mat readTorchBlob(const String &filename, bool isBinary)
 
     return importer->tensors.begin()->second;
 }
+
+Net readNetFromTorch(const String &model, bool isBinary)
+{
+    Ptr<Importer> importer;
+    try
+    {
+        importer = createTorchImporter(model, isBinary);
+    }
+    catch(...)
+    {
+    }
+
+    Net net;
+    if (importer)
+        importer->populateNet(net);
+    return net;
+}
+
 #else
 
 Ptr<Importer> createTorchImporter(const String&, bool)