Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
74410ff9
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 2 年 前同步成功
通知
708
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
74410ff9
编写于
9月 01, 2020
作者:
G
Guanghua Yu
提交者:
GitHub
9月 01, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support depoly infer for fcos (#1330)
上级
419671a8
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
29 addition
and
8 deletion
+29
-8
deploy/python/infer.py
deploy/python/infer.py
+29
-8
未找到文件。
deploy/python/infer.py
浏览文件 @
74410ff9
...
@@ -74,7 +74,7 @@ class Resize(object):
...
@@ -74,7 +74,7 @@ class Resize(object):
self
.
arch
=
arch
self
.
arch
=
arch
self
.
use_cv2
=
use_cv2
self
.
use_cv2
=
use_cv2
self
.
interp
=
interp
self
.
interp
=
interp
self
.
scale_set
=
{
'RCNN'
,
'RetinaNet'
}
self
.
scale_set
=
{
'RCNN'
,
'RetinaNet'
,
'FCOS'
}
def
__call__
(
self
,
im
,
im_info
):
def
__call__
(
self
,
im
,
im_info
):
"""
"""
...
@@ -259,7 +259,7 @@ def create_inputs(im, im_info, model_arch='YOLO'):
...
@@ -259,7 +259,7 @@ def create_inputs(im, im_info, model_arch='YOLO'):
scale
=
scale_x
scale
=
scale_x
im_info
=
np
.
array
([
resize_shape
+
[
scale
]]).
astype
(
'float32'
)
im_info
=
np
.
array
([
resize_shape
+
[
scale
]]).
astype
(
'float32'
)
inputs
[
'im_info'
]
=
im_info
inputs
[
'im_info'
]
=
im_info
elif
'RCNN'
in
model_arch
:
elif
(
'RCNN'
in
model_arch
)
or
(
'FCOS'
in
model_arch
)
:
scale
=
scale_x
scale
=
scale_x
im_info
=
np
.
array
([
resize_shape
+
[
scale
]]).
astype
(
'float32'
)
im_info
=
np
.
array
([
resize_shape
+
[
scale
]]).
astype
(
'float32'
)
im_shape
=
np
.
array
([
origin_shape
+
[
1.
]]).
astype
(
'float32'
)
im_shape
=
np
.
array
([
origin_shape
+
[
1.
]]).
astype
(
'float32'
)
...
@@ -276,7 +276,15 @@ class Config():
...
@@ -276,7 +276,15 @@ class Config():
Args:
Args:
model_dir (str): root path of model.yml
model_dir (str): root path of model.yml
"""
"""
support_models
=
[
'YOLO'
,
'SSD'
,
'RetinaNet'
,
'RCNN'
,
'Face'
,
'TTF'
]
support_models
=
[
'YOLO'
,
'SSD'
,
'RetinaNet'
,
'RCNN'
,
'Face'
,
'TTF'
,
'FCOS'
,
]
def
__init__
(
self
,
model_dir
):
def
__init__
(
self
,
model_dir
):
# parsing Yaml config for Preprocess
# parsing Yaml config for Preprocess
...
@@ -566,15 +574,19 @@ def predict_image():
...
@@ -566,15 +574,19 @@ def predict_image():
output_dir
=
FLAGS
.
output_dir
)
output_dir
=
FLAGS
.
output_dir
)
def
predict_video
():
def
predict_video
(
camera_id
):
detector
=
Detector
(
detector
=
Detector
(
FLAGS
.
model_dir
,
use_gpu
=
FLAGS
.
use_gpu
,
run_mode
=
FLAGS
.
run_mode
)
FLAGS
.
model_dir
,
use_gpu
=
FLAGS
.
use_gpu
,
run_mode
=
FLAGS
.
run_mode
)
if
camera_id
!=
-
1
:
capture
=
cv2
.
VideoCapture
(
camera_id
)
video_name
=
'output.mp4'
else
:
capture
=
cv2
.
VideoCapture
(
FLAGS
.
video_file
)
capture
=
cv2
.
VideoCapture
(
FLAGS
.
video_file
)
video_name
=
os
.
path
.
split
(
FLAGS
.
video_file
)[
-
1
]
fps
=
30
fps
=
30
width
=
int
(
capture
.
get
(
cv2
.
CAP_PROP_FRAME_WIDTH
))
width
=
int
(
capture
.
get
(
cv2
.
CAP_PROP_FRAME_WIDTH
))
height
=
int
(
capture
.
get
(
cv2
.
CAP_PROP_FRAME_HEIGHT
))
height
=
int
(
capture
.
get
(
cv2
.
CAP_PROP_FRAME_HEIGHT
))
fourcc
=
cv2
.
VideoWriter_fourcc
(
*
'mp4v'
)
fourcc
=
cv2
.
VideoWriter_fourcc
(
*
'mp4v'
)
video_name
=
os
.
path
.
split
(
FLAGS
.
video_file
)[
-
1
]
if
not
os
.
path
.
exists
(
FLAGS
.
output_dir
):
if
not
os
.
path
.
exists
(
FLAGS
.
output_dir
):
os
.
makedirs
(
FLAGS
.
output_dir
)
os
.
makedirs
(
FLAGS
.
output_dir
)
out_path
=
os
.
path
.
join
(
FLAGS
.
output_dir
,
video_name
)
out_path
=
os
.
path
.
join
(
FLAGS
.
output_dir
,
video_name
)
...
@@ -594,6 +606,10 @@ def predict_video():
...
@@ -594,6 +606,10 @@ def predict_video():
mask_resolution
=
detector
.
config
.
mask_resolution
)
mask_resolution
=
detector
.
config
.
mask_resolution
)
im
=
np
.
array
(
im
)
im
=
np
.
array
(
im
)
writer
.
write
(
im
)
writer
.
write
(
im
)
if
camera_id
!=
-
1
:
cv2
.
imshow
(
'Mask Detection'
,
im
)
if
cv2
.
waitKey
(
1
)
&
0xFF
==
ord
(
'q'
):
break
writer
.
release
()
writer
.
release
()
...
@@ -617,6 +633,11 @@ if __name__ == '__main__':
...
@@ -617,6 +633,11 @@ if __name__ == '__main__':
"--image_file"
,
type
=
str
,
default
=
''
,
help
=
"Path of image file."
)
"--image_file"
,
type
=
str
,
default
=
''
,
help
=
"Path of image file."
)
parser
.
add_argument
(
parser
.
add_argument
(
"--video_file"
,
type
=
str
,
default
=
''
,
help
=
"Path of video file."
)
"--video_file"
,
type
=
str
,
default
=
''
,
help
=
"Path of video file."
)
parser
.
add_argument
(
"--camera_id"
,
type
=
int
,
default
=-
1
,
help
=
"device id of camera to predict."
)
parser
.
add_argument
(
parser
.
add_argument
(
"--run_mode"
,
"--run_mode"
,
type
=
str
,
type
=
str
,
...
@@ -647,5 +668,5 @@ if __name__ == '__main__':
...
@@ -647,5 +668,5 @@ if __name__ == '__main__':
assert
"Cannot predict image and video at the same time"
assert
"Cannot predict image and video at the same time"
if
FLAGS
.
image_file
!=
''
:
if
FLAGS
.
image_file
!=
''
:
predict_image
()
predict_image
()
if
FLAGS
.
video_file
!=
''
:
if
FLAGS
.
video_file
!=
''
or
FLAGS
.
camera_id
!=
-
1
:
predict_video
()
predict_video
(
FLAGS
.
camera_id
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录