Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MegEngine 天元
MegEngine
提交
33b27be8
MegEngine
项目概览
MegEngine 天元
/
MegEngine
接近 2 年 前同步成功
通知
414
Star
4708
Fork
583
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MegEngine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
33b27be8
编写于
8月 05, 2022
作者:
M
Megvii Engine Team
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(mgb/build): fix trt8 build error
GitOrigin-RevId: 14acc064e0956cd3d18e50ced2f662455986792c
上级
bccda5c4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
9 deletion
+38
-9
CMakeLists.txt
CMakeLists.txt
+1
-2
cmake/tensorrt.cmake
cmake/tensorrt.cmake
+36
-2
scripts/cmake-build/host_build.sh
scripts/cmake-build/host_build.sh
+0
-2
scripts/whl/manylinux2014/Dockerfile
scripts/whl/manylinux2014/Dockerfile
+1
-3
未找到文件。
CMakeLists.txt
浏览文件 @
33b27be8
...
@@ -814,8 +814,7 @@ if(MGE_WITH_CUDA)
...
@@ -814,8 +814,7 @@ if(MGE_WITH_CUDA)
list
(
APPEND MGE_CUDA_LIBS
${
TRT_LIBRARY
}
${
TRT_PLUGIN_LIBRARY
}
)
list
(
APPEND MGE_CUDA_LIBS
${
TRT_LIBRARY
}
${
TRT_PLUGIN_LIBRARY
}
)
else
()
else
()
if
(
TensorRT_VERSION_MAJOR GREATER_EQUAL 8
)
if
(
TensorRT_VERSION_MAJOR GREATER_EQUAL 8
)
list
(
APPEND MGE_CUDA_LIBS -Wl,--whole-archive libnvinfer.so
list
(
APPEND MGE_CUDA_LIBS libnvinfer libnvinfer_plugin
)
libnvinfer_plugin.so -Wl,--no-whole-archive
)
else
()
else
()
list
(
APPEND MGE_CUDA_LIBS -Wl,--whole-archive libnvinfer libnvinfer_plugin
list
(
APPEND MGE_CUDA_LIBS -Wl,--whole-archive libnvinfer libnvinfer_plugin
-Wl,--no-whole-archive
)
-Wl,--no-whole-archive
)
...
...
cmake/tensorrt.cmake
浏览文件 @
33b27be8
...
@@ -36,7 +36,6 @@ else()
...
@@ -36,7 +36,6 @@ else()
PATH_SUFFIXES lib lib64
PATH_SUFFIXES lib lib64
DOC
"TRT plugin library."
)
DOC
"TRT plugin library."
)
endif
()
endif
()
message
(
STATUS
"TRT_LIBRARY:
${
TRT_LIBRARY
}
"
)
if
(
TRT_LIBRARY STREQUAL
"TRT_LIBRARY-NOTFOUND"
)
if
(
TRT_LIBRARY STREQUAL
"TRT_LIBRARY-NOTFOUND"
)
message
(
message
(
FATAL_ERROR
FATAL_ERROR
...
@@ -102,7 +101,42 @@ string(REGEX REPLACE "^#define NV_TENSORRT_PATCH ([0-9]+).*$" "\\1"
...
@@ -102,7 +101,42 @@ string(REGEX REPLACE "^#define NV_TENSORRT_PATCH ([0-9]+).*$" "\\1"
set
(
TRT_VERSION_STRING
set
(
TRT_VERSION_STRING
"
${
TensorRT_VERSION_MAJOR
}
.
${
TensorRT_VERSION_MINOR
}
.
${
TensorRT_VERSION_PATCH
}
"
)
"
${
TensorRT_VERSION_MAJOR
}
.
${
TensorRT_VERSION_MINOR
}
.
${
TensorRT_VERSION_PATCH
}
"
)
if
(
MGE_CUDA_USE_STATIC
)
if
(
TensorRT_VERSION_MAJOR GREATER_EQUAL 8 AND
NOT
(
MSVC OR WIN32
))
set
(
TRT_LIBRARY
"TRT_LIBRARY-NOTFOUND"
)
set
(
TRT_PLUGIN_LIBRARY
"TRT_PLUGIN_LIBRARY-NOTFOUND"
)
find_library
(
TRT_LIBRARY
NAMES libnvinfer.so nvinfer
PATHS
${
ALTER_LD_LIBRARY_PATHS
}
${
TRT_ROOT_DIR
}
${
CMAKE_INSTALL_PREFIX
}
HINTS
${
ALTER_LIBRARY_PATHS
}
PATH_SUFFIXES lib lib64
DOC
"TRT library."
)
find_library
(
TRT_PLUGIN_LIBRARY
NAMES libnvinfer_plugin.so nvinfer_plugin
PATHS
${
ALTER_LD_LIBRARY_PATHS
}
${
TRT_ROOT_DIR
}
${
CMAKE_INSTALL_PREFIX
}
HINTS
${
ALTER_LIBRARY_PATHS
}
PATH_SUFFIXES lib lib64
DOC
"TRT plugin library."
)
message
(
STATUS
"TensorRT8 has been changed to dynamic linking"
)
if
(
TRT_LIBRARY STREQUAL
"TRT_LIBRARY-NOTFOUND"
)
message
(
FATAL_ERROR
"Can not find TensorRT Library, please refer to scripts/cmake-build/BUILD_README.md to init TRT env"
)
endif
()
if
(
TRT_PLUGIN_LIBRARY STREQUAL
"TRT_PLUGIN_LIBRARY-NOTFOUND"
)
message
(
FATAL_ERROR
"Can not find TensorRT Plugin Library, please refer to scripts/cmake-build/BUILD_README.md to init TRT env"
)
endif
()
endif
()
message
(
STATUS
"TRT_LIBRARY:
${
TRT_LIBRARY
}
"
)
if
(
MGE_CUDA_USE_STATIC AND
NOT
(
TensorRT_VERSION_MAJOR GREATER_EQUAL 8
AND
NOT
(
MSVC OR WIN32
)))
add_library
(
libnvinfer STATIC IMPORTED
)
add_library
(
libnvinfer STATIC IMPORTED
)
add_library
(
libnvinfer_plugin STATIC IMPORTED
)
add_library
(
libnvinfer_plugin STATIC IMPORTED
)
else
()
else
()
...
...
scripts/cmake-build/host_build.sh
浏览文件 @
33b27be8
...
@@ -235,8 +235,6 @@ function prepare_env_for_windows_build() {
...
@@ -235,8 +235,6 @@ function prepare_env_for_windows_build() {
export
CUDA_BIN_PATH
=
$CUDA_PATH
export
CUDA_BIN_PATH
=
$CUDA_PATH
export
PC_CUDNN_INCLUDE_DIRS
=
$NIVIDA_INSTALL_PRE
/
${
CUDNN_V
}
/cuda/include
export
PC_CUDNN_INCLUDE_DIRS
=
$NIVIDA_INSTALL_PRE
/
${
CUDNN_V
}
/cuda/include
export
LD_LIBRARY_PATH
=
$LD_LIBRARY_PATH
:
$NIVIDA_INSTALL_PRE
/
${
TRT_V
}
/lib:
$NIVIDA_INSTALL_PRE
/CUDA/
${
CUDA_V
}
/lib/x64:
$NIVIDA_INSTALL_PRE
/
${
CUDNN_V
}
/cuda/lib/x64
export
LD_LIBRARY_PATH
=
$LD_LIBRARY_PATH
:
$NIVIDA_INSTALL_PRE
/
${
TRT_V
}
/lib:
$NIVIDA_INSTALL_PRE
/CUDA/
${
CUDA_V
}
/lib/x64:
$NIVIDA_INSTALL_PRE
/
${
CUDNN_V
}
/cuda/lib/x64
export
CPATH
=
$CPATH
:
$NIVIDA_INSTALL_PRE
/
${
TRT_V
}
/include:
$NIVIDA_INSTALL_PRE
/CUDA/
${
CUDA_V
}
/include:
$NIVIDA_INSTALL_PRE
/CUDA/
${
CUDA_V
}
/include/nvtx3:
$PC_CUDNN_INCLUDE_DIRS
export
LIBRARY_PATH
=
$LIBRARY_PATH
:
$LD_LIBRARY_PATH
export
INCLUDE
=
$INCLUDE
:
$CPATH
export
INCLUDE
=
$INCLUDE
:
$CPATH
export
CUDNN_ROOT_DIR
=
${
NIVIDA_INSTALL_PRE
}
/
${
CUDNN_V
}
/cuda
export
CUDNN_ROOT_DIR
=
${
NIVIDA_INSTALL_PRE
}
/
${
CUDNN_V
}
/cuda
export
TRT_ROOT_DIR
=
${
NIVIDA_INSTALL_PRE
}
/
${
TRT_V
}
export
TRT_ROOT_DIR
=
${
NIVIDA_INSTALL_PRE
}
/
${
TRT_V
}
...
...
scripts/whl/manylinux2014/Dockerfile
浏览文件 @
33b27be8
...
@@ -2,9 +2,7 @@ FROM quay.io/pypa/manylinux2014_x86_64:2020-12-31-56195b3
...
@@ -2,9 +2,7 @@ FROM quay.io/pypa/manylinux2014_x86_64:2020-12-31-56195b3
ENV
UID=1024 \
ENV
UID=1024 \
PATH=${PATH}:/usr/local/cuda/bin \
PATH=${PATH}:/usr/local/cuda/bin \
LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/cuda/lib64:/usr/local/cuda/lib64/stubs:/opt/cudnn/lib64:/opt/tensorrt/lib \
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/cuda/lib64:/usr/local/cuda/lib64/stubs:/opt/cudnn/lib64:/opt/tensorrt/lib
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/cuda/lib64:/usr/local/cuda/lib64/stubs:/opt/cudnn/lib64:/opt/tensorrt/lib \
CPATH=${CPATH}:/usr/local/cuda/include:/opt/cudnn/include:/opt/tensorrt/include
ARG
platform
ARG
platform
COPY
setup_mirror.sh .
COPY
setup_mirror.sh .
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录