Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
b464f689
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
695
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看板
未验证
提交
b464f689
编写于
5月 14, 2020
作者:
G
Guanghua Yu
提交者:
GitHub
5月 14, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix check_version in some script (#670)
上级
e3f1384d
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
16 addition
and
7 deletion
+16
-7
slim/distillation/distill.py
slim/distillation/distill.py
+2
-1
slim/extensions/distill_pruned_model/distill_pruned_model.py
slim/extensions/distill_pruned_model/distill_pruned_model.py
+2
-1
slim/prune/export_model.py
slim/prune/export_model.py
+2
-1
slim/quantization/export_model.py
slim/quantization/export_model.py
+2
-1
slim/sensitive/sensitive.py
slim/sensitive/sensitive.py
+1
-0
tools/export_model.py
tools/export_model.py
+3
-1
tools/export_serving_model.py
tools/export_serving_model.py
+2
-1
tools/face_eval.py
tools/face_eval.py
+2
-1
未找到文件。
slim/distillation/distill.py
浏览文件 @
b464f689
...
@@ -32,7 +32,7 @@ from ppdet.data.reader import create_reader
...
@@ -32,7 +32,7 @@ from ppdet.data.reader import create_reader
from
ppdet.utils.eval_utils
import
parse_fetches
,
eval_results
,
eval_run
from
ppdet.utils.eval_utils
import
parse_fetches
,
eval_results
,
eval_run
from
ppdet.utils.stats
import
TrainingStats
from
ppdet.utils.stats
import
TrainingStats
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.check
import
check_gpu
,
check_config
from
ppdet.utils.check
import
check_gpu
,
check_
version
,
check_
config
import
ppdet.utils.checkpoint
as
checkpoint
import
ppdet.utils.checkpoint
as
checkpoint
import
logging
import
logging
...
@@ -134,6 +134,7 @@ def main():
...
@@ -134,6 +134,7 @@ def main():
check_config
(
cfg
)
check_config
(
cfg
)
# check if set use_gpu=True in paddlepaddle cpu version
# check if set use_gpu=True in paddlepaddle cpu version
check_gpu
(
cfg
.
use_gpu
)
check_gpu
(
cfg
.
use_gpu
)
check_version
()
main_arch
=
cfg
.
architecture
main_arch
=
cfg
.
architecture
...
...
slim/extensions/distill_pruned_model/distill_pruned_model.py
浏览文件 @
b464f689
...
@@ -35,7 +35,7 @@ from ppdet.data.reader import create_reader
...
@@ -35,7 +35,7 @@ from ppdet.data.reader import create_reader
from
ppdet.utils.eval_utils
import
parse_fetches
,
eval_results
,
eval_run
from
ppdet.utils.eval_utils
import
parse_fetches
,
eval_results
,
eval_run
from
ppdet.utils.stats
import
TrainingStats
from
ppdet.utils.stats
import
TrainingStats
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.check
import
check_gpu
,
check_config
from
ppdet.utils.check
import
check_gpu
,
check_
version
,
check_
config
import
ppdet.utils.checkpoint
as
checkpoint
import
ppdet.utils.checkpoint
as
checkpoint
import
logging
import
logging
...
@@ -123,6 +123,7 @@ def main():
...
@@ -123,6 +123,7 @@ def main():
check_config
(
cfg
)
check_config
(
cfg
)
# check if set use_gpu=True in paddlepaddle cpu version
# check if set use_gpu=True in paddlepaddle cpu version
check_gpu
(
cfg
.
use_gpu
)
check_gpu
(
cfg
.
use_gpu
)
check_version
()
main_arch
=
cfg
.
architecture
main_arch
=
cfg
.
architecture
...
...
slim/prune/export_model.py
浏览文件 @
b464f689
...
@@ -27,7 +27,7 @@ from paddle import fluid
...
@@ -27,7 +27,7 @@ from paddle import fluid
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.cli
import
ArgsParser
import
ppdet.utils.checkpoint
as
checkpoint
import
ppdet.utils.checkpoint
as
checkpoint
from
ppdet.utils.check
import
check_config
from
ppdet.utils.check
import
check_config
,
check_version
from
paddleslim.prune
import
Pruner
from
paddleslim.prune
import
Pruner
from
paddleslim.analysis
import
flops
from
paddleslim.analysis
import
flops
...
@@ -82,6 +82,7 @@ def main():
...
@@ -82,6 +82,7 @@ def main():
cfg
=
load_config
(
FLAGS
.
config
)
cfg
=
load_config
(
FLAGS
.
config
)
merge_config
(
FLAGS
.
opt
)
merge_config
(
FLAGS
.
opt
)
check_config
(
cfg
)
check_config
(
cfg
)
check_version
()
main_arch
=
cfg
.
architecture
main_arch
=
cfg
.
architecture
...
...
slim/quantization/export_model.py
浏览文件 @
b464f689
...
@@ -27,7 +27,7 @@ from paddle import fluid
...
@@ -27,7 +27,7 @@ from paddle import fluid
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.cli
import
ArgsParser
import
ppdet.utils.checkpoint
as
checkpoint
import
ppdet.utils.checkpoint
as
checkpoint
from
ppdet.utils.check
import
check_config
from
ppdet.utils.check
import
check_config
,
check_version
from
tools.export_model
import
prune_feed_vars
from
tools.export_model
import
prune_feed_vars
import
logging
import
logging
...
@@ -57,6 +57,7 @@ def main():
...
@@ -57,6 +57,7 @@ def main():
cfg
=
load_config
(
FLAGS
.
config
)
cfg
=
load_config
(
FLAGS
.
config
)
merge_config
(
FLAGS
.
opt
)
merge_config
(
FLAGS
.
opt
)
check_config
(
cfg
)
check_config
(
cfg
)
check_version
()
main_arch
=
cfg
.
architecture
main_arch
=
cfg
.
architecture
...
...
slim/sensitive/sensitive.py
浏览文件 @
b464f689
...
@@ -53,6 +53,7 @@ def main():
...
@@ -53,6 +53,7 @@ def main():
cfg
=
load_config
(
FLAGS
.
config
)
cfg
=
load_config
(
FLAGS
.
config
)
merge_config
(
FLAGS
.
opt
)
merge_config
(
FLAGS
.
opt
)
check_config
(
cfg
)
check_config
(
cfg
)
check_version
()
main_arch
=
cfg
.
architecture
main_arch
=
cfg
.
architecture
...
...
tools/export_model.py
浏览文件 @
b464f689
...
@@ -28,7 +28,7 @@ from paddle import fluid
...
@@ -28,7 +28,7 @@ from paddle import fluid
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.cli
import
ArgsParser
import
ppdet.utils.checkpoint
as
checkpoint
import
ppdet.utils.checkpoint
as
checkpoint
from
ppdet.utils.check
import
check_config
from
ppdet.utils.check
import
check_config
,
check_version
import
yaml
import
yaml
import
logging
import
logging
from
collections
import
OrderedDict
from
collections
import
OrderedDict
...
@@ -176,6 +176,8 @@ def main():
...
@@ -176,6 +176,8 @@ def main():
merge_config
(
FLAGS
.
opt
)
merge_config
(
FLAGS
.
opt
)
check_config
(
cfg
)
check_config
(
cfg
)
check_version
()
main_arch
=
cfg
.
architecture
main_arch
=
cfg
.
architecture
# Use CPU for exporting inference model instead of GPU
# Use CPU for exporting inference model instead of GPU
...
...
tools/export_serving_model.py
浏览文件 @
b464f689
...
@@ -22,7 +22,7 @@ from paddle import fluid
...
@@ -22,7 +22,7 @@ from paddle import fluid
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.check
import
check_config
from
ppdet.utils.check
import
check_config
,
check_version
import
ppdet.utils.checkpoint
as
checkpoint
import
ppdet.utils.checkpoint
as
checkpoint
import
yaml
import
yaml
import
logging
import
logging
...
@@ -58,6 +58,7 @@ def main():
...
@@ -58,6 +58,7 @@ def main():
cfg
=
load_config
(
FLAGS
.
config
)
cfg
=
load_config
(
FLAGS
.
config
)
merge_config
(
FLAGS
.
opt
)
merge_config
(
FLAGS
.
opt
)
check_config
(
cfg
)
check_config
(
cfg
)
check_version
()
main_arch
=
cfg
.
architecture
main_arch
=
cfg
.
architecture
...
...
tools/face_eval.py
浏览文件 @
b464f689
...
@@ -30,7 +30,7 @@ from collections import OrderedDict
...
@@ -30,7 +30,7 @@ from collections import OrderedDict
import
ppdet.utils.checkpoint
as
checkpoint
import
ppdet.utils.checkpoint
as
checkpoint
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.cli
import
ArgsParser
from
ppdet.utils.check
import
check_gpu
,
check_config
from
ppdet.utils.check
import
check_gpu
,
check_
version
,
check_
config
from
ppdet.utils.widerface_eval_utils
import
get_shrink
,
bbox_vote
,
\
from
ppdet.utils.widerface_eval_utils
import
get_shrink
,
bbox_vote
,
\
save_widerface_bboxes
,
save_fddb_bboxes
,
to_chw_bgr
save_widerface_bboxes
,
save_fddb_bboxes
,
to_chw_bgr
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
from
ppdet.core.workspace
import
load_config
,
merge_config
,
create
...
@@ -219,6 +219,7 @@ def main():
...
@@ -219,6 +219,7 @@ def main():
check_config
(
cfg
)
check_config
(
cfg
)
# check if set use_gpu=True in paddlepaddle cpu version
# check if set use_gpu=True in paddlepaddle cpu version
check_gpu
(
cfg
.
use_gpu
)
check_gpu
(
cfg
.
use_gpu
)
check_version
()
main_arch
=
cfg
.
architecture
main_arch
=
cfg
.
architecture
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录