Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
skywalk8163
Paddle
提交
64b78b16
P
Paddle
项目概览
skywalk8163
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
64b78b16
编写于
6月 28, 2017
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix TravisCI
上级
30b75a51
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
10 addition
and
17 deletion
+10
-17
cmake/generic.cmake
cmake/generic.cmake
+1
-2
doc/CMakeLists.txt
doc/CMakeLists.txt
+0
-7
paddle/gserver/CMakeLists.txt
paddle/gserver/CMakeLists.txt
+1
-1
paddle/math/CMakeLists.txt
paddle/math/CMakeLists.txt
+1
-1
paddle/optimizer/CMakeLists.txt
paddle/optimizer/CMakeLists.txt
+1
-1
paddle/parameter/CMakeLists.txt
paddle/parameter/CMakeLists.txt
+1
-1
paddle/pserver/CMakeLists.txt
paddle/pserver/CMakeLists.txt
+1
-1
paddle/trainer/CMakeLists.txt
paddle/trainer/CMakeLists.txt
+2
-1
paddle/utils/CMakeLists.txt
paddle/utils/CMakeLists.txt
+1
-1
proto/CMakeLists.txt
proto/CMakeLists.txt
+1
-1
未找到文件。
cmake/generic.cmake
浏览文件 @
64b78b16
...
@@ -362,10 +362,9 @@ function(pb_py_library TARGET_NAME)
...
@@ -362,10 +362,9 @@ function(pb_py_library TARGET_NAME)
set
(
oneValueArgs TARGET_DIR
)
set
(
oneValueArgs TARGET_DIR
)
set
(
multiValueArgs SRCS
)
set
(
multiValueArgs SRCS
)
cmake_parse_arguments
(
pb_py_library
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
cmake_parse_arguments
(
pb_py_library
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
if
(
NOT
${
pb_py_library_TARGET_DIR
}
)
if
(
NOT
pb_py_library_TARGET_DIR
)
set
(
pb_py_library_TARGET_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
)
set
(
pb_py_library_TARGET_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
)
endif
()
endif
()
set
(
py_srcs
)
set
(
py_srcs
)
foreach
(
FIL
${
pb_py_library_SRCS
}
)
foreach
(
FIL
${
pb_py_library_SRCS
}
)
get_filename_component
(
ABS_FIL
${
FIL
}
ABSOLUTE
)
get_filename_component
(
ABS_FIL
${
FIL
}
ABSOLUTE
)
...
...
doc/CMakeLists.txt
浏览文件 @
64b78b16
...
@@ -27,10 +27,6 @@ sphinx_add_target(paddle_docs
...
@@ -27,10 +27,6 @@ sphinx_add_target(paddle_docs
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
${
SPHINX_HTML_DIR_EN
}
)
${
SPHINX_HTML_DIR_EN
}
)
add_dependencies
(
paddle_docs
gen_proto_py
)
# configured documentation tools and intermediate build results
# configured documentation tools and intermediate build results
set
(
BINARY_BUILD_DIR_CN
"
${
CMAKE_CURRENT_BINARY_DIR
}
/cn/_build"
)
set
(
BINARY_BUILD_DIR_CN
"
${
CMAKE_CURRENT_BINARY_DIR
}
/cn/_build"
)
...
@@ -51,6 +47,3 @@ sphinx_add_target(paddle_docs_cn
...
@@ -51,6 +47,3 @@ sphinx_add_target(paddle_docs_cn
${
SPHINX_CACHE_DIR_CN
}
${
SPHINX_CACHE_DIR_CN
}
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
${
SPHINX_HTML_DIR_CN
}
)
${
SPHINX_HTML_DIR_CN
}
)
add_dependencies
(
paddle_docs_cn
gen_proto_py
)
paddle/gserver/CMakeLists.txt
浏览文件 @
64b78b16
...
@@ -58,7 +58,7 @@ endif()
...
@@ -58,7 +58,7 @@ endif()
add_style_check_target
(
paddle_gserver
${
GSERVER_SOURCES
}
)
add_style_check_target
(
paddle_gserver
${
GSERVER_SOURCES
}
)
add_style_check_target
(
paddle_gserver
${
GSERVER_HEADER
}
)
add_style_check_target
(
paddle_gserver
${
GSERVER_HEADER
}
)
add_dependencies
(
paddle_gserver paddle_proto
)
add_dependencies
(
paddle_gserver paddle_proto
${
external_project_dependencies
}
)
if
(
WITH_TESTING
)
if
(
WITH_TESTING
)
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
endif
()
endif
()
paddle/math/CMakeLists.txt
浏览文件 @
64b78b16
...
@@ -33,7 +33,7 @@ endif()
...
@@ -33,7 +33,7 @@ endif()
add_style_check_target
(
paddle_math
${
MATH_SOURCES
}
)
add_style_check_target
(
paddle_math
${
MATH_SOURCES
}
)
add_style_check_target
(
paddle_math
${
MATH_HEADERS
}
)
add_style_check_target
(
paddle_math
${
MATH_HEADERS
}
)
add_dependencies
(
paddle_math paddle_proto
)
# depends
add_dependencies
(
paddle_math paddle_proto
${
external_project_dependencies
}
)
# depends
if
(
WITH_TESTING
)
if
(
WITH_TESTING
)
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
endif
()
endif
()
paddle/optimizer/CMakeLists.txt
浏览文件 @
64b78b16
...
@@ -10,7 +10,7 @@ set(OPITMIZER_SRCS
...
@@ -10,7 +10,7 @@ set(OPITMIZER_SRCS
)
)
add_library
(
paddle_optimizer STATIC
${
OPITMIZER_SRCS
}
)
add_library
(
paddle_optimizer STATIC
${
OPITMIZER_SRCS
}
)
add_dependencies
(
paddle_optimizer paddle_proto
)
add_dependencies
(
paddle_optimizer paddle_proto
${
external_project_dependencies
}
)
if
(
WITH_TESTING
)
if
(
WITH_TESTING
)
add_simple_unittest
(
serialization_test
)
add_simple_unittest
(
serialization_test
)
...
...
paddle/parameter/CMakeLists.txt
浏览文件 @
64b78b16
...
@@ -7,7 +7,7 @@ add_library(paddle_parameter STATIC
...
@@ -7,7 +7,7 @@ add_library(paddle_parameter STATIC
${
PARAMETERS_SOURCES
}
)
${
PARAMETERS_SOURCES
}
)
add_style_check_target
(
paddle_parameter
${
PARAMETERS_SOURCES
}
)
add_style_check_target
(
paddle_parameter
${
PARAMETERS_SOURCES
}
)
add_style_check_target
(
paddle_parameter
${
PARAMETERS_HEADERS
}
)
add_style_check_target
(
paddle_parameter
${
PARAMETERS_HEADERS
}
)
add_dependencies
(
paddle_parameter paddle_proto
)
add_dependencies
(
paddle_parameter paddle_proto
${
external_project_dependencies
}
)
if
(
WITH_TESTING
)
if
(
WITH_TESTING
)
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
endif
()
endif
()
paddle/pserver/CMakeLists.txt
浏览文件 @
64b78b16
...
@@ -40,7 +40,7 @@ add_library(paddle_pserver STATIC
...
@@ -40,7 +40,7 @@ add_library(paddle_pserver STATIC
add_style_check_target
(
paddle_pserver
${
PSERVER_SOURCES
}
)
add_style_check_target
(
paddle_pserver
${
PSERVER_SOURCES
}
)
add_style_check_target
(
paddle_pserver
${
PSERVER_HEADERS
}
)
add_style_check_target
(
paddle_pserver
${
PSERVER_HEADERS
}
)
add_dependencies
(
paddle_pserver paddle_proto
)
add_dependencies
(
paddle_pserver paddle_proto
${
external_project_dependencies
}
)
set
(
PSERVER_MAIN_SOURCES
set
(
PSERVER_MAIN_SOURCES
ParameterServer2Main.cpp
)
ParameterServer2Main.cpp
)
...
...
paddle/trainer/CMakeLists.txt
浏览文件 @
64b78b16
...
@@ -41,7 +41,8 @@ add_style_check_target(paddle_trainer_lib
...
@@ -41,7 +41,8 @@ add_style_check_target(paddle_trainer_lib
add_style_check_target
(
paddle_trainer_lib
add_style_check_target
(
paddle_trainer_lib
${
TRAINER_HEADERS
}
)
${
TRAINER_HEADERS
}
)
add_dependencies
(
paddle_trainer_lib
add_dependencies
(
paddle_trainer_lib
paddle_proto
)
paddle_proto
${
external_project_dependencies
}
)
macro
(
add_paddle_exe TARGET_NAME
)
macro
(
add_paddle_exe TARGET_NAME
)
add_executable
(
${
TARGET_NAME
}
${
ARGN
}
)
add_executable
(
${
TARGET_NAME
}
${
ARGN
}
)
...
...
paddle/utils/CMakeLists.txt
浏览文件 @
64b78b16
...
@@ -17,7 +17,7 @@ add_library(paddle_utils STATIC
...
@@ -17,7 +17,7 @@ add_library(paddle_utils STATIC
add_style_check_target
(
paddle_utils
${
UTIL_HEADERS
}
)
add_style_check_target
(
paddle_utils
${
UTIL_HEADERS
}
)
add_style_check_target
(
paddle_utils
${
UTIL_SOURCES
}
add_style_check_target
(
paddle_utils
${
UTIL_SOURCES
}
${
UTIL_ARCH_SOURCES
}
)
${
UTIL_ARCH_SOURCES
}
)
add_dependencies
(
paddle_utils paddle_proto
)
add_dependencies
(
paddle_utils paddle_proto
${
external_project_dependencies
}
)
if
(
WITH_TESTING
)
if
(
WITH_TESTING
)
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
endif
()
endif
()
proto/CMakeLists.txt
浏览文件 @
64b78b16
file
(
GLOB proto_filenames . *.proto
)
file
(
GLOB proto_filenames . *.proto
)
pb_cc_library
(
paddle_proto SRCS
${
proto_filenames
}
)
pb_cc_library
(
paddle_proto SRCS
${
proto_filenames
}
)
pb_py_library
(
gen_proto_py SRCS
${
proto_filenames
}
TARGET_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
)
pb_py_library
(
gen_proto_py SRCS
${
proto_filenames
}
TARGET_DIR
${
PROJ_ROOT
}
/python/paddle/proto
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录