Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
30b75a51
P
Paddle
项目概览
PaddlePaddle
/
Paddle
11 个月 前同步成功
通知
2292
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,发现更多精彩内容 >>
提交
30b75a51
编写于
6月 28, 2017
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Also add pb_py_library
上级
b1a311c4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
35 deletion
+26
-35
cmake/generic.cmake
cmake/generic.cmake
+24
-7
proto/CMakeLists.txt
proto/CMakeLists.txt
+2
-28
未找到文件。
cmake/generic.cmake
浏览文件 @
30b75a51
...
@@ -341,13 +341,6 @@ function(pb_cc_library TARGET_NAME)
...
@@ -341,13 +341,6 @@ function(pb_cc_library TARGET_NAME)
foreach
(
FIL
${
pb_cc_library_SRCS
}
)
foreach
(
FIL
${
pb_cc_library_SRCS
}
)
get_filename_component
(
ABS_FIL
${
FIL
}
ABSOLUTE
)
get_filename_component
(
ABS_FIL
${
FIL
}
ABSOLUTE
)
get_filename_component
(
FIL_WE
${
FIL
}
NAME_WE
)
get_filename_component
(
FIL_WE
${
FIL
}
NAME_WE
)
if
(
NOT PROTOBUF_GENERATE_CPP_APPEND_PATH
)
get_filename_component
(
FIL_DIR
${
FIL
}
DIRECTORY
)
if
(
FIL_DIR
)
set
(
FIL_WE
"
${
FIL_DIR
}
/
${
FIL_WE
}
"
)
endif
()
endif
()
list
(
APPEND proto_srcs
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
FIL_WE
}
.pb.cc"
)
list
(
APPEND proto_srcs
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
FIL_WE
}
.pb.cc"
)
list
(
APPEND proto_hdrs
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
FIL_WE
}
.pb.h"
)
list
(
APPEND proto_hdrs
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
FIL_WE
}
.pb.h"
)
...
@@ -363,4 +356,28 @@ function(pb_cc_library TARGET_NAME)
...
@@ -363,4 +356,28 @@ function(pb_cc_library TARGET_NAME)
set_source_files_properties
(
${
proto_srcs
}
${
proto_hdrs
}
PROPERTIES GENERATED TRUE
)
set_source_files_properties
(
${
proto_srcs
}
${
proto_hdrs
}
PROPERTIES GENERATED TRUE
)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
cc_library
(
${
TARGET_NAME
}
SRCS
${
proto_srcs
}
)
cc_library
(
${
TARGET_NAME
}
SRCS
${
proto_srcs
}
)
endfunction
()
function
(
pb_py_library TARGET_NAME
)
set
(
oneValueArgs TARGET_DIR
)
set
(
multiValueArgs SRCS
)
cmake_parse_arguments
(
pb_py_library
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
if
(
NOT
${
pb_py_library_TARGET_DIR
}
)
set
(
pb_py_library_TARGET_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
)
endif
()
set
(
py_srcs
)
foreach
(
FIL
${
pb_py_library_SRCS
}
)
get_filename_component
(
ABS_FIL
${
FIL
}
ABSOLUTE
)
get_filename_component
(
FIL_WE
${
FIL
}
NAME_WE
)
set
(
cur_py_src
${
pb_py_library_TARGET_DIR
}
/
${
FIL_WE
}
_pb2.py
)
list
(
APPEND py_srcs
"
${
cur_py_src
}
"
)
add_custom_command
(
OUTPUT
${
cur_py_src
}
COMMAND
${
PROTOBUF_PROTOC_EXECUTABLE
}
ARGS
"--python_out=
${
pb_py_library_TARGET_DIR
}
"
"-I"
${
CMAKE_CURRENT_SOURCE_DIR
}
${
ABS_FIL
}
DEPENDS
${
ABS_FIL
}
protoc
COMMENT
"Running Python protocol buffer compiler on
${
FIL
}
"
)
endforeach
()
add_custom_target
(
${
TARGET_NAME
}
ALL DEPENDS
${
py_srcs
}
)
endfunction
()
endfunction
()
\ No newline at end of file
proto/CMakeLists.txt
浏览文件 @
30b75a51
set
(
proto_filenames
file
(
GLOB proto_filenames . *.proto
)
DataConfig.proto
DataFormat.proto
ModelConfig.proto
ParameterConfig.proto
ParameterService.proto
TrainerConfig.proto
OptimizerConfig.proto
ParameterServerConfig.proto
)
set
(
PROTO_GEN
)
set
(
PROTO_GEN_PY
)
foreach
(
filename
${
proto_filenames
}
)
get_filename_component
(
base_filename
${
filename
}
NAME_WE
)
set
(
CUR_PROTO_GEN_PY
${
PROJ_ROOT
}
/paddle/python/paddle/proto/
${
base_filename
}
_pb2.py
)
set
(
PROTO_GEN_PY
${
CUR_PROTO_GEN_PY
}
${
PROTO_GEN_PY
}
)
add_custom_command
(
OUTPUT
${
CUR_PROTO_GEN_PY
}
COMMAND env
${
py_env
}
${
PROTOBUF_PROTOC_EXECUTABLE
}
--python_out
${
PROJ_ROOT
}
/python/paddle/proto
--proto_path
${
PROJ_ROOT
}
/proto
${
PROJ_ROOT
}
/proto/
${
filename
}
DEPENDS
${
filename
}
${
external_project_dependencies
}
)
endforeach
()
add_custom_target
(
gen_proto_py ALL DEPENDS
${
PROTO_GEN_PY
}
)
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
}
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录