Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
9bbd7534
P
Paddle
项目概览
OPTHREE
/
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,发现更多精彩内容 >>
提交
9bbd7534
编写于
3月 30, 2018
作者:
T
Tao Luo
提交者:
Abhinav Arora
3月 29, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change WITH_FLUID to WITH_FLUID_ONLY (#9427)
上级
0b823415
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
11 deletion
+10
-11
CMakeLists.txt
CMakeLists.txt
+2
-3
paddle/CMakeLists.txt
paddle/CMakeLists.txt
+1
-1
python/CMakeLists.txt
python/CMakeLists.txt
+3
-3
python/setup.py.in
python/setup.py.in
+4
-4
未找到文件。
CMakeLists.txt
浏览文件 @
9bbd7534
...
...
@@ -53,8 +53,7 @@ option(WITH_COVERAGE "Compile PaddlePaddle with code coverage" OFF)
option
(
COVERALLS_UPLOAD
"Package code coverage data to coveralls"
OFF
)
option
(
ON_TRAVIS
"Exclude special unit test on Travis CI"
OFF
)
option
(
WITH_C_API
"Compile PaddlePaddle with C-API(Prediction)"
OFF
)
# TODO: Only compile PaddlePaddle fluid version by WITH_FLUID option.
option
(
WITH_FLUID
"Compile PaddlePaddle fluid only(TODO)"
OFF
)
option
(
WITH_FLUID_ONLY
"Compile PaddlePaddle fluid only"
OFF
)
option
(
WITH_GOLANG
"Compile PaddlePaddle with GOLANG"
OFF
)
option
(
GLIDE_INSTALL
"Download and install go dependencies "
ON
)
option
(
USE_NNPACK
"Compile PaddlePaddle with NNPACK library"
OFF
)
...
...
@@ -109,7 +108,7 @@ if (WITH_C_API AND WITH_PYTHON)
endif
()
if
(
WITH_C_API
)
set
(
WITH_FLUID OFF CACHE STRING
"Disable install fluid when compile the C_API"
FORCE
)
set
(
WITH_FLUID
_ONLY
OFF CACHE STRING
"Disable install fluid when compile the C_API"
FORCE
)
endif
()
if
(
MOBILE_INFERENCE
)
...
...
paddle/CMakeLists.txt
浏览文件 @
9bbd7534
if
(
NOT WITH_FLUID
)
if
(
NOT WITH_FLUID
_ONLY
)
add_subdirectory
(
cuda
)
add_subdirectory
(
function
)
add_subdirectory
(
utils
)
...
...
python/CMakeLists.txt
浏览文件 @
9bbd7534
...
...
@@ -4,7 +4,7 @@ set(PY_FILES paddle/__init__.py
${
UTILS_PY_FILES
}
${
FLUID_PY_FILES
}
)
if
(
NOT WITH_FLUID
)
if
(
NOT WITH_FLUID
_ONLY
)
file
(
GLOB TRAINER_PY_FILES . ./paddle/trainer/*.py
)
file
(
GLOB HELPERS_PY_FILES . ./paddle/trainer_config_helpers/*.py
)
file
(
GLOB_RECURSE V2_PY_FILES ./paddle/v2/ *.py
)
...
...
@@ -62,7 +62,7 @@ add_custom_command(OUTPUT ${PADDLE_PYTHON_BUILD_DIR}/.timestamp
DEPENDS gen_proto_py copy_paddle_pybind framework_py_proto profiler_py_proto
${
PY_FILES
}
${
external_project_dependencies
}
${
COPY_PADDLE_MASTER
}
)
set
(
paddle_python_deps
${
PADDLE_PYTHON_BUILD_DIR
}
/.timestamp
${
MKL_DEPENDS
}
)
if
(
NOT WITH_FLUID
)
if
(
NOT WITH_FLUID
_ONLY
)
set
(
paddle_python_deps
${
paddle_python_deps
}
paddle_pserver_main paddle_trainer paddle_merge_model
)
if
(
WITH_SWIG_PY
)
list
(
APPEND paddle_python_deps python_api_wheel
)
...
...
@@ -73,7 +73,7 @@ add_custom_target(paddle_python ALL DEPENDS ${paddle_python_deps})
set
(
PADDLE_PYTHON_PACKAGE_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/dist/
)
if
(
WITH_TESTING
)
if
(
NOT WITH_FLUID
)
if
(
NOT WITH_FLUID
_ONLY
)
add_subdirectory
(
paddle/trainer_config_helpers/tests
)
if
(
WITH_SWIG_PY
)
# enable v2 API unittest only when paddle swig api is compiled
...
...
python/setup.py.in
浏览文件 @
9bbd7534
...
...
@@ -68,7 +68,7 @@ packages=['paddle',
'paddle.fluid.proto.profiler',
'paddle.fluid.layers']
if '${WITH_FLUID}'== 'OFF':
if '${WITH_FLUID
_ONLY
}'== 'OFF':
packages+=['paddle.proto',
'paddle.trainer',
'paddle.trainer_config_helpers',
...
...
@@ -87,7 +87,7 @@ if '${CMAKE_SYSTEM_PROCESSOR}' not in ['arm', 'armv7-a', 'aarch64']:
# the prefix is sys.prefix which should always be usr
paddle_bins = ''
if '${WITH_FLUID}'== 'OFF':
if '${WITH_FLUID
_ONLY
}'== 'OFF':
paddle_bin_dir = 'opt/paddle/bin'
paddle_bins = ['${PADDLE_BINARY_DIR}/paddle/trainer/paddle_trainer',
'${PADDLE_BINARY_DIR}/paddle/trainer/paddle_merge_model',
...
...
@@ -95,7 +95,7 @@ if '${WITH_FLUID}'== 'OFF':
'${PADDLE_BINARY_DIR}/paddle/scripts/paddle']
package_data={'paddle.fluid': ['core.so']}
if '${WITH_FLUID}'== 'OFF':
if '${WITH_FLUID
_ONLY
}'== 'OFF':
package_data['paddle.v2.master']=['libpaddle_master.so']
package_data['py_paddle']=['*.py','_swig_paddle.so']
...
...
@@ -106,7 +106,7 @@ package_dir={
'paddle.fluid.proto.profiler': '${PADDLE_BINARY_DIR}/paddle/fluid/platform',
'paddle.fluid.proto': '${PADDLE_BINARY_DIR}/paddle/fluid/framework',
}
if '${WITH_FLUID}'== 'OFF':
if '${WITH_FLUID
_ONLY
}'== 'OFF':
package_dir['py_paddle']='${PADDLE_SOURCE_DIR}/paddle/py_paddle'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录