Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
24f9037e
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看板
未验证
提交
24f9037e
编写于
1月 19, 2020
作者:
石
石晓伟
提交者:
GitHub
1月 19, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update external lite, test=develop (#22347)
* update external lite, test=develop * switch WITH_TESTING to OFF, test=develop
上级
50bbb3aa
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
13 addition
and
5 deletion
+13
-5
cmake/external/lite.cmake
cmake/external/lite.cmake
+6
-5
cmake/inference_lib.cmake
cmake/inference_lib.cmake
+7
-0
未找到文件。
cmake/external/lite.cmake
浏览文件 @
24f9037e
...
@@ -25,7 +25,7 @@ if (NOT LITE_SOURCE_DIR OR NOT LITE_BINARY_DIR)
...
@@ -25,7 +25,7 @@ if (NOT LITE_SOURCE_DIR OR NOT LITE_BINARY_DIR)
set
(
LITE_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/lite
)
set
(
LITE_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/lite
)
# No quotes, so cmake can resolve it as a command with arguments.
# No quotes, so cmake can resolve it as a command with arguments.
set
(
LITE_BUILD_COMMAND $
(
MAKE
)
-j
)
set
(
LITE_BUILD_COMMAND $
(
MAKE
)
publish_inference
-j
)
set
(
LITE_OPTIONAL_ARGS -DWITH_MKL=ON
set
(
LITE_OPTIONAL_ARGS -DWITH_MKL=ON
-DLITE_WITH_CUDA=
${
WITH_GPU
}
-DLITE_WITH_CUDA=
${
WITH_GPU
}
-DWITH_MKLDNN=OFF
-DWITH_MKLDNN=OFF
...
@@ -34,16 +34,17 @@ if (NOT LITE_SOURCE_DIR OR NOT LITE_BINARY_DIR)
...
@@ -34,16 +34,17 @@ if (NOT LITE_SOURCE_DIR OR NOT LITE_BINARY_DIR)
-DWITH_LITE=OFF
-DWITH_LITE=OFF
-DLITE_WITH_LIGHT_WEIGHT_FRAMEWORK=OFF
-DLITE_WITH_LIGHT_WEIGHT_FRAMEWORK=OFF
-DWITH_PYTHON=OFF
-DWITH_PYTHON=OFF
-DWITH_TESTING=O
N
-DWITH_TESTING=O
FF
-DLITE_BUILD_EXTRA=ON
-DLITE_BUILD_EXTRA=ON
-DCUDNN_ROOT=
${
CUDNN_ROOT
}
-DCUDNN_ROOT=
${
CUDNN_ROOT
}
-DLITE_WITH_STATIC_CUDA=OFF
-DLITE_WITH_ARM=OFF
)
-DLITE_WITH_ARM=OFF
)
ExternalProject_Add
(
ExternalProject_Add
(
${
LITE_PROJECT
}
${
LITE_PROJECT
}
${
EXTERNAL_PROJECT_LOG_ARGS
}
${
EXTERNAL_PROJECT_LOG_ARGS
}
GIT_REPOSITORY
"https://github.com/PaddlePaddle/Paddle-Lite.git"
GIT_REPOSITORY
"https://github.com/PaddlePaddle/Paddle-Lite.git"
GIT_TAG
d8143103f9fb63dd362d7b0d72ca3c0ac6e10f72
GIT_TAG
9343782bb6e3c7876fdb6ecacd0d3bd3db4ce2bc
PREFIX
${
LITE_SOURCES_DIR
}
PREFIX
${
LITE_SOURCES_DIR
}
UPDATE_COMMAND
""
UPDATE_COMMAND
""
BUILD_COMMAND
${
LITE_BUILD_COMMAND
}
BUILD_COMMAND
${
LITE_BUILD_COMMAND
}
...
@@ -74,7 +75,7 @@ include_directories(${LITE_SOURCE_DIR})
...
@@ -74,7 +75,7 @@ include_directories(${LITE_SOURCE_DIR})
include_directories
(
${
LITE_BINARY_DIR
}
)
include_directories
(
${
LITE_BINARY_DIR
}
)
function
(
external_lite_static_libs alias path
)
function
(
external_lite_static_libs alias path
)
add_library
(
${
alias
}
S
TATIC
IMPORTED GLOBAL
)
add_library
(
${
alias
}
S
HARED
IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET
${
alias
}
PROPERTY IMPORTED_LOCATION
SET_PROPERTY
(
TARGET
${
alias
}
PROPERTY IMPORTED_LOCATION
${
path
}
)
${
path
}
)
if
(
LITE_PROJECT
)
if
(
LITE_PROJECT
)
...
@@ -82,6 +83,6 @@ function(external_lite_static_libs alias path)
...
@@ -82,6 +83,6 @@ function(external_lite_static_libs alias path)
endif
()
endif
()
endfunction
()
endfunction
()
external_lite_static_libs
(
lite_full_static
${
LITE_BINARY_DIR
}
/
lite/api/libapi_full_static.a
)
external_lite_static_libs
(
lite_full_static
${
LITE_BINARY_DIR
}
/
inference_lite_lib/cxx/lib/libpaddle_full_api_shared.so
)
add_definitions
(
-DPADDLE_WITH_LITE
)
add_definitions
(
-DPADDLE_WITH_LITE
)
cmake/inference_lib.cmake
浏览文件 @
24f9037e
...
@@ -131,6 +131,13 @@ function(copy_part_of_thrid_party TARGET DST)
...
@@ -131,6 +131,13 @@ function(copy_part_of_thrid_party TARGET DST)
DSTS
${
dst_dir
}
/include
${
dst_dir
}
/lib
)
DSTS
${
dst_dir
}
/include
${
dst_dir
}
/lib
)
endif
()
endif
()
if
(
LITE_BINARY_DIR
)
set
(
dst_dir
"
${
DST
}
/third_party/install/lite"
)
copy
(
${
TARGET
}
SRCS
${
LITE_BINARY_DIR
}
/inference_lite_lib/*
DSTS
${
dst_dir
}
)
endif
()
if
(
ANAKIN_FOUND
)
if
(
ANAKIN_FOUND
)
set
(
dst_dir
"
${
DST
}
/third_party/install/anakin"
)
set
(
dst_dir
"
${
DST
}
/third_party/install/anakin"
)
copy
(
${
TARGET
}
copy
(
${
TARGET
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录