Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
fb93a8be
P
Paddle
项目概览
wmsofts
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fb93a8be
编写于
8月 31, 2017
作者:
L
Liu Yiqun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add paddle_pserver back to c-api library, because it is used in Evaluator.h.
上级
36fc4052
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
26 deletion
+12
-26
CMakeLists.txt
CMakeLists.txt
+3
-5
cmake/cross_compiling/ios.cmake
cmake/cross_compiling/ios.cmake
+0
-2
cmake/util.cmake
cmake/util.cmake
+4
-9
paddle/CMakeLists.txt
paddle/CMakeLists.txt
+3
-7
paddle/capi/CMakeLists.txt
paddle/capi/CMakeLists.txt
+2
-3
未找到文件。
CMakeLists.txt
浏览文件 @
fb93a8be
...
@@ -155,11 +155,9 @@ endif(USE_NNPACK)
...
@@ -155,11 +155,9 @@ endif(USE_NNPACK)
add_subdirectory
(
proto
)
add_subdirectory
(
proto
)
if
(
NOT ANDROID AND NOT IOS
)
# "add_subdirectory(go)" should be placed after the following loine,
# "add_subdirectory(go)" should be placed after the following loine,
# because it depends on paddle/optimizer.
# because it depends on paddle/optimizer.
add_subdirectory
(
paddle/optimizer
)
add_subdirectory
(
paddle/optimizer
)
endif
()
# "add_subdirectory(paddle)" and "add_subdirectory(python)" should be
# "add_subdirectory(paddle)" and "add_subdirectory(python)" should be
# placed after this block, because they depends on it.
# placed after this block, because they depends on it.
...
...
cmake/cross_compiling/ios.cmake
浏览文件 @
fb93a8be
...
@@ -49,8 +49,6 @@ if(NOT IOS)
...
@@ -49,8 +49,6 @@ if(NOT IOS)
endif
()
endif
()
set
(
CMAKE_SYSTEM_NAME Darwin
)
set
(
CMAKE_SYSTEM_NAME Darwin
)
#set(UNIX ON)
#set(APPLE ON)
# Get the Xcode version being used.
# Get the Xcode version being used.
execute_process
(
COMMAND xcodebuild -version
execute_process
(
COMMAND xcodebuild -version
...
...
cmake/util.cmake
浏览文件 @
fb93a8be
...
@@ -71,25 +71,20 @@ function(link_paddle_exe TARGET_NAME)
...
@@ -71,25 +71,20 @@ function(link_paddle_exe TARGET_NAME)
generate_rdma_links
()
generate_rdma_links
()
endif
()
endif
()
if
(
NOT ANDROID AND NOT IOS
)
set
(
PADDLE_TRAIN_LIBS
paddle_pserver
paddle_network
paddle_trainer_lib
paddle_optimizer
)
endif
()
target_circle_link_libraries
(
${
TARGET_NAME
}
target_circle_link_libraries
(
${
TARGET_NAME
}
ARCHIVE_START
ARCHIVE_START
paddle_gserver
paddle_gserver
paddle_function
paddle_function
ARCHIVE_END
ARCHIVE_END
paddle_pserver
paddle_trainer_lib
paddle_network
paddle_math
paddle_math
paddle_utils
paddle_utils
paddle_parameter
paddle_parameter
paddle_proto
paddle_proto
paddle_cuda
paddle_cuda
${
PADDLE_TRAIN_LIBS
}
paddle_optimizer
${
EXTERNAL_LIBS
}
${
EXTERNAL_LIBS
}
${
CMAKE_THREAD_LIBS_INIT
}
${
CMAKE_THREAD_LIBS_INIT
}
${
CMAKE_DL_LIBS
}
${
CMAKE_DL_LIBS
}
...
...
paddle/CMakeLists.txt
浏览文件 @
fb93a8be
...
@@ -5,12 +5,8 @@ add_subdirectory(testing)
...
@@ -5,12 +5,8 @@ add_subdirectory(testing)
add_subdirectory
(
math
)
add_subdirectory
(
math
)
add_subdirectory
(
parameter
)
add_subdirectory
(
parameter
)
add_subdirectory
(
gserver
)
add_subdirectory
(
gserver
)
add_subdirectory
(
pserver
)
if
(
NOT ANDROID AND NOT IOS
)
add_subdirectory
(
trainer
)
add_subdirectory
(
pserver
)
add_subdirectory
(
trainer
)
endif
()
add_subdirectory
(
scripts
)
add_subdirectory
(
scripts
)
add_subdirectory
(
string
)
add_subdirectory
(
string
)
...
@@ -23,7 +19,7 @@ if(Boost_FOUND)
...
@@ -23,7 +19,7 @@ if(Boost_FOUND)
endif
()
endif
()
if
(
WITH_C_API
)
if
(
WITH_C_API
)
add_subdirectory
(
capi
)
add_subdirectory
(
capi
)
endif
()
endif
()
if
(
WITH_SWIG_PY
)
if
(
WITH_SWIG_PY
)
...
...
paddle/capi/CMakeLists.txt
浏览文件 @
fb93a8be
...
@@ -38,9 +38,8 @@ set(PADDLE_CAPI_INFER_LIBS
...
@@ -38,9 +38,8 @@ set(PADDLE_CAPI_INFER_LIBS
paddle_function
paddle_function
paddle_gserver
paddle_gserver
paddle_proto
paddle_proto
)
paddle_pserver
paddle_network
)
set
(
PADDLE_CAPI_TRAIN_LIBS paddle_pserver paddle_network
)
cc_library
(
paddle_capi_whole DEPS paddle_capi
${
PADDLE_CAPI_INFER_LIBS
}
)
cc_library
(
paddle_capi_whole DEPS paddle_capi
${
PADDLE_CAPI_INFER_LIBS
}
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录