projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ca96221
ed10383
)
Merge pull request #9019 from alalek:dnn_trace
author
Maksim Shabunin
<maksim.shabunin@gmail.com>
Thu, 29 Jun 2017 07:33:46 +0000
(07:33 +0000)
committer
Maksim Shabunin
<maksim.shabunin@gmail.com>
Thu, 29 Jun 2017 07:33:46 +0000
(07:33 +0000)
1
2
modules/dnn/src/dnn.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/layers/convolution_layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/layers/detection_output_layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/layers/elementwise_layers.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/layers/permute_layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/layers/prior_box_layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/layers/recurrent_layers.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/layers/softmax_layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/torch/torch_importer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/dnn/src/dnn.cpp
index
4195156
,
5458653
..
83ac03f
---
1
/
modules/dnn/src/dnn.cpp
---
2
/
modules/dnn/src/dnn.cpp
+++ b/
modules/dnn/src/dnn.cpp
@@@
-317,10
-323,12
+323,12
@@@
private
struct LayerData
{
- LayerData() {}
+ LayerData()
: id(-1), flag(0)
{}
LayerData(int _id, const String &_name, const String &_type, LayerParams &_params)
- : id(_id), name(_name), type(_type), params(_params)
+ : id(_id), name(_name), type(_type), params(_params)
, flag(0)
{
+ CV_TRACE_FUNCTION();
+
//add logging info
params.name = name;
params.type = type;
diff --cc
modules/dnn/src/layers/convolution_layer.cpp
Simple merge
diff --cc
modules/dnn/src/layers/detection_output_layer.cpp
Simple merge
diff --cc
modules/dnn/src/layers/elementwise_layers.cpp
Simple merge
diff --cc
modules/dnn/src/layers/permute_layer.cpp
Simple merge
diff --cc
modules/dnn/src/layers/prior_box_layer.cpp
Simple merge
diff --cc
modules/dnn/src/layers/recurrent_layers.cpp
Simple merge
diff --cc
modules/dnn/src/layers/softmax_layer.cpp
Simple merge
diff --cc
modules/dnn/src/torch/torch_importer.cpp
Simple merge