diff --git a/modules/dnn/include/opencv2/dnn/dnn.hpp b/modules/dnn/include/opencv2/dnn/dnn.hpp index f65f503529..68e1994db7 100644 --- a/modules/dnn/include/opencv2/dnn/dnn.hpp +++ b/modules/dnn/include/opencv2/dnn/dnn.hpp @@ -644,6 +644,14 @@ CV__DNN_EXPERIMENTAL_NS_BEGIN */ CV_EXPORTS_W Net readNetFromDarknet(const String &cfgFile, const String &darknetModel = String()); + /** @brief Reads a network model stored in Darknet model files. + * @param cfgFile file node to the .cfg file with text description of the network architecture. + * @param darknetModel file node to the .weights file with learned network. + * @returns Network object that ready to do forward, throw an exception in failure cases. + * @returns Net object. + */ + CV_EXPORTS_W Net readNetFromDarknet(const FileNode &cfgFile, const FileNode &darknetModel = FileNode()); + /** @brief Reads a network model stored in Caffe framework's format. * @param prototxt path to the .prototxt file with text description of the network architecture. * @param caffeModel path to the .caffemodel file with learned network. diff --git a/modules/dnn/src/darknet/darknet_importer.cpp b/modules/dnn/src/darknet/darknet_importer.cpp index 8bd64d099c..17506c2242 100644 --- a/modules/dnn/src/darknet/darknet_importer.cpp +++ b/modules/dnn/src/darknet/darknet_importer.cpp @@ -44,6 +44,7 @@ #include "../precomp.hpp" #include +#include #include #include #include @@ -66,14 +67,19 @@ public: DarknetImporter() {} - DarknetImporter(const char *cfgFile, const char *darknetModel) + DarknetImporter(std::istream &cfgStream, std::istream &darknetModelStream) { CV_TRACE_FUNCTION(); - ReadNetParamsFromCfgFileOrDie(cfgFile, &net); + ReadNetParamsFromCfgStreamOrDie(cfgStream, &net); + ReadNetParamsFromBinaryStreamOrDie(darknetModelStream, &net); + } + + DarknetImporter(std::istream &cfgStream) + { + CV_TRACE_FUNCTION(); - if (darknetModel && darknetModel[0]) - ReadNetParamsFromBinaryFileOrDie(darknetModel, &net); + ReadNetParamsFromCfgStreamOrDie(cfgStream, &net); } struct BlobNote @@ -179,7 +185,38 @@ public: Net readNetFromDarknet(const String &cfgFile, const String &darknetModel /*= String()*/) { - DarknetImporter darknetImporter(cfgFile.c_str(), darknetModel.c_str()); + Net net; + std::ifstream cfgStream(cfgFile.c_str()); + if(!cfgStream.is_open()) { + CV_Error(cv::Error::StsParseError, "Failed to parse NetParameter file: " + std::string(cfgFile)); + return net; + } + DarknetImporter darknetImporter; + if (darknetModel != String()) { + std::ifstream darknetModelStream(darknetModel.c_str()); + if(!darknetModelStream.is_open()){ + CV_Error(cv::Error::StsParseError, "Failed to parse NetParameter file: " + std::string(darknetModel)); + return net; + } + darknetImporter = DarknetImporter(cfgStream, darknetModelStream); + } else { + darknetImporter = DarknetImporter(cfgStream); + } + darknetImporter.populateNet(net); + return net; +} + +Net readNetFromDarknet(const FileNode &cfgFile, const FileNode &darknetModel /*= FileNode()*/) +{ + DarknetImporter darknetImporter; + if(darknetModel.empty()){ + std::istringstream cfgStream((std::string)cfgFile); + darknetImporter = DarknetImporter(cfgStream); + }else{ + std::istringstream cfgStream((std::string)cfgFile); + std::istringstream darknetModelStream((std::string)darknetModel); + darknetImporter = DarknetImporter(cfgStream, darknetModelStream); + } Net net; darknetImporter.populateNet(net); return net; diff --git a/modules/dnn/src/darknet/darknet_io.cpp b/modules/dnn/src/darknet/darknet_io.cpp index 03805dd364..815b84f651 100644 --- a/modules/dnn/src/darknet/darknet_io.cpp +++ b/modules/dnn/src/darknet/darknet_io.cpp @@ -476,68 +476,61 @@ namespace cv { return dst; } - bool ReadDarknetFromCfgFile(const char *cfgFile, NetParameter *net) + bool ReadDarknetFromCfgStream(std::istream &ifile, NetParameter *net) { - std::ifstream ifile; - ifile.open(cfgFile); - if (ifile.is_open()) - { - bool read_net = false; - int layers_counter = -1; - for (std::string line; std::getline(ifile, line);) { - line = escapeString(line); - if (line.empty()) continue; - switch (line[0]) { - case '\0': break; - case '#': break; - case ';': break; - case '[': - if (line == "[net]") { - read_net = true; - } - else { - // read section - read_net = false; - ++layers_counter; - const size_t layer_type_size = line.find("]") - 1; - CV_Assert(layer_type_size < line.size()); - std::string layer_type = line.substr(1, layer_type_size); - net->layers_cfg[layers_counter]["type"] = layer_type; - } - break; - default: - // read entry - const size_t separator_index = line.find('='); - CV_Assert(separator_index < line.size()); - if (separator_index != std::string::npos) { - std::string name = line.substr(0, separator_index); - std::string value = line.substr(separator_index + 1, line.size() - (separator_index + 1)); - name = escapeString(name); - value = escapeString(value); - if (name.empty() || value.empty()) continue; - if (read_net) - net->net_cfg[name] = value; - else - net->layers_cfg[layers_counter][name] = value; - } + bool read_net = false; + int layers_counter = -1; + for (std::string line; std::getline(ifile, line);) { + line = escapeString(line); + if (line.empty()) continue; + switch (line[0]) { + case '\0': break; + case '#': break; + case ';': break; + case '[': + if (line == "[net]") { + read_net = true; + } + else { + // read section + read_net = false; + ++layers_counter; + const size_t layer_type_size = line.find("]") - 1; + CV_Assert(layer_type_size < line.size()); + std::string layer_type = line.substr(1, layer_type_size); + net->layers_cfg[layers_counter]["type"] = layer_type; + } + break; + default: + // read entry + const size_t separator_index = line.find('='); + CV_Assert(separator_index < line.size()); + if (separator_index != std::string::npos) { + std::string name = line.substr(0, separator_index); + std::string value = line.substr(separator_index + 1, line.size() - (separator_index + 1)); + name = escapeString(name); + value = escapeString(value); + if (name.empty() || value.empty()) continue; + if (read_net) + net->net_cfg[name] = value; + else + net->layers_cfg[layers_counter][name] = value; } } - - std::string anchors = net->layers_cfg[net->layers_cfg.size() - 1]["anchors"]; - std::vector vec = getNumbers(anchors); - std::map &net_params = net->net_cfg; - net->width = getParam(net_params, "width", 416); - net->height = getParam(net_params, "height", 416); - net->channels = getParam(net_params, "channels", 3); - CV_Assert(net->width > 0 && net->height > 0 && net->channels > 0); } - else - return false; + + std::string anchors = net->layers_cfg[net->layers_cfg.size() - 1]["anchors"]; + std::vector vec = getNumbers(anchors); + std::map &net_params = net->net_cfg; + net->width = getParam(net_params, "width", 416); + net->height = getParam(net_params, "height", 416); + net->channels = getParam(net_params, "channels", 3); + CV_Assert(net->width > 0 && net->height > 0 && net->channels > 0); int current_channels = net->channels; net->out_channels_vec.resize(net->layers_cfg.size()); - int layers_counter = -1; + layers_counter = -1; setLayersParams setParams(net); @@ -676,13 +669,8 @@ namespace cv { return true; } - - bool ReadDarknetFromWeightsFile(const char *darknetModel, NetParameter *net) + bool ReadDarknetFromWeightsStream(std::istream &ifile, NetParameter *net) { - std::ifstream ifile; - ifile.open(darknetModel, std::ios::binary); - CV_Assert(ifile.is_open()); - int32_t major_ver, minor_ver, revision; ifile.read(reinterpret_cast(&major_ver), sizeof(int32_t)); ifile.read(reinterpret_cast(&minor_ver), sizeof(int32_t)); @@ -778,19 +766,18 @@ namespace cv { } - void ReadNetParamsFromCfgFileOrDie(const char *cfgFile, darknet::NetParameter *net) + void ReadNetParamsFromCfgStreamOrDie(std::istream &ifile, darknet::NetParameter *net) { - if (!darknet::ReadDarknetFromCfgFile(cfgFile, net)) { - CV_Error(cv::Error::StsParseError, "Failed to parse NetParameter file: " + std::string(cfgFile)); + if (!darknet::ReadDarknetFromCfgStream(ifile, net)) { + CV_Error(cv::Error::StsParseError, "Failed to parse NetParameter stream"); } } - void ReadNetParamsFromBinaryFileOrDie(const char *darknetModel, darknet::NetParameter *net) + void ReadNetParamsFromBinaryStreamOrDie(std::istream &ifile, darknet::NetParameter *net) { - if (!darknet::ReadDarknetFromWeightsFile(darknetModel, net)) { - CV_Error(cv::Error::StsParseError, "Failed to parse NetParameter file: " + std::string(darknetModel)); + if (!darknet::ReadDarknetFromWeightsStream(ifile, net)) { + CV_Error(cv::Error::StsParseError, "Failed to parse NetParameter stream"); } } - } } diff --git a/modules/dnn/src/darknet/darknet_io.hpp b/modules/dnn/src/darknet/darknet_io.hpp index 5859f736b6..f783ca7b49 100644 --- a/modules/dnn/src/darknet/darknet_io.hpp +++ b/modules/dnn/src/darknet/darknet_io.hpp @@ -109,10 +109,9 @@ namespace cv { }; } - // Read parameters from a file into a NetParameter message. - void ReadNetParamsFromCfgFileOrDie(const char *cfgFile, darknet::NetParameter *net); - void ReadNetParamsFromBinaryFileOrDie(const char *darknetModel, darknet::NetParameter *net); - + // Read parameters from a stream into a NetParameter message. + void ReadNetParamsFromCfgStreamOrDie(std::istream &ifile, darknet::NetParameter *net); + void ReadNetParamsFromBinaryStreamOrDie(std::istream &ifile, darknet::NetParameter *net); } } #endif diff --git a/modules/dnn/test/test_darknet_importer.cpp b/modules/dnn/test/test_darknet_importer.cpp index 682213b791..c585d40493 100644 --- a/modules/dnn/test/test_darknet_importer.cpp +++ b/modules/dnn/test/test_darknet_importer.cpp @@ -65,6 +65,18 @@ TEST(Test_Darknet, read_yolo_voc) ASSERT_FALSE(net.empty()); } +TEST(Test_Darknet, read_filestorage_yolo_voc) +{ + std::ifstream ifile(_tf("yolo-voc.cfg").c_str()); + std::stringstream buffer; + buffer << " " << ifile.rdbuf(); // FIXME: FileStorage drops first character. + FileStorage ofs(".xml", FileStorage::WRITE | FileStorage::MEMORY); + ofs.write("cfgFile", buffer.str()); + FileStorage ifs(ofs.releaseAndGetString(), FileStorage::READ | FileStorage::MEMORY | FileStorage::FORMAT_XML); + Net net = readNetFromDarknet(ifs["cfgFile"]); + ASSERT_FALSE(net.empty()); +} + class Test_Darknet_layers : public DNNTestLayer { public: