Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
640196c4
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
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看板
未验证
提交
640196c4
编写于
6月 09, 2020
作者:
S
silingtong123
提交者:
GitHub
6月 09, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test=develop, remove the tensorrt dll file from windows package (#24922)
上级
feba1318
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
5 addition
and
14 deletion
+5
-14
paddle/fluid/inference/api/demo_ci/CMakeLists.txt
paddle/fluid/inference/api/demo_ci/CMakeLists.txt
+4
-1
paddle/fluid/inference/api/demo_ci/run_windows_demo.bat
paddle/fluid/inference/api/demo_ci/run_windows_demo.bat
+1
-8
python/setup.py.in
python/setup.py.in
+0
-5
未找到文件。
paddle/fluid/inference/api/demo_ci/CMakeLists.txt
浏览文件 @
640196c4
...
...
@@ -72,7 +72,10 @@ if(WITH_GPU)
endif
()
if
(
USE_TENSORRT AND WITH_GPU
)
set
(
TENSORRT_ROOT
${
PADDLE_LIB_THIRD_PARTY_PATH
}
tensorrt
)
set
(
TENSORRT_ROOT
""
CACHE STRING
"The root directory of TensorRT library"
)
if
(
"
${
TENSORRT_ROOT
}
"
STREQUAL
""
)
message
(
FATAL_ERROR
"The TENSORRT_ROOT is empty, you must assign it a value with CMake command. Such as: -DTENSORRT_ROOT=TENSORRT_ROOT_PATH "
)
endif
()
set
(
TENSORRT_INCLUDE_DIR
${
TENSORRT_ROOT
}
/include
)
set
(
TENSORRT_LIB_DIR
${
TENSORRT_ROOT
}
/lib
)
endif
()
...
...
paddle/fluid/inference/api/demo_ci/run_windows_demo.bat
浏览文件 @
640196c4
...
...
@@ -87,14 +87,7 @@ IF NOT EXIST "%source_path%\%demo_name%.cc" (
if
"
%demo_name%
"
==
"windows_mobilenet"
set
model_name
=
mobilenet
if
"
%demo_name%
"
==
"vis_demo"
set
model_name
=
mobilenet
if
"
%demo_name%
"
==
"simple_on_word2vec"
set
model_name
=
word2vec
.inference.model
if
"
%demo_name%
"
==
"trt_mobilenet_demo"
(
echo
"The trt_mobilenet_demo need tensorRT inference library"
if
NOT
exist
"
%paddle_infernece_lib%
\third_party\install\tensorrt"
(
echo
"------------It's not a tensorRT inference library------------"
goto
:eof
)
set
model_name
=
mobilenet
)
if
"
%demo_name%
"
==
"trt_mobilenet_demo"
set
model_name
=
mobilenet
rem download model
if
NOT
EXIST
"
%source_path%
\
%model_name%
.tar.gz"
(
...
...
python/setup.py.in
浏览文件 @
640196c4
...
...
@@ -252,11 +252,6 @@ package_data['paddle.libs']= []
package_data['paddle.libs']=[('libwarpctc' if os.name != 'nt' else 'warpctc') + ext_name]
shutil.copy('${WARPCTC_LIBRARIES}', libs_path)
if '${TENSORRT_FOUND}' == 'ON' and os.name == 'nt':
shutil.copy(os.path.join('${TENSORRT_LIBRARY_DIR}', '${TR_INFER_RT}'), libs_path)
shutil.copy(os.path.join('${TENSORRT_LIBRARY_DIR}', '${TR_INFER_PLUGIN_RT}'), libs_path)
package_data['paddle.libs'] += ['${TR_INFER_RT}', '${TR_INFER_PLUGIN_RT}']
if '${WITH_MKL}' == 'ON':
shutil.copy('${MKLML_SHARED_LIB}', libs_path)
shutil.copy('${MKLML_SHARED_IOMP_LIB}', libs_path)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录