Skip to content

O
opencv
Commit a5d0c7b0 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #16650 from ashishkrshrivastava:cvdarknet

parents 53a853c3 2b96a485
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/dnn/src/darknet/darknet_io.cpp
View file @ a5d0c7b0
...@@ -556,7 +556,7 @@ namespace cv { ...@@ -556,7 +556,7 @@ namespace cv {
const size_t layer_type_size = line.find("]") - 1; const size_t layer_type_size = line.find("]") - 1;
CV_Assert(layer_type_size < line.size()); CV_Assert(layer_type_size < line.size());
std::string layer_type = line.substr(1, layer_type_size); std::string layer_type = line.substr(1, layer_type_size);
net->layers_cfg[layers_counter]["type"] = layer_type; net->layers_cfg[layers_counter]["layer_type"] = layer_type;
} }
break; break;
default: default:
...@@ -599,7 +599,7 @@ namespace cv { ...@@ -599,7 +599,7 @@ namespace cv {
for (it_type i = net->layers_cfg.begin(); i != net->layers_cfg.end(); ++i) { for (it_type i = net->layers_cfg.begin(); i != net->layers_cfg.end(); ++i) {
++layers_counter; ++layers_counter;
std::map<std::string, std::string> &layer_params = i->second; std::map<std::string, std::string> &layer_params = i->second;
std::string layer_type = layer_params["type"]; std::string layer_type = layer_params["layer_type"];
if (layer_type == "convolutional") if (layer_type == "convolutional")
{ {
...@@ -682,7 +682,7 @@ namespace cv { ...@@ -682,7 +682,7 @@ namespace cv {
else else
setParams.setConcat(layers_vec.size(), layers_vec.data()); setParams.setConcat(layers_vec.size(), layers_vec.data());
} }
else if (layer_type == "dropout") else if (layer_type == "dropout" || layer_type == "cost")
{ {
setParams.setIdentity(layers_counter-1); setParams.setIdentity(layers_counter-1);
} }
...@@ -806,7 +806,7 @@ namespace cv { ...@@ -806,7 +806,7 @@ namespace cv {
++darknet_layers_counter; ++darknet_layers_counter;
++cv_layers_counter; ++cv_layers_counter;
std::map<std::string, std::string> &layer_params = i->second; std::map<std::string, std::string> &layer_params = i->second;
std::string layer_type = layer_params["type"]; std::string layer_type = layer_params["layer_type"];
if (layer_type == "convolutional" || layer_type == "connected") if (layer_type == "convolutional" || layer_type == "connected")
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment