Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
deepinfer
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yangxue
deepinfer
Commits
b55f54e1
Commit
b55f54e1
authored
Jun 30, 2023
by
xin.wang.waytous
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nms-all-class
parent
a558d3eb
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
6 deletions
+8
-6
instance_mask.cpp
src/libs/ios/instance_mask.cpp
+1
-0
multi_post.cpp
src/libs/postprocessors/multi_post.cpp
+1
-1
nms.cpp
src/libs/postprocessors/nms.cpp
+5
-4
nms.h
src/libs/postprocessors/nms.h
+1
-1
multi_res.jpg
test/multi_res.jpg
+0
-0
multi_res_.jpg
test/multi_res_.jpg
+0
-0
multi_test.jpg
test/multi_test.jpg
+0
-0
No files found.
src/libs/ios/instance_mask.cpp
View file @
b55f54e1
...
@@ -145,6 +145,7 @@ void InstanceMask::encode(const cv::Mat& map){
...
@@ -145,6 +145,7 @@ void InstanceMask::encode(const cv::Mat& map){
count
++
;
count
++
;
}
}
}
}
cnts
.
push_back
(
count
);
long
x
;
int
more
;
long
x
;
int
more
;
int
m
=
cnts
.
size
();
int
m
=
cnts
.
size
();
for
(
int
i
=
0
;
i
<
m
;
i
++
)
{
for
(
int
i
=
0
;
i
<
m
;
i
++
)
{
...
...
src/libs/postprocessors/multi_post.cpp
View file @
b55f54e1
...
@@ -132,7 +132,7 @@ bool MultiPostProcess::Exec() {
...
@@ -132,7 +132,7 @@ bool MultiPostProcess::Exec() {
}
}
// NMS
// NMS
LOG_INFO
<<
"before nms:"
<<
dets
->
detections
.
size
();
LOG_INFO
<<
"before nms:"
<<
dets
->
detections
.
size
();
nms_cpu
(
dets
,
scoreThreshold
,
nmsThreshold
,
instanceClassNumber
,
keepTopK
);
nms_cpu
(
dets
,
scoreThreshold
,
nmsThreshold
,
instanceClassNumber
,
keepTopK
,
true
);
LOG_INFO
<<
"after nms:"
<<
dets
->
detections
.
size
();
LOG_INFO
<<
"after nms:"
<<
dets
->
detections
.
size
();
// Instance Mask
// Instance Mask
...
...
src/libs/postprocessors/nms.cpp
View file @
b55f54e1
...
@@ -23,13 +23,14 @@ float iou(float lbox[4], float rbox[4]) {
...
@@ -23,13 +23,14 @@ float iou(float lbox[4], float rbox[4]) {
}
}
void
nms_cpu
(
ios
::
Detection2DsPtr
dets
,
float
conf_thresh
,
float
nms_thresh
,
int
num_classes
,
int
keep_top_k
){
void
nms_cpu
(
ios
::
Detection2DsPtr
dets
,
float
conf_thresh
,
float
nms_thresh
,
int
num_classes
,
int
keep_top_k
,
bool
all_class
){
std
::
vector
<
ios
::
Det2DPtr
>
res
;
std
::
vector
<
ios
::
Det2DPtr
>
res
;
std
::
map
<
int
,
std
::
vector
<
ios
::
Det2DPtr
>>
m
;
std
::
map
<
int
,
std
::
vector
<
ios
::
Det2DPtr
>>
m
;
for
(
auto
det
:
dets
->
detections
)
{
for
(
auto
det
:
dets
->
detections
)
{
if
(
m
.
count
(
det
->
class_label
)
==
0
)
int
label
=
all_class
?
0
:
det
->
class_label
;
m
.
emplace
(
det
->
class_label
,
std
::
vector
<
ios
::
Det2DPtr
>
());
if
(
m
.
count
(
label
)
==
0
)
m
[
det
->
class_label
].
push_back
(
det
);
m
.
emplace
(
label
,
std
::
vector
<
ios
::
Det2DPtr
>
());
m
[
label
].
push_back
(
det
);
}
}
dets
->
detections
.
clear
();
dets
->
detections
.
clear
();
for
(
auto
it
=
m
.
begin
();
it
!=
m
.
end
();
it
++
)
{
for
(
auto
it
=
m
.
begin
();
it
!=
m
.
end
();
it
++
)
{
...
...
src/libs/postprocessors/nms.h
View file @
b55f54e1
...
@@ -21,7 +21,7 @@ float iou(float lbox[4], float rbox[4]);
...
@@ -21,7 +21,7 @@ float iou(float lbox[4], float rbox[4]);
void
nms_cpu
(
ios
::
Detection2DsPtr
dets
,
float
conf_thresh
,
void
nms_cpu
(
ios
::
Detection2DsPtr
dets
,
float
conf_thresh
,
float
nms_thresh
,
int
num_classes
,
int
keep_top_k
=
100
);
float
nms_thresh
,
int
num_classes
,
int
keep_top_k
=
100
,
bool
all_class
=
false
);
...
...
test/multi_res.jpg
View replaced file @
a558d3eb
View file @
b55f54e1
This diff is collapsed.
Click to expand it.
test/multi_res_.jpg
0 → 100644
View file @
b55f54e1
405 KB
test/multi_test.jpg
0 → 100644
View file @
b55f54e1
461 KB
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