Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
models
提交
c3ae8396
M
models
项目概览
PaddlePaddle
/
models
1 年多 前同步成功
通知
222
Star
6828
Fork
2962
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
602
列表
看板
标记
里程碑
合并请求
255
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
models
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
602
Issue
602
列表
看板
标记
里程碑
合并请求
255
合并请求
255
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
c3ae8396
编写于
1月 02, 2019
作者:
Q
qingqing01
提交者:
GitHub
1月 02, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix bug by using coco dataset. (#1582)
* Fix bug for coco dataset.
上级
13af25f0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
4 deletion
+17
-4
fluid/PaddleCV/object_detection/data_util.py
fluid/PaddleCV/object_detection/data_util.py
+2
-0
fluid/PaddleCV/object_detection/reader.py
fluid/PaddleCV/object_detection/reader.py
+15
-4
未找到文件。
fluid/PaddleCV/object_detection/data_util.py
浏览文件 @
c3ae8396
...
...
@@ -68,6 +68,7 @@ class GeneratorEnqueuer(object):
try
:
task
()
except
Exception
:
traceback
.
print_exc
()
self
.
_stop_event
.
set
()
break
else
:
...
...
@@ -75,6 +76,7 @@ class GeneratorEnqueuer(object):
try
:
task
()
except
Exception
:
traceback
.
print_exc
()
self
.
_stop_event
.
set
()
break
...
...
fluid/PaddleCV/object_detection/reader.py
浏览文件 @
c3ae8396
...
...
@@ -176,10 +176,17 @@ def coco(settings, file_list, mode, batch_size, shuffle):
if
mode
==
'train'
and
shuffle
:
np
.
random
.
shuffle
(
images
)
batch_out
=
[]
if
'2014'
in
file_list
:
sub_dir
=
"train2014"
if
model
==
"train"
else
"val2014"
elif
'2017'
in
file_list
:
sub_dir
=
"train2017"
if
mode
==
"train"
else
"val2017"
data_dir
=
os
.
path
.
join
(
settings
.
data_dir
,
sub_dir
)
for
image
in
images
:
image_name
=
image
[
'file_name'
]
image_path
=
os
.
path
.
join
(
settings
.
data_dir
,
image_name
)
image_path
=
os
.
path
.
join
(
data_dir
,
image_name
)
if
not
os
.
path
.
exists
(
image_path
):
raise
ValueError
(
"%s is not exist, you should specify "
"data path correctly."
%
image_path
)
im
=
Image
.
open
(
image_path
)
if
im
.
mode
==
'L'
:
im
=
im
.
convert
(
'RGB'
)
...
...
@@ -242,7 +249,9 @@ def pascalvoc(settings, file_list, mode, batch_size, shuffle):
image_path
,
label_path
=
image
.
split
()
image_path
=
os
.
path
.
join
(
settings
.
data_dir
,
image_path
)
label_path
=
os
.
path
.
join
(
settings
.
data_dir
,
label_path
)
if
not
os
.
path
.
exists
(
image_path
):
raise
ValueError
(
"%s is not exist, you should specify "
"data path correctly."
%
image_path
)
im
=
Image
.
open
(
image_path
)
if
im
.
mode
==
'L'
:
im
=
im
.
convert
(
'RGB'
)
...
...
@@ -295,7 +304,6 @@ def train(settings,
max_queue
=
24
,
enable_ce
=
False
):
file_list
=
os
.
path
.
join
(
settings
.
data_dir
,
file_list
)
if
'coco'
in
settings
.
dataset
:
generator
=
coco
(
settings
,
file_list
,
"train"
,
batch_size
,
shuffle
)
else
:
...
...
@@ -341,6 +349,9 @@ def test(settings, file_list, batch_size):
def
infer
(
settings
,
image_path
):
def
reader
():
if
not
os
.
path
.
exists
(
image_path
):
raise
ValueError
(
"%s is not exist, you should specify "
"data path correctly."
%
image_path
)
img
=
Image
.
open
(
image_path
)
if
img
.
mode
==
'L'
:
img
=
im
.
convert
(
'RGB'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录