Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DS小龙哥
Paddle
提交
b2367f36
P
Paddle
项目概览
DS小龙哥
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
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,发现更多精彩内容 >>
提交
b2367f36
编写于
8月 10, 2018
作者:
L
luotao1
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update anakin.cmake
上级
f4bcee1d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
9 addition
and
25 deletion
+9
-25
cmake/external/anakin.cmake
cmake/external/anakin.cmake
+6
-20
paddle/fluid/inference/api/CMakeLists.txt
paddle/fluid/inference/api/CMakeLists.txt
+3
-5
未找到文件。
cmake/external/anakin.cmake
浏览文件 @
b2367f36
...
@@ -2,29 +2,17 @@ if (NOT WITH_ANAKIN)
...
@@ -2,29 +2,17 @@ if (NOT WITH_ANAKIN)
return
()
return
()
endif
()
endif
()
INCLUDE
(
ExternalProject
)
set
(
ANAKIN_SOURCE_DIR
${
THIRD_PARTY_PATH
}
/anakin
)
set
(
ANAKIN_SOURCE_DIR
${
THIRD_PARTY_PATH
}
/anakin
)
# the anakin install dir is only default one now
# the anakin install dir is only default one now
set
(
ANAKIN_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/anakin/src/extern_anakin/output
)
set
(
ANAKIN_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/anakin/src/extern_anakin/output
)
set
(
ANAKIN_INCLUDE
${
ANAKIN_INSTALL_DIR
}
)
set
(
ANAKIN_INCLUDE
${
ANAKIN_INSTALL_DIR
}
)
set
(
ANAKIN_LIBRARY
${
ANAKIN_INSTALL_DIR
}
)
set
(
ANAKIN_LIBRARY
${
ANAKIN_INSTALL_DIR
}
)
SET
(
ANAKIN_SHARED_LIB
${
ANAKIN_LIBRARY
}
/libanakin.so
)
set
(
ANAKIN_SHARED_LIB
${
ANAKIN_LIBRARY
}
/libanakin.so
)
SET
(
ANAKIN_SABER_LIB
${
ANAKIN_LIBRARY
}
/libanakin_saber_common.so
)
set
(
ANAKIN_SABER_LIB
${
ANAKIN_LIBRARY
}
/libanakin_saber_common.so
)
# A helper function used in Anakin, currently, to use it, one need to recursively include
include_directories
(
${
ANAKIN_INCLUDE
}
)
# nearly all the header files.
include_directories
(
${
ANAKIN_INCLUDE
}
/saber/
)
function
(
fetch_include_recursively root_dir
)
if
(
IS_DIRECTORY
${
root_dir
}
)
include_directories
(
BEFORE
${
root_dir
}
)
endif
()
file
(
GLOB ALL_SUB RELATIVE
${
root_dir
}
${
root_dir
}
/*
)
foreach
(
sub
${
ALL_SUB
}
)
if
(
IS_DIRECTORY
${
root_dir
}
/
${
sub
}
)
fetch_include_recursively
(
${
root_dir
}
/
${
sub
}
)
endif
()
endforeach
()
endfunction
()
fetch_include_recursively
(
${
ANAKIN_INCLUDE
}
)
set
(
ANAKIN_COMPILE_EXTRA_FLAGS
set
(
ANAKIN_COMPILE_EXTRA_FLAGS
-Wno-error=unused-but-set-variable -Wno-unused-but-set-variable
-Wno-error=unused-but-set-variable -Wno-unused-but-set-variable
...
@@ -60,11 +48,9 @@ ExternalProject_Add(
...
@@ -60,11 +48,9 @@ ExternalProject_Add(
message
(
STATUS
"Anakin for inference is enabled"
)
message
(
STATUS
"Anakin for inference is enabled"
)
message
(
STATUS
"Anakin is set INCLUDE:
${
ANAKIN_INCLUDE
}
LIBRARY:
${
ANAKIN_LIBRARY
}
"
)
message
(
STATUS
"Anakin is set INCLUDE:
${
ANAKIN_INCLUDE
}
LIBRARY:
${
ANAKIN_LIBRARY
}
"
)
fetch_include_recursively
(
${
ANAKIN_INCLUDE
}
)
add_dependencies
(
extern_anakin protobuf mklml
)
add_library
(
anakin SHARED IMPORTED GLOBAL
)
add_library
(
anakin SHARED IMPORTED GLOBAL
)
set_property
(
TARGET anakin PROPERTY IMPORTED_LOCATION
${
ANAKIN_SHARED_LIB
}
)
set_property
(
TARGET anakin PROPERTY IMPORTED_LOCATION
${
ANAKIN_SHARED_LIB
}
)
set_property
(
TARGET anakin PROPERTY IMPORTED_LOCATION
${
ANAKIN_SABER_LIB
}
)
set_property
(
TARGET anakin PROPERTY IMPORTED_LOCATION
${
ANAKIN_SABER_LIB
}
)
set_property
(
TARGET anakin PROPERTY IMPORTED_LOCATION
${
CUDNN_LIBRARY
}
)
set_property
(
TARGET anakin PROPERTY IMPORTED_LOCATION
${
CUDNN_LIBRARY
}
)
add_dependencies
(
anakin extern_anakin
)
add_dependencies
(
anakin extern_anakin
protobuf mklml
)
list
(
APPEND external_project_dependencies anakin
)
list
(
APPEND external_project_dependencies anakin
)
paddle/fluid/inference/api/CMakeLists.txt
浏览文件 @
b2367f36
...
@@ -62,7 +62,6 @@ endif()
...
@@ -62,7 +62,6 @@ endif()
if
(
WITH_ANAKIN
)
# only needed in CI
if
(
WITH_ANAKIN
)
# only needed in CI
# compile the libinference_anakin_api.a and anakin.so.
# compile the libinference_anakin_api.a and anakin.so.
fetch_include_recursively
(
${
ANAKIN_INCLUDE
}
)
nv_library
(
inference_anakin_api SRCS api.cc api_anakin_engine.cc DEPS anakin
)
nv_library
(
inference_anakin_api SRCS api.cc api_anakin_engine.cc DEPS anakin
)
nv_library
(
inference_anakin_api_shared SHARED SRCS api.cc api_anakin_engine.cc DEPS anakin
)
nv_library
(
inference_anakin_api_shared SHARED SRCS api.cc api_anakin_engine.cc DEPS anakin
)
set
(
ANAKIN_DEPS_LIB
${
ANAKIN_SHARED_LIB
}
${
ANAKIN_SABER_LIB
}
${
CUDNN_LIBRARY
}
)
set
(
ANAKIN_DEPS_LIB
${
ANAKIN_SHARED_LIB
}
${
ANAKIN_SABER_LIB
}
${
CUDNN_LIBRARY
}
)
...
@@ -73,12 +72,11 @@ if (WITH_ANAKIN) # only needed in CI
...
@@ -73,12 +72,11 @@ if (WITH_ANAKIN) # only needed in CI
anakin_target
(
inference_anakin_api
)
anakin_target
(
inference_anakin_api
)
anakin_target
(
inference_anakin_api_shared
)
anakin_target
(
inference_anakin_api_shared
)
if
(
WITH_TESTING
)
if
(
WITH_TESTING
)
# TODO(luotao): anakin_model will move to demo_ci later
set
(
ANAKIN_MODLE_URL
"http://paddle-inference-dist.bj.bcebos.com/mobilenet_v2.anakin.bin"
)
set
(
ANAKIN_MODLE_URL
"http://paddle-inference-dist.bj.bcebos.com/mobilenet_v2.anakin.bin"
)
add_custom_command
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/.timestamp
execute_process
(
COMMAND bash -c
"cd
${
ANAKIN_INSTALL_DIR
}
; wget -q --no-check-certificate
${
ANAKIN_MODLE_URL
}
"
)
COMMAND cd
${
CMAKE_CURRENT_BINARY_DIR
}
&& wget --no-check-certificate
${
ANAKIN_MODLE_URL
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
cc_test
(
inference_anakin_test SRCS api_anakin_engine_tester.cc
cc_test
(
inference_anakin_test SRCS api_anakin_engine_tester.cc
ARGS --model=
${
CMAKE_CURRENT_BINARY
_DIR
}
/mobilenet_v2.anakin.bin
ARGS --model=
${
ANAKIN_INSTAL
_DIR
}
/mobilenet_v2.anakin.bin
DEPS inference_anakin_api_shared dynload_cuda SERIAL
)
DEPS inference_anakin_api_shared dynload_cuda SERIAL
)
target_compile_options
(
inference_anakin_test BEFORE PUBLIC
${
ANAKIN_COMPILE_EXTRA_FLAGS
}
)
target_compile_options
(
inference_anakin_test BEFORE PUBLIC
${
ANAKIN_COMPILE_EXTRA_FLAGS
}
)
endif
(
WITH_TESTING
)
endif
(
WITH_TESTING
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录