Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
2f856769
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2f856769
编写于
3月 31, 2018
作者:
F
fengjiayi
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' of
https://github.com/PaddlePaddle/Paddle
into refine_double_buffer_fix
上级
55e4b89f
33b8b3d2
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
67 addition
and
17 deletion
+67
-17
doc/CMakeLists.txt
doc/CMakeLists.txt
+7
-0
doc/fluid/CMakeLists.txt
doc/fluid/CMakeLists.txt
+6
-0
doc/fluid/api/CMakeLists.txt
doc/fluid/api/CMakeLists.txt
+22
-0
doc/fluid/api/data_feeder.rst
doc/fluid/api/data_feeder.rst
+0
-0
doc/fluid/api/evaluator.rst
doc/fluid/api/evaluator.rst
+0
-0
doc/fluid/api/executor.rst
doc/fluid/api/executor.rst
+0
-0
doc/fluid/api/gen_doc.py
doc/fluid/api/gen_doc.py
+0
-0
doc/fluid/api/gen_doc.sh
doc/fluid/api/gen_doc.sh
+0
-0
doc/fluid/api/index_en.rst
doc/fluid/api/index_en.rst
+0
-0
doc/fluid/api/initializer.rst
doc/fluid/api/initializer.rst
+0
-0
doc/fluid/api/io.rst
doc/fluid/api/io.rst
+0
-0
doc/fluid/api/layers.rst
doc/fluid/api/layers.rst
+0
-0
doc/fluid/api/nets.rst
doc/fluid/api/nets.rst
+0
-0
doc/fluid/api/optimizer.rst
doc/fluid/api/optimizer.rst
+0
-0
doc/fluid/api/param_attr.rst
doc/fluid/api/param_attr.rst
+0
-0
doc/fluid/api/profiler.rst
doc/fluid/api/profiler.rst
+0
-0
doc/fluid/api/regularizer.rst
doc/fluid/api/regularizer.rst
+0
-0
doc/v2/CMakeLists.txt
doc/v2/CMakeLists.txt
+6
-2
doc/v2/api/CMakeLists.txt
doc/v2/api/CMakeLists.txt
+3
-1
paddle/fluid/operators/detail/grpc_server.cc
paddle/fluid/operators/detail/grpc_server.cc
+5
-5
paddle/fluid/operators/listen_and_serv_op.cc
paddle/fluid/operators/listen_and_serv_op.cc
+0
-1
paddle/fluid/operators/lrn_op.cc
paddle/fluid/operators/lrn_op.cc
+4
-1
paddle/fluid/operators/lrn_op.h
paddle/fluid/operators/lrn_op.h
+4
-0
paddle/fluid/operators/send_recv_op_test.cc
paddle/fluid/operators/send_recv_op_test.cc
+2
-1
paddle/fluid/platform/profiler_test.cc
paddle/fluid/platform/profiler_test.cc
+4
-0
paddle/scripts/docker/build.sh
paddle/scripts/docker/build.sh
+2
-3
paddle/scripts/travis/build_doc.sh
paddle/scripts/travis/build_doc.sh
+2
-3
未找到文件。
doc/CMakeLists.txt
浏览文件 @
2f856769
add_custom_target
(
paddle_apis ALL
DEPENDS paddle_v2_apis paddle_fluid_apis
)
add_custom_target
(
paddle_docs ALL
DEPENDS paddle_v2_docs paddle_v2_docs_cn
paddle_fluid_docs paddle_fluid_docs_cn
)
add_subdirectory
(
v2
)
add_subdirectory
(
fluid
)
doc/fluid/CMakeLists.txt
浏览文件 @
2f856769
...
...
@@ -27,6 +27,8 @@ sphinx_add_target(paddle_fluid_docs
${
CMAKE_CURRENT_SOURCE_DIR
}
${
SPHINX_HTML_DIR_EN
}
)
add_dependencies
(
paddle_fluid_docs gen_proto_py
)
# configured documentation tools and intermediate build results
set
(
BINARY_BUILD_DIR_CN
"
${
CMAKE_CURRENT_BINARY_DIR
}
/cn/_build"
)
...
...
@@ -47,3 +49,7 @@ sphinx_add_target(paddle_fluid_docs_cn
${
SPHINX_CACHE_DIR_CN
}
${
CMAKE_CURRENT_SOURCE_DIR
}
${
SPHINX_HTML_DIR_CN
}
)
add_dependencies
(
paddle_fluid_docs_cn gen_proto_py
)
add_subdirectory
(
api
)
doc/fluid/api/CMakeLists.txt
0 → 100644
浏览文件 @
2f856769
# configured documentation tools and intermediate build results
set
(
BINARY_BUILD_DIR_EN
"
${
CMAKE_CURRENT_BINARY_DIR
}
/en/_build"
)
# Sphinx cache with pickled ReST documents
set
(
SPHINX_CACHE_DIR_EN
"
${
CMAKE_CURRENT_BINARY_DIR
}
/en/_doctrees"
)
# HTML output director
set
(
SPHINX_HTML_DIR_EN
"
${
CMAKE_CURRENT_BINARY_DIR
}
/en/html"
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../templates/conf.py.en.in"
"
${
BINARY_BUILD_DIR_EN
}
/conf.py"
@ONLY
)
sphinx_add_target
(
paddle_fluid_apis
html
${
BINARY_BUILD_DIR_EN
}
${
SPHINX_CACHE_DIR_EN
}
${
CMAKE_CURRENT_SOURCE_DIR
}
${
SPHINX_HTML_DIR_EN
}
)
add_dependencies
(
paddle_fluid_apis gen_proto_py framework_py_proto copy_paddle_pybind
)
doc/
v2/api/fluid
/data_feeder.rst
→
doc/
fluid/api
/data_feeder.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/evaluator.rst
→
doc/
fluid/api
/evaluator.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/executor.rst
→
doc/
fluid/api
/executor.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/gen_doc.py
→
doc/
fluid/api
/gen_doc.py
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/gen_doc.sh
→
doc/
fluid/api
/gen_doc.sh
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid/index
.rst
→
doc/
fluid/api/index_en
.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/initializer.rst
→
doc/
fluid/api
/initializer.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/io.rst
→
doc/
fluid/api
/io.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/layers.rst
→
doc/
fluid/api
/layers.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/nets.rst
→
doc/
fluid/api
/nets.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/optimizer.rst
→
doc/
fluid/api
/optimizer.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/param_attr.rst
→
doc/
fluid/api
/param_attr.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/profiler.rst
→
doc/
fluid/api
/profiler.rst
浏览文件 @
2f856769
文件已移动
doc/
v2/api/fluid
/regularizer.rst
→
doc/
fluid/api
/regularizer.rst
浏览文件 @
2f856769
文件已移动
doc/v2/CMakeLists.txt
浏览文件 @
2f856769
...
...
@@ -20,13 +20,15 @@ configure_file(
"
${
BINARY_BUILD_DIR_EN
}
/conf.py"
@ONLY
)
sphinx_add_target
(
paddle_docs
sphinx_add_target
(
paddle_
v2_
docs
html
${
BINARY_BUILD_DIR_EN
}
${
SPHINX_CACHE_DIR_EN
}
${
CMAKE_CURRENT_SOURCE_DIR
}
${
SPHINX_HTML_DIR_EN
}
)
add_dependencies
(
paddle_v2_docs gen_proto_py
)
# configured documentation tools and intermediate build results
set
(
BINARY_BUILD_DIR_CN
"
${
CMAKE_CURRENT_BINARY_DIR
}
/cn/_build"
)
...
...
@@ -41,11 +43,13 @@ configure_file(
"
${
BINARY_BUILD_DIR_CN
}
/conf.py"
@ONLY
)
sphinx_add_target
(
paddle_docs_cn
sphinx_add_target
(
paddle_
v2_
docs_cn
html
${
BINARY_BUILD_DIR_CN
}
${
SPHINX_CACHE_DIR_CN
}
${
CMAKE_CURRENT_SOURCE_DIR
}
${
SPHINX_HTML_DIR_CN
}
)
add_dependencies
(
paddle_v2_docs_cn gen_proto_py
)
add_subdirectory
(
api
)
doc/v2/api/CMakeLists.txt
浏览文件 @
2f856769
...
...
@@ -12,9 +12,11 @@ configure_file(
"
${
BINARY_BUILD_DIR_EN
}
/conf.py"
@ONLY
)
sphinx_add_target
(
paddle_
api_doc
s
sphinx_add_target
(
paddle_
v2_api
s
html
${
BINARY_BUILD_DIR_EN
}
${
SPHINX_CACHE_DIR_EN
}
${
CMAKE_CURRENT_SOURCE_DIR
}
${
SPHINX_HTML_DIR_EN
}
)
add_dependencies
(
paddle_v2_apis gen_proto_py framework_py_proto copy_paddle_pybind
)
paddle/fluid/operators/detail/grpc_server.cc
浏览文件 @
2f856769
...
...
@@ -174,13 +174,13 @@ void AsyncGRPCServer::ShutdownQueue() {
std
::
unique_lock
<
std
::
mutex
>
lock
(
cq_mutex_
);
cq_send_
->
Shutdown
();
cq_get_
->
Shutdown
();
is_shut_down_
=
true
;
}
// This URL explains why shutdown is complicate:
void
AsyncGRPCServer
::
ShutDown
()
{
server_
->
Shutdown
()
;
is_shut_down_
=
true
;
ShutdownQueue
();
server_
->
Shutdown
();
}
void
AsyncGRPCServer
::
TryToRegisterNewSendOne
()
{
...
...
@@ -213,14 +213,14 @@ void AsyncGRPCServer::HandleRequest(::grpc::ServerCompletionQueue* cq,
bool
ok
=
false
;
while
(
true
)
{
if
(
!
cq
->
Next
(
&
tag
,
&
ok
))
{
LOG
(
INFO
)
<<
cq_name
<<
"
get
CompletionQueue shutdown!"
;
LOG
(
INFO
)
<<
cq_name
<<
" CompletionQueue shutdown!"
;
break
;
}
PADDLE_ENFORCE
(
tag
);
// FIXME(typhoonzero): de-couple the barriers with recv_op
if
(
cq_name
==
"cq_get"
)
WaitCond
(
1
);
if
(
cq_name
==
"cq_send"
)
WaitCond
(
0
);
if
(
!
is_shut_down_
&&
cq_name
==
"cq_get"
)
WaitCond
(
1
);
if
(
!
is_shut_down_
&&
cq_name
==
"cq_send"
)
WaitCond
(
0
);
RequestBase
*
base
=
(
RequestBase
*
)
tag
;
// reference:
...
...
paddle/fluid/operators/listen_and_serv_op.cc
浏览文件 @
2f856769
...
...
@@ -88,7 +88,6 @@ class ListenAndServOp : public framework::OperatorBase {
void
Stop
()
override
{
rpc_service_
->
Push
(
LISTEN_TERMINATE_MESSAGE
);
rpc_service_
->
ShutDown
();
server_thread_
->
join
();
}
...
...
paddle/fluid/operators/lrn_op.cc
浏览文件 @
2f856769
...
...
@@ -214,7 +214,10 @@ class LRNOpMaker : public framework::OpProtoAndCheckerMaker {
"Defaults to
\"
NHWC
\"
. Specify the data format of the output data, "
"the input will be transformed automatically. "
)
.
SetDefault
(
"AnyLayout"
);
AddAttr
<
bool
>
(
"is_test"
,
""
).
SetDefault
(
false
);
AddAttr
<
bool
>
(
"is_test"
,
"Turns on memory optimization that optimizes away "
"unnecessary memory allocations. Used by MKLDNN."
)
.
SetDefault
(
false
);
AddComment
(
R"DOC(
Local Response Normalization Operator.
...
...
paddle/fluid/operators/lrn_op.h
浏览文件 @
2f856769
...
...
@@ -121,6 +121,10 @@ class LRNGradKernel : public framework::OpKernel<T> {
T
alpha
=
ctx
.
Attr
<
T
>
(
"alpha"
);
T
beta
=
ctx
.
Attr
<
T
>
(
"beta"
);
PADDLE_ENFORCE
(
!
ctx
.
Attr
<
bool
>
(
"is_test"
),
"is_test attribute should be set to False in training phase."
);
LRNGradFunctor
<
DeviceContext
,
T
>
f
;
f
(
ctx
,
x
,
out
,
mid
,
x_g
,
out_g
,
N
,
C
,
H
,
W
,
n
,
alpha
,
beta
);
}
...
...
paddle/fluid/operators/send_recv_op_test.cc
浏览文件 @
2f856769
...
...
@@ -122,7 +122,8 @@ void StartServerNet(bool is_sparse) {
// sub program run in listen_and_serv_op, for simple test we use sum
f
::
ProgramDesc
program
;
f
::
BlockDesc
*
optimize_block
=
program
.
MutableBlock
(
0
);
const
auto
&
root_block
=
program
.
Block
(
0
);
auto
*
optimize_block
=
program
.
AppendBlock
(
root_block
);
// X for server side tensors, RX for received tensers, must be of same shape.
AddOp
(
"sum"
,
{{
"X"
,
{
"x0"
,
"x1"
}}},
{{
"Out"
,
{
"Out"
}}},
{},
optimize_block
);
...
...
paddle/fluid/platform/profiler_test.cc
浏览文件 @
2f856769
...
...
@@ -13,7 +13,9 @@ See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/fluid/platform/profiler.h"
#ifdef PADDLE_WITH_CUDA
#include "cuda_runtime.h"
#endif
#include "gtest/gtest.h"
TEST
(
Event
,
CpuElapsedTime
)
{
...
...
@@ -159,6 +161,7 @@ TEST(RecordEvent, RecordEvent) {
DisableProfiler
(
EventSortingKey
::
kTotal
,
"/tmp/profiler"
);
}
#ifdef PADDLE_WITH_CUDA
TEST
(
TMP
,
stream_wait
)
{
cudaStream_t
stream
;
cudaStreamCreate
(
&
stream
);
...
...
@@ -166,3 +169,4 @@ TEST(TMP, stream_wait) {
cudaStreamSynchronize
(
stream
);
cudaStreamSynchronize
(
stream
);
}
#endif
paddle/scripts/docker/build.sh
浏览文件 @
2f856769
...
...
@@ -125,9 +125,8 @@ EOF
-DWITH_AVX
=
${
WITH_AVX
:-
ON
}
\
-DWITH_SWIG_PY
=
ON
\
-DWITH_STYLE_CHECK
=
OFF
make
-j
`
nproc
`
gen_proto_py framework_py_proto
make
-j
`
nproc
`
copy_paddle_pybind
make
-j
`
nproc
`
paddle_docs paddle_docs_cn paddle_api_docs
make
-j
`
nproc
`
paddle_docs paddle_apis
popd
fi
...
...
paddle/scripts/travis/build_doc.sh
浏览文件 @
2f856769
...
...
@@ -7,9 +7,8 @@ cd $TRAVIS_BUILD_DIR/build
# Compile Documentation only.
cmake ..
-DCMAKE_BUILD_TYPE
=
Release
-DWITH_GPU
=
OFF
-DWITH_MKL
=
OFF
-DWITH_DOC
=
ON
-DWITH_STYLE_CHECK
=
OFF
make
-j
`
nproc
`
gen_proto_py framework_py_proto
make
-j
`
nproc
`
copy_paddle_pybind
make
-j
`
nproc
`
paddle_docs paddle_docs_cn paddle_api_docs
make
-j
`
nproc
`
paddle_docs paddle_apis
# check websites for broken links
linkchecker doc/v2/en/html/index.html
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录