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
634dd656
Commit
634dd656
authored
Oct 05, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dnn: don't use Mat expressions with async UMat functions
parent
0101fa78
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
dnn.cpp
modules/dnn/src/dnn.cpp
+12
-2
No files found.
modules/dnn/src/dnn.cpp
View file @
634dd656
...
...
@@ -483,6 +483,7 @@ struct DataLayer : public Layer
}
#ifdef HAVE_OPENCL
std
::
vector
<
Mat
>
tmp_expressions
;
bool
forward_ocl
(
InputArrayOfArrays
,
OutputArrayOfArrays
outputs_
,
OutputArrayOfArrays
internals_
)
{
// Supported modes:
...
...
@@ -493,8 +494,11 @@ struct DataLayer : public Layer
std
::
vector
<
UMat
>
outputs
;
outputs_
.
getUMatVector
(
outputs
);
tmp_expressions
.
clear
();
for
(
int
i
=
0
;
i
<
inputsData
.
size
();
++
i
)
{
Mat
inputData
=
inputsData
[
i
];
double
scale
=
scaleFactors
[
i
];
Scalar
&
mean
=
means
[
i
];
...
...
@@ -508,7 +512,10 @@ struct DataLayer : public Layer
if
(
outputs_
.
depth
()
==
CV_16S
)
{
if
(
singleMean
)
convertFp16
(
scale
*
(
inputsData
[
i
]
-
mean
[
0
]),
outputs
[
i
]);
{
tmp_expressions
.
push_back
(
Mat
(
scale
*
(
inputsData
[
i
]
-
mean
[
0
])));
convertFp16
(
tmp_expressions
.
back
(),
outputs
[
i
]);
}
else
{
for
(
int
n
=
0
;
n
<
inputsData
[
i
].
size
[
0
];
++
n
)
...
...
@@ -521,7 +528,8 @@ struct DataLayer : public Layer
plane
[
1
]
=
Range
(
c
,
c
+
1
);
UMat
out
=
outputs
[
i
](
plane
).
reshape
(
1
,
inp
.
dims
,
inp
.
size
);
convertFp16
(
scale
*
(
inp
-
mean
[
c
]),
out
);
tmp_expressions
.
push_back
(
scale
*
(
inp
-
mean
[
c
]));
convertFp16
(
tmp_expressions
.
back
(),
out
);
}
}
}
...
...
@@ -529,7 +537,9 @@ struct DataLayer : public Layer
{
CV_Assert
(
outputs_
.
depth
()
==
CV_32F
);
if
(
singleMean
)
{
inputsData
[
i
].
convertTo
(
outputs
[
i
],
CV_32F
,
scale
,
-
mean
[
0
]
*
scale
);
}
else
{
for
(
int
n
=
0
;
n
<
inputsData
[
i
].
size
[
0
];
++
n
)
...
...
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