Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
09636673
Commit
09636673
authored
6 years ago
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dnn(build): fix CV_Assert() usage
parent
59ccf2c9
master
4.3.0
4.2.0
4.1.2
4.1.2-openvino
4.1.1
4.1.1-openvino
4.1.0
4.1.0-openvino
4.0.1
4.0.1-openvino
4.0.0
4.0.0-rc
4.0.0-openvino
4.0.0-beta
4.0.0-alpha
3.4.10
3.4.9
3.4.8
3.4.7
3.4.6
3.4.5
3.4.4
3.4.3
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
dnn.cpp
modules/dnn/src/dnn.cpp
+5
-4
prior_box_layer.cpp
modules/dnn/src/layers/prior_box_layer.cpp
+3
-3
No files found.
modules/dnn/src/dnn.cpp
View file @
09636673
...
...
@@ -588,7 +588,8 @@ struct DataLayer : public Layer
lp
.
precision
=
InferenceEngine
::
Precision
::
FP32
;
std
::
shared_ptr
<
InferenceEngine
::
ScaleShiftLayer
>
ieLayer
(
new
InferenceEngine
::
ScaleShiftLayer
(
lp
));
CV_Assert
(
inputsData
.
size
()
==
1
,
inputsData
[
0
].
dims
==
4
);
CV_CheckEQ
(
inputsData
.
size
(),
(
size_t
)
1
,
""
);
CV_CheckEQ
(
inputsData
[
0
].
dims
,
4
,
""
);
const
size_t
numChannels
=
inputsData
[
0
].
size
[
1
];
CV_Assert
(
numChannels
<=
4
);
...
...
@@ -1302,7 +1303,7 @@ struct Net::Impl
if
(
!
node
.
empty
())
{
Ptr
<
InfEngineBackendNode
>
ieNode
=
node
.
dynamicCast
<
InfEngineBackendNode
>
();
CV_Assert
(
!
ieNode
.
empty
()
,
!
ieNode
->
net
.
empty
());
CV_Assert
(
!
ieNode
.
empty
()
);
CV_Assert
(
!
ieNode
->
net
.
empty
());
layerNet
=
ieNode
->
net
;
}
}
...
...
@@ -1316,7 +1317,7 @@ struct Net::Impl
if
(
!
inpNode
.
empty
())
{
Ptr
<
InfEngineBackendNode
>
ieInpNode
=
inpNode
.
dynamicCast
<
InfEngineBackendNode
>
();
CV_Assert
(
!
ieInpNode
.
empty
()
,
!
ieInpNode
->
net
.
empty
());
CV_Assert
(
!
ieInpNode
.
empty
()
);
CV_Assert
(
!
ieInpNode
->
net
.
empty
());
if
(
layerNet
!=
ieInpNode
->
net
)
{
// layerNet is empty or nodes are from different graphs.
...
...
@@ -1425,7 +1426,7 @@ struct Net::Impl
if
(
!
inpNode
.
empty
())
{
Ptr
<
InfEngineBackendNode
>
ieInpNode
=
inpNode
.
dynamicCast
<
InfEngineBackendNode
>
();
CV_Assert
(
!
ieInpNode
.
empty
()
,
!
ieInpNode
->
net
.
empty
());
CV_Assert
(
!
ieInpNode
.
empty
()
);
CV_Assert
(
!
ieInpNode
->
net
.
empty
());
if
(
ieInpNode
->
net
!=
net
)
{
net
=
Ptr
<
InfEngineBackendNet
>
();
...
...
This diff is collapsed.
Click to expand it.
modules/dnn/src/layers/prior_box_layer.cpp
View file @
09636673
...
...
@@ -487,8 +487,8 @@ public:
if
(
_explicitSizes
)
{
CV_Assert
(
!
_boxWidths
.
empty
()
,
!
_boxHeights
.
empty
(),
_boxWidths
.
size
()
==
_boxHeights
.
size
());
CV_Assert
(
!
_boxWidths
.
empty
()
);
CV_Assert
(
!
_boxHeights
.
empty
());
CV_Assert
(
_boxWidths
.
size
()
==
_boxHeights
.
size
());
ieLayer
->
params
[
"width"
]
=
format
(
"%f"
,
_boxWidths
[
0
]);
ieLayer
->
params
[
"height"
]
=
format
(
"%f"
,
_boxHeights
[
0
]);
for
(
int
i
=
1
;
i
<
_boxWidths
.
size
();
++
i
)
...
...
@@ -530,7 +530,7 @@ public:
ieLayer
->
params
[
"step_h"
]
=
format
(
"%f"
,
_stepY
);
ieLayer
->
params
[
"step_w"
]
=
format
(
"%f"
,
_stepX
);
}
CV_
Assert
(
_offsetsX
.
size
()
==
1
,
_offsetsY
.
size
()
==
1
,
_offsetsX
[
0
]
==
_offsetsY
[
0
]
);
CV_
CheckEQ
(
_offsetsX
.
size
(),
(
size_t
)
1
,
""
);
CV_CheckEQ
(
_offsetsY
.
size
(),
(
size_t
)
1
,
""
);
CV_CheckEQ
(
_offsetsX
[
0
],
_offsetsY
[
0
],
""
);
ieLayer
->
params
[
"offset"
]
=
format
(
"%f"
,
_offsetsX
[
0
]);
return
Ptr
<
BackendNode
>
(
new
InfEngineBackendNode
(
ieLayer
));
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment