Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
dc80be27
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
提交
dc80be27
编写于
11月 16, 2018
作者:
P
peizhilin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code style
test=develop
上级
6d0d5a76
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
16 addition
and
23 deletion
+16
-23
cmake/external/eigen.cmake
cmake/external/eigen.cmake
+4
-6
cmake/external/gflags.cmake
cmake/external/gflags.cmake
+2
-3
cmake/external/glog.cmake
cmake/external/glog.cmake
+1
-2
cmake/external/gtest.cmake
cmake/external/gtest.cmake
+2
-3
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+2
-3
cmake/external/zlib.cmake
cmake/external/zlib.cmake
+2
-3
paddle/fluid/platform/cpu_helper.cc
paddle/fluid/platform/cpu_helper.cc
+1
-1
python/paddle/fluid/parallel_executor.py
python/paddle/fluid/parallel_executor.py
+2
-2
未找到文件。
cmake/external/eigen.cmake
浏览文件 @
dc80be27
...
...
@@ -16,9 +16,8 @@ if(WITH_AMD_GPU)
ExternalProject_Add
(
extern_eigen3
${
EXTERNAL_PROJECT_LOG_ARGS
}
# GIT_REPOSITORY "https://github.com/sabreshao/hipeigen.git"
# GIT_TAG 0cba03ff9f8f9f70bbd92ac5857b031aa8fed6f9
GIT_REPOSITORY
"http://admin@172.20.90.14:8080/r/eigen3.git"
GIT_REPOSITORY
"https://github.com/sabreshao/hipeigen.git"
GIT_TAG 0cba03ff9f8f9f70bbd92ac5857b031aa8fed6f9
PREFIX
${
EIGEN_SOURCE_DIR
}
UPDATE_COMMAND
""
CONFIGURE_COMMAND
""
...
...
@@ -30,11 +29,10 @@ else()
ExternalProject_Add
(
extern_eigen3
${
EXTERNAL_PROJECT_LOG_ARGS
}
# GIT_REPOSITORY "https://github.com/eigenteam/eigen-git-mirror"
GIT_REPOSITORY
"http://admin@172.20.90.14:8080/r/eigen3.git"
GIT_REPOSITORY
"https://github.com/eigenteam/eigen-git-mirror"
# eigen on cuda9.1 missing header of math_funtions.hpp
# https://stackoverflow.com/questions/43113508/math-functions-hpp-not-found-when-using-cuda-with-eigen
#
GIT_TAG 917060c364181f33a735dc023818d5a54f60e54c
GIT_TAG 917060c364181f33a735dc023818d5a54f60e54c
PREFIX
${
EIGEN_SOURCE_DIR
}
DOWNLOAD_NAME
"eigen"
UPDATE_COMMAND
""
...
...
cmake/external/gflags.cmake
浏览文件 @
dc80be27
...
...
@@ -28,9 +28,8 @@ INCLUDE_DIRECTORIES(${GFLAGS_INCLUDE_DIR})
ExternalProject_Add
(
extern_gflags
${
EXTERNAL_PROJECT_LOG_ARGS
}
# GIT_REPOSITORY "https://github.com/gflags/gflags.git"
GIT_REPOSITORY
"http://admin@172.20.90.14:8080/r/gflags.git"
# GIT_TAG 77592648e3f3be87d6c7123eb81cbad75f9aef5a
GIT_REPOSITORY
"https://github.com/gflags/gflags.git"
GIT_TAG 77592648e3f3be87d6c7123eb81cbad75f9aef5a
PREFIX
${
GFLAGS_SOURCES_DIR
}
UPDATE_COMMAND
""
CMAKE_ARGS -DCMAKE_CXX_COMPILER=
${
CMAKE_CXX_COMPILER
}
...
...
cmake/external/glog.cmake
浏览文件 @
dc80be27
...
...
@@ -34,14 +34,13 @@ ELSE()
SET
(
GLOG_REPOSITORY
"https://github.com/google/glog.git"
)
SET
(
GLOG_TAG
"v0.3.5"
)
ENDIF
()
SET
(
GLOG_REPOSITORY
"http://admin@172.20.90.14:8080/r/glog.git"
)
ExternalProject_Add
(
extern_glog
${
EXTERNAL_PROJECT_LOG_ARGS
}
DEPENDS gflags
GIT_REPOSITORY
${
GLOG_REPOSITORY
}
#
GIT_TAG ${GLOG_TAG}
GIT_TAG
${
GLOG_TAG
}
PREFIX
${
GLOG_SOURCES_DIR
}
UPDATE_COMMAND
""
CMAKE_ARGS -DCMAKE_CXX_COMPILER=
${
CMAKE_CXX_COMPILER
}
...
...
cmake/external/gtest.cmake
浏览文件 @
dc80be27
...
...
@@ -43,9 +43,8 @@ IF(WITH_TESTING)
extern_gtest
${
EXTERNAL_PROJECT_LOG_ARGS
}
DEPENDS
${
GTEST_DEPENDS
}
# GIT_REPOSITORY "https://github.com/google/googletest.git"
GIT_REPOSITORY
"http://admin@172.20.90.14:8080/r/gtest.git"
# GIT_TAG "release-1.8.0"
GIT_REPOSITORY
"https://github.com/google/googletest.git"
GIT_TAG
"release-1.8.0"
PREFIX
${
GTEST_SOURCES_DIR
}
UPDATE_COMMAND
""
CMAKE_ARGS -DCMAKE_CXX_COMPILER=
${
CMAKE_CXX_COMPILER
}
...
...
cmake/external/protobuf.cmake
浏览文件 @
dc80be27
...
...
@@ -202,9 +202,8 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
SET
(
OPTIONAL_ARGS
${
OPTIONAL_ARGS
}
"-DCMAKE_GENERATOR_PLATFORM=x64"
)
ENDIF
()
# SET(PROTOBUF_REPO "https://github.com/google/protobuf.git")
# SET(PROTOBUF_TAG "9f75c5aa851cd877fb0d93ccc31b8567a6706546")
SET
(
PROTOBUF_REPO http://admin@172.20.90.14:8080/r/protobuf.git
)
SET
(
PROTOBUF_REPO
"https://github.com/google/protobuf.git"
)
SET
(
PROTOBUF_TAG
"9f75c5aa851cd877fb0d93ccc31b8567a6706546"
)
IF
(
MOBILE_INFERENCE
)
# The reason why the official version is not used is described in
# https://github.com/PaddlePaddle/Paddle/issues/6114
...
...
cmake/external/zlib.cmake
浏览文件 @
dc80be27
...
...
@@ -31,9 +31,8 @@ INCLUDE_DIRECTORIES(${THIRD_PARTY_PATH}/install) # For Paddle code to include zl
ExternalProject_Add
(
extern_zlib
${
EXTERNAL_PROJECT_LOG_ARGS
}
# GIT_REPOSITORY "https://github.com/madler/zlib.git"
GIT_REPOSITORY
"http://admin@172.20.90.14:8080/r/zlib.git"
# GIT_TAG "v1.2.8"
GIT_REPOSITORY
"https://github.com/madler/zlib.git"
GIT_TAG
"v1.2.8"
PREFIX
${
ZLIB_SOURCES_DIR
}
UPDATE_COMMAND
""
CMAKE_ARGS -DCMAKE_C_COMPILER=
${
CMAKE_C_COMPILER
}
...
...
paddle/fluid/platform/cpu_helper.cc
浏览文件 @
dc80be27
...
...
@@ -29,7 +29,7 @@ namespace platform {
void
SetNumThreads
(
int
num_threads
)
{
#ifdef PADDLE_USE_OPENBLAS
// windows has no support for openblas multi-thread
// windows has no support for openblas multi-thread
#ifdef _WIN32
if
(
num_threads
>
1
)
{
num_threads
=
1
;
...
...
python/paddle/fluid/parallel_executor.py
浏览文件 @
dc80be27
...
...
@@ -29,7 +29,6 @@ if os.name != 'nt':
ExecutionStrategy
=
core
.
ParallelExecutor
.
ExecutionStrategy
BuildStrategy
=
core
.
ParallelExecutor
.
BuildStrategy
class
ParallelExecutor
(
object
):
"""
ParallelExecutor is designed for data parallelism, which focuses on distributing
...
...
@@ -161,7 +160,8 @@ if os.name != 'nt':
for
p
in
main
.
global_block
().
iter_parameters
()
if
not
p
.
stop_gradient
]),
set
(
cpt
.
to_text
(
var
)
for
var
in
self
.
persistable_vars
),
main
.
desc
,
set
(
cpt
.
to_text
(
var
)
for
var
in
self
.
persistable_vars
),
main
.
desc
,
cpt
.
to_text
(
loss_name
)
if
loss_name
else
six
.
u
(
''
),
scope
,
local_scopes
,
exec_strategy
,
build_strategy
,
num_trainers
,
trainer_id
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录