Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
d2542306
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看板
提交
d2542306
编写于
6月 15, 2019
作者:
N
nhzlx
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
3. change LOG(INFO) to VLOG(n)
test=develop
上级
11a2a2a1
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
9 addition
and
13 deletion
+9
-13
paddle/fluid/lite/core/mir/fusion/conv_elementwise_add_relu_fuser.cc
...d/lite/core/mir/fusion/conv_elementwise_add_relu_fuser.cc
+0
-1
paddle/fluid/lite/core/mir/generate_program_pass.cc
paddle/fluid/lite/core/mir/generate_program_pass.cc
+1
-1
paddle/fluid/lite/core/mir/passes.h
paddle/fluid/lite/core/mir/passes.h
+2
-2
paddle/fluid/lite/core/mir/pattern_matcher_high_api.cc
paddle/fluid/lite/core/mir/pattern_matcher_high_api.cc
+2
-5
paddle/fluid/lite/core/op_lite.h
paddle/fluid/lite/core/op_lite.h
+1
-1
paddle/fluid/lite/core/program.h
paddle/fluid/lite/core/program.h
+1
-1
paddle/fluid/lite/model_parser/model_parser.cc
paddle/fluid/lite/model_parser/model_parser.cc
+2
-2
未找到文件。
paddle/fluid/lite/core/mir/fusion/conv_elementwise_add_relu_fuser.cc
浏览文件 @
d2542306
...
...
@@ -87,7 +87,6 @@ cpp::OpDesc ConvElementwiseAddReLUFuser::GenOpDesc(const key2nodes_t& matched) {
op_desc
.
SetOutput
(
"Output"
,
{
matched
.
at
(
"output"
)
->
arg
()
->
name
});
// Other inputs. See operators/conv_op.h
std
::
vector
<
std
::
string
>
input_arg_names
=
desc
->
InputArgumentNames
();
for
(
auto
name
:
input_arg_names
)
LOG
(
INFO
)
<<
name
;
if
(
std
::
find
(
input_arg_names
.
begin
(),
input_arg_names
.
end
(),
"ResidualData"
)
!=
input_arg_names
.
end
())
{
...
...
paddle/fluid/lite/core/mir/generate_program_pass.cc
浏览文件 @
d2542306
...
...
@@ -28,7 +28,7 @@ void GenerateProgramPass::Apply(const std::unique_ptr<SSAGraph>& graph) {
for
(
auto
&
item
:
graph
->
StmtTopologicalOrder
())
{
if
(
item
->
IsStmt
())
{
auto
&
stmt
=
item
->
AsStmt
();
LOG
(
INFO
)
<<
stmt
;
VLOG
(
4
)
<<
stmt
;
insts_
.
emplace_back
(
stmt
.
op
,
std
::
move
(
stmt
.
valid_kernels
.
front
()));
}
}
...
...
paddle/fluid/lite/core/mir/passes.h
浏览文件 @
d2542306
...
...
@@ -23,8 +23,6 @@ namespace mir {} // namespace mir
#ifndef LITE_WITH_LIGHT_WEIGHT_FRAMEWORK
USE_MIR_PASS
(
demo
);
USE_MIR_PASS
(
lite_fc_fuse_pass
);
USE_MIR_PASS
(
lite_conv_elementwise_add_act_fuse_pass
);
USE_MIR_PASS
(
static_kernel_pick_pass
);
USE_MIR_PASS
(
variable_place_inference_pass
);
USE_MIR_PASS
(
type_target_transform_pass
);
...
...
@@ -35,3 +33,5 @@ USE_MIR_PASS(argument_type_display_pass);
USE_MIR_PASS
(
runtime_context_assign_pass
);
USE_MIR_PASS
(
lite_conv_bn_fuse_pass
);
USE_MIR_PASS
(
graph_visualze
);
USE_MIR_PASS
(
lite_fc_fuse_pass
);
USE_MIR_PASS
(
lite_conv_elementwise_add_act_fuse_pass
);
paddle/fluid/lite/core/mir/pattern_matcher_high_api.cc
浏览文件 @
d2542306
...
...
@@ -20,7 +20,7 @@ namespace lite {
namespace
mir
{
void
FuseBase
::
PerformPatternMatcher
(
SSAGraph
*
graph
)
{
LOG
(
INFO
)
<<
"
\n
"
<<
matcher_
.
pattern
().
DotString
();
VLOG
(
4
)
<<
"
\n
"
<<
matcher_
.
pattern
().
DotString
();
// Get subgraphs and record the mir::Node pointers for each PMNode.
auto
handler
=
[
&
](
const
PatternMatcher
::
subgraph_t
&
subgraph
,
SSAGraph
*
g
)
{
// get all the reigistered nodes.
...
...
@@ -41,17 +41,14 @@ void FuseBase::DeleteInterNodes(SSAGraph *graph) {
}
}
LOG
(
INFO
)
<<
"keys.size "
<<
keys
.
size
();
std
::
unordered_set
<
const
Node
*>
nodes2rm
;
for
(
auto
&
matched
:
key2nodes_
)
{
LOG
(
INFO
)
<<
"get matched "
<<
matched
.
size
();
for
(
const
auto
&
key
:
keys
)
{
nodes2rm
.
insert
(
matched
.
at
(
key
));
}
}
LOG
(
INFO
)
<<
"clean nodes "
<<
nodes2rm
.
size
();
VLOG
(
3
)
<<
"clean nodes "
<<
nodes2rm
.
size
();
GraphSafeRemoveNodes
(
graph
,
nodes2rm
);
}
...
...
paddle/fluid/lite/core/op_lite.h
浏览文件 @
d2542306
...
...
@@ -59,7 +59,7 @@ class OpLite : public Registry {
}
void
SetValidPlaces
(
const
std
::
vector
<
Place
>
&
places
)
{
LOG
(
INFO
)
<<
"valid places "
<<
valid_places_
.
size
();
VLOG
(
3
)
<<
"valid places "
<<
valid_places_
.
size
();
valid_places_
=
places
;
}
const
std
::
vector
<
Place
>
&
valid_places
()
const
{
return
valid_places_
;
}
...
...
paddle/fluid/lite/core/program.h
浏览文件 @
d2542306
...
...
@@ -140,7 +140,7 @@ class RuntimeProgram {
void
Run
()
{
for
(
auto
&
inst
:
instructions_
)
{
LOG
(
INFO
)
<<
">> Running kernel: "
<<
inst
;
VLOG
(
4
)
<<
">> Running kernel: "
<<
inst
;
inst
.
Run
();
}
}
...
...
paddle/fluid/lite/model_parser/model_parser.cc
浏览文件 @
d2542306
...
...
@@ -91,7 +91,7 @@ void LoadLoDTensor(std::istream &is, Variable *var) {
auto
*
tensor
=
var
->
GetMutable
<
lite
::
Tensor
>
();
uint32_t
version
{};
is
.
read
(
reinterpret_cast
<
char
*>
(
&
version
),
sizeof
(
version
));
LOG
(
INFO
)
<<
"model version "
<<
version
;
VLOG
(
3
)
<<
"model version "
<<
version
;
// Load LoD information
uint64_t
lod_level
{};
...
...
@@ -154,7 +154,7 @@ void LoadModel(const std::string &model_dir, Scope *scope,
continue
;
std
::
string
file_path
=
model_dir
+
"/"
+
var
.
name
();
LOG
(
INFO
)
<<
"reading weight "
<<
var
.
name
();
VLOG
(
4
)
<<
"reading weight "
<<
var
.
name
();
std
::
ifstream
file
(
file_path
);
switch
(
var
.
type
().
type
())
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录