Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
a6f5ceee
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
a6f5ceee
编写于
1月 08, 2019
作者:
P
peizhilin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add the python callstack for debug support test=develop
上级
6ca9a481
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
133 addition
and
2 deletion
+133
-2
paddle/fluid/framework/op_proto_maker.cc
paddle/fluid/framework/op_proto_maker.cc
+4
-0
paddle/fluid/framework/op_proto_maker.h
paddle/fluid/framework/op_proto_maker.h
+1
-0
paddle/fluid/framework/operator.cc
paddle/fluid/framework/operator.cc
+20
-0
paddle/fluid/framework/operator.h
paddle/fluid/framework/operator.h
+4
-0
paddle/fluid/platform/CMakeLists.txt
paddle/fluid/platform/CMakeLists.txt
+4
-2
paddle/fluid/platform/debug_support.cc
paddle/fluid/platform/debug_support.cc
+33
-0
paddle/fluid/platform/debug_support.h
paddle/fluid/platform/debug_support.h
+57
-0
paddle/fluid/platform/enforce.h
paddle/fluid/platform/enforce.h
+2
-0
paddle/fluid/pybind/const_value.cc
paddle/fluid/pybind/const_value.cc
+3
-0
python/paddle/fluid/framework.py
python/paddle/fluid/framework.py
+5
-0
未找到文件。
paddle/fluid/framework/op_proto_maker.cc
浏览文件 @
a6f5ceee
...
@@ -82,6 +82,10 @@ void OpProtoAndCheckerMaker::operator()(proto::OpProto* proto,
...
@@ -82,6 +82,10 @@ void OpProtoAndCheckerMaker::operator()(proto::OpProto* proto,
AddAttr
<
std
::
string
>
(
OpNamescopeAttrName
(),
"Operator name with namesope."
)
AddAttr
<
std
::
string
>
(
OpNamescopeAttrName
(),
"Operator name with namesope."
)
.
SetDefault
(
""
);
.
SetDefault
(
""
);
AddAttr
<
std
::
vector
<
std
::
string
>>
(
OpCreationCallstackAttrName
(),
"Callstack for Op Creatation."
)
.
SetDefault
({});
Validate
();
Validate
();
}
}
...
...
paddle/fluid/framework/op_proto_maker.h
浏览文件 @
a6f5ceee
...
@@ -47,6 +47,7 @@ class OpProtoAndCheckerMaker {
...
@@ -47,6 +47,7 @@ class OpProtoAndCheckerMaker {
static
const
char
*
OpRoleAttrName
()
{
return
"op_role"
;
}
static
const
char
*
OpRoleAttrName
()
{
return
"op_role"
;
}
static
const
char
*
OpRoleVarAttrName
()
{
return
"op_role_var"
;
}
static
const
char
*
OpRoleVarAttrName
()
{
return
"op_role_var"
;
}
static
const
char
*
OpNamescopeAttrName
()
{
return
"op_namescope"
;
}
static
const
char
*
OpNamescopeAttrName
()
{
return
"op_namescope"
;
}
static
const
char
*
OpCreationCallstackAttrName
()
{
return
"op_callstack"
;
}
void
operator
()(
proto
::
OpProto
*
proto
,
OpAttrChecker
*
attr_checker
);
void
operator
()(
proto
::
OpProto
*
proto
,
OpAttrChecker
*
attr_checker
);
...
...
paddle/fluid/framework/operator.cc
浏览文件 @
a6f5ceee
...
@@ -19,10 +19,12 @@ limitations under the License. */
...
@@ -19,10 +19,12 @@ limitations under the License. */
#include "paddle/fluid/framework/data_transform.h"
#include "paddle/fluid/framework/data_transform.h"
#include "paddle/fluid/framework/executor.h"
#include "paddle/fluid/framework/executor.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/op_proto_maker.h"
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/framework/shape_inference.h"
#include "paddle/fluid/framework/shape_inference.h"
#include "paddle/fluid/framework/transfer_scope_cache.h"
#include "paddle/fluid/framework/transfer_scope_cache.h"
#include "paddle/fluid/framework/var_type.h"
#include "paddle/fluid/framework/var_type.h"
#include "paddle/fluid/platform/debug_support.h"
#include "paddle/fluid/platform/profiler.h"
#include "paddle/fluid/platform/profiler.h"
DECLARE_bool
(
benchmark
);
DECLARE_bool
(
benchmark
);
...
@@ -155,7 +157,18 @@ RuntimeContext::RuntimeContext(const VariableNameMap& innames,
...
@@ -155,7 +157,18 @@ RuntimeContext::RuntimeContext(const VariableNameMap& innames,
}
}
}
}
void
OperatorBase
::
PreHook
()
{
auto
attrName
=
OpProtoAndCheckerMaker
::
OpCreationCallstackAttrName
();
if
(
HasAttr
(
attrName
))
{
auto
&
callstack
=
Attr
<
std
::
vector
<
std
::
string
>>
(
attrName
);
platform
::
PythonDebugSupport
::
GetInstance
()
->
SetInformation
(
callstack
);
}
}
void
OperatorBase
::
Run
(
const
Scope
&
scope
,
const
platform
::
Place
&
place
)
{
void
OperatorBase
::
Run
(
const
Scope
&
scope
,
const
platform
::
Place
&
place
)
{
VLOG
(
4
)
<<
"Call the prehook ... "
;
PreHook
();
VLOG
(
4
)
<<
place
<<
" "
<<
DebugStringEx
(
&
scope
);
VLOG
(
4
)
<<
place
<<
" "
<<
DebugStringEx
(
&
scope
);
if
(
platform
::
is_gpu_place
(
place
))
{
if
(
platform
::
is_gpu_place
(
place
))
{
#ifndef PADDLE_WITH_CUDA
#ifndef PADDLE_WITH_CUDA
...
@@ -177,6 +190,13 @@ void OperatorBase::Run(const Scope& scope, const platform::Place& place) {
...
@@ -177,6 +190,13 @@ void OperatorBase::Run(const Scope& scope, const platform::Place& place) {
RunImpl
(
scope
,
place
);
RunImpl
(
scope
,
place
);
}
}
VLOG
(
3
)
<<
place
<<
" "
<<
DebugStringEx
(
&
scope
);
VLOG
(
3
)
<<
place
<<
" "
<<
DebugStringEx
(
&
scope
);
VLOG
(
4
)
<<
"Call the posthook ... "
;
PostHook
();
}
void
OperatorBase
::
PostHook
()
{
// do nothing here
}
}
bool
OperatorBase
::
HasInputs
(
const
std
::
string
&
name
)
const
{
bool
OperatorBase
::
HasInputs
(
const
std
::
string
&
name
)
const
{
...
...
paddle/fluid/framework/operator.h
浏览文件 @
a6f5ceee
...
@@ -160,6 +160,10 @@ class OperatorBase {
...
@@ -160,6 +160,10 @@ class OperatorBase {
const
platform
::
Place
&
place
,
const
platform
::
Place
&
place
,
const
RuntimeContext
&
ctx
)
const
{}
const
RuntimeContext
&
ctx
)
const
{}
// Add the hooks
virtual
void
PreHook
();
virtual
void
PostHook
();
protected:
protected:
std
::
string
type_
;
std
::
string
type_
;
// NOTE: in case of OpGrad, inputs_ contains:
// NOTE: in case of OpGrad, inputs_ contains:
...
...
paddle/fluid/platform/CMakeLists.txt
浏览文件 @
a6f5ceee
...
@@ -20,10 +20,12 @@ add_custom_command(TARGET profiler_py_proto POST_BUILD
...
@@ -20,10 +20,12 @@ add_custom_command(TARGET profiler_py_proto POST_BUILD
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
endif
(
NOT WIN32
)
endif
(
NOT WIN32
)
cc_library
(
debug_support SRCS debug_support.cc
)
if
(
WITH_GPU
)
if
(
WITH_GPU
)
nv_library
(
enforce SRCS enforce.cc
)
nv_library
(
enforce SRCS enforce.cc
DEPS debug_support
)
else
()
else
()
cc_library
(
enforce SRCS enforce.cc
)
cc_library
(
enforce SRCS enforce.cc
DEPS debug_support
)
endif
()
endif
()
cc_test
(
enforce_test SRCS enforce_test.cc DEPS stringpiece enforce
)
cc_test
(
enforce_test SRCS enforce_test.cc DEPS stringpiece enforce
)
...
...
paddle/fluid/platform/debug_support.cc
0 → 100644
浏览文件 @
a6f5ceee
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include <sstream>
#include "paddle/fluid/platform/debug_support.h"
namespace
paddle
{
namespace
platform
{
template
<
>
std
::
string
PythonDebugSupport
::
Format
()
const
{
std
::
ostringstream
sout
;
sout
<<
"
\n
Python Callstacks:
\n
"
;
for
(
auto
&
line
:
info
)
{
sout
<<
line
;
}
return
sout
.
str
();
}
}
// namespace platform
}
// namespace paddle
paddle/fluid/platform/debug_support.h
0 → 100644
浏览文件 @
a6f5ceee
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#pragma once
#include <exception>
#include <iostream>
#include <map>
#include <mutex>
#include <string>
#include <thread>
#include <vector>
namespace
paddle
{
namespace
platform
{
template
<
typename
T
>
class
DebugSupport
{
public:
// Returns the singleton of DebugSupport.
static
DebugSupport
*
GetInstance
()
{
static
std
::
unique_ptr
<
DebugSupport
>
debugSupport_
(
nullptr
);
static
std
::
once_flag
init_flag_
;
std
::
call_once
(
init_flag_
,
[
&
]()
{
debugSupport_
.
reset
(
new
DebugSupport
<
T
>
());
});
return
debugSupport_
.
get
();
}
T
GetInformation
()
const
{
return
info
;
}
void
SetInformation
(
const
T
&
v
)
{
info
=
v
;
}
std
::
string
Format
()
const
;
private:
T
info
;
};
using
PythonDebugSupport
=
DebugSupport
<
std
::
vector
<
std
::
string
>>
;
template
<
>
std
::
string
PythonDebugSupport
::
Format
()
const
;
}
// namespace platform
}
// namespace paddle
paddle/fluid/platform/enforce.h
浏览文件 @
a6f5ceee
...
@@ -33,6 +33,7 @@ limitations under the License. */
...
@@ -33,6 +33,7 @@ limitations under the License. */
#include <string>
#include <string>
#include "glog/logging.h"
#include "glog/logging.h"
#include "paddle/fluid/platform/debug_support.h"
#include "paddle/fluid/platform/macros.h"
#include "paddle/fluid/platform/macros.h"
#include "paddle/fluid/platform/port.h"
#include "paddle/fluid/platform/port.h"
#include "paddle/fluid/string/printf.h"
#include "paddle/fluid/string/printf.h"
...
@@ -68,6 +69,7 @@ struct EnforceNotMet : public std::exception {
...
@@ -68,6 +69,7 @@ struct EnforceNotMet : public std::exception {
std
::
rethrow_exception
(
e
);
std
::
rethrow_exception
(
e
);
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
Init
(
e
.
what
(),
f
,
l
);
Init
(
e
.
what
(),
f
,
l
);
err_str_
+=
platform
::
PythonDebugSupport
::
GetInstance
()
->
Format
();
}
}
}
}
...
...
paddle/fluid/pybind/const_value.cc
浏览文件 @
a6f5ceee
...
@@ -49,6 +49,9 @@ void BindConstValue(pybind11::module* m) {
...
@@ -49,6 +49,9 @@ void BindConstValue(pybind11::module* m) {
op_proto_and_checker_maker
.
def
(
op_proto_and_checker_maker
.
def
(
"kOpNameScopeAttrName"
,
"kOpNameScopeAttrName"
,
framework
::
OpProtoAndCheckerMaker
::
OpNamescopeAttrName
);
framework
::
OpProtoAndCheckerMaker
::
OpNamescopeAttrName
);
op_proto_and_checker_maker
.
def
(
"kOpCreationCallstackAttrName"
,
framework
::
OpProtoAndCheckerMaker
::
OpCreationCallstackAttrName
);
}
}
}
// namespace pybind
}
// namespace pybind
...
...
python/paddle/fluid/framework.py
浏览文件 @
a6f5ceee
...
@@ -19,6 +19,7 @@ from collections import defaultdict
...
@@ -19,6 +19,7 @@ from collections import defaultdict
import
contextlib
import
contextlib
import
os
import
os
import
re
import
re
import
traceback
import
six
import
six
import
numpy
as
np
import
numpy
as
np
...
@@ -626,6 +627,10 @@ class Operator(object):
...
@@ -626,6 +627,10 @@ class Operator(object):
if
role_var_name
in
op_attrs
and
len
(
op_attrs
[
role_var_name
])
==
0
:
if
role_var_name
in
op_attrs
and
len
(
op_attrs
[
role_var_name
])
==
0
:
del
op_attrs
[
role_var_name
]
del
op_attrs
[
role_var_name
]
callstack_var_name
=
op_maker
.
kOpCreationCallstackAttrName
()
op_attrs
[
callstack_var_name
]
=
list
(
reversed
(
traceback
.
format_stack
()))[
1
:]
if
len
(
self
.
desc
.
type
())
!=
0
:
if
len
(
self
.
desc
.
type
())
!=
0
:
return
return
if
type
is
None
:
if
type
is
None
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录