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
67f9406c
Commit
67f9406c
authored
Jan 04, 2018
by
Li Peng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add normalize_bbox layer ocl implementation
Signed-off-by:
Li Peng
<
peng.li@intel.com
>
parent
f99a135e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
0 deletions
+68
-0
normalize_bbox_layer.cpp
modules/dnn/src/layers/normalize_bbox_layer.cpp
+63
-0
test_torch_importer.cpp
modules/dnn/test/test_torch_importer.cpp
+5
-0
No files found.
modules/dnn/src/layers/normalize_bbox_layer.cpp
View file @
67f9406c
...
@@ -69,11 +69,74 @@ public:
...
@@ -69,11 +69,74 @@ public:
return
true
;
return
true
;
}
}
#ifdef HAVE_OPENCL
bool
forward_ocl
(
InputArrayOfArrays
inputs_
,
OutputArrayOfArrays
outputs_
,
OutputArrayOfArrays
internals_
)
{
std
::
vector
<
UMat
>
inputs
;
std
::
vector
<
UMat
>
outputs
;
std
::
vector
<
UMat
>
internals
;
inputs_
.
getUMatVector
(
inputs
);
outputs_
.
getUMatVector
(
outputs
);
internals_
.
getUMatVector
(
internals
);
CV_Assert
(
inputs
.
size
()
==
1
&&
outputs
.
size
()
==
1
);
CV_Assert
(
inputs
[
0
].
total
()
==
outputs
[
0
].
total
());
const
UMat
&
inp0
=
inputs
[
0
];
UMat
&
buffer
=
internals
[
0
];
size_t
num
=
inp0
.
size
[
0
];
size_t
channels
=
inp0
.
size
[
1
];
size_t
channelSize
=
inp0
.
total
()
/
(
num
*
channels
);
for
(
size_t
i
=
0
;
i
<
num
;
++
i
)
{
MatShape
s
=
shape
(
channels
,
channelSize
);
UMat
src
=
inputs
[
i
].
reshape
(
1
,
s
.
size
(),
&
s
[
0
]);
UMat
dst
=
outputs
[
i
].
reshape
(
1
,
s
.
size
(),
&
s
[
0
]);
UMat
abs_mat
;
absdiff
(
src
,
cv
::
Scalar
::
all
(
0
),
abs_mat
);
pow
(
abs_mat
,
pnorm
,
buffer
);
if
(
acrossSpatial
)
{
// add eps to avoid overflow
float
absSum
=
sum
(
buffer
)[
0
]
+
epsilon
;
float
norm
=
pow
(
absSum
,
1.0
f
/
pnorm
);
multiply
(
src
,
1.0
f
/
norm
,
dst
);
}
if
(
!
blobs
.
empty
())
{
// scale the output
Mat
scale
=
blobs
[
0
];
if
(
scale
.
total
()
==
1
)
{
// _scale: 1 x 1
multiply
(
dst
,
scale
.
at
<
float
>
(
0
,
0
),
dst
);
}
else
{
// _scale: _channels x 1
CV_Assert
(
scale
.
total
()
==
channels
);
repeat
(
scale
,
1
,
dst
.
cols
,
buffer
);
multiply
(
dst
,
buffer
,
dst
);
}
}
}
return
true
;
}
#endif
void
forward
(
InputArrayOfArrays
inputs_arr
,
OutputArrayOfArrays
outputs_arr
,
OutputArrayOfArrays
internals_arr
)
void
forward
(
InputArrayOfArrays
inputs_arr
,
OutputArrayOfArrays
outputs_arr
,
OutputArrayOfArrays
internals_arr
)
{
{
CV_TRACE_FUNCTION
();
CV_TRACE_FUNCTION
();
CV_TRACE_ARG_VALUE
(
name
,
"name"
,
name
.
c_str
());
CV_TRACE_ARG_VALUE
(
name
,
"name"
,
name
.
c_str
());
CV_OCL_RUN
((
preferableTarget
==
DNN_TARGET_OPENCL
)
&&
OCL_PERFORMANCE_CHECK
(
ocl
::
Device
::
getDefault
().
isIntel
()),
forward_ocl
(
inputs_arr
,
outputs_arr
,
internals_arr
))
Layer
::
forward_fallback
(
inputs_arr
,
outputs_arr
,
internals_arr
);
Layer
::
forward_fallback
(
inputs_arr
,
outputs_arr
,
internals_arr
);
}
}
...
...
modules/dnn/test/test_torch_importer.cpp
View file @
67f9406c
...
@@ -225,6 +225,11 @@ TEST(Torch_Importer, net_normalize)
...
@@ -225,6 +225,11 @@ TEST(Torch_Importer, net_normalize)
runTorchNet
(
"net_normalize"
,
DNN_TARGET_CPU
,
""
,
false
,
true
);
runTorchNet
(
"net_normalize"
,
DNN_TARGET_CPU
,
""
,
false
,
true
);
}
}
OCL_TEST
(
Torch_Importer
,
net_normalize
)
{
runTorchNet
(
"net_normalize"
,
DNN_TARGET_OPENCL
,
""
,
false
,
true
);
}
TEST
(
Torch_Importer
,
net_padding
)
TEST
(
Torch_Importer
,
net_padding
)
{
{
runTorchNet
(
"net_padding"
,
DNN_TARGET_CPU
,
""
,
false
,
true
);
runTorchNet
(
"net_padding"
,
DNN_TARGET_CPU
,
""
,
false
,
true
);
...
...
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