From 6c3bb193070bcffd6539af370fe3ead78650791e Mon Sep 17 00:00:00 2001 From: sudemqaq Date: Thu, 3 Aug 2023 13:03:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=20issues=20https://github.com/FeiYull/Tenso?= =?UTF-8?q?rRT-Alpha/issues/34=20=E4=BF=AE=E6=AD=A3=E5=9C=A8tensorrt=208.6?= =?UTF-8?q?.1.6=20=E4=B8=AD=E7=BC=BA=E5=A4=B1=E7=9A=84=E5=AF=B9=20/samples?= =?UTF-8?q?/common/sampleUtils.h=20=E5=BC=95=E7=94=A8=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- efficientdet/CMakeLists.txt | 4 +++- facemesh/CMakeLists.txt | 4 +++- libfacedetection/CMakeLists.txt | 4 +++- pphumanseg/CMakeLists.txt | 4 +++- u2net/CMakeLists.txt | 4 +++- utils/common_include.h | 2 ++ yolor/CMakeLists.txt | 4 +++- yolov3/CMakeLists.txt | 4 +++- yolov4/CMakeLists.txt | 4 +++- yolov5/CMakeLists.txt | 4 +++- yolov6/CMakeLists.txt | 4 +++- yolov7/CMakeLists.txt | 4 +++- yolov8/CMakeLists.txt | 4 +++- yolox/CMakeLists.txt | 4 +++- 14 files changed, 41 insertions(+), 13 deletions(-) diff --git a/efficientdet/CMakeLists.txt b/efficientdet/CMakeLists.txt index d40a80b..f734628 100644 --- a/efficientdet/CMakeLists.txt +++ b/efficientdet/CMakeLists.txt @@ -21,7 +21,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_efficientdet.cpp) message(*********************************************************) diff --git a/facemesh/CMakeLists.txt b/facemesh/CMakeLists.txt index 04937e2..658b1da 100644 --- a/facemesh/CMakeLists.txt +++ b/facemesh/CMakeLists.txt @@ -20,7 +20,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_facemesh.cpp) message(*********************************************************) diff --git a/libfacedetection/CMakeLists.txt b/libfacedetection/CMakeLists.txt index 18b5d08..9a56660 100644 --- a/libfacedetection/CMakeLists.txt +++ b/libfacedetection/CMakeLists.txt @@ -22,7 +22,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_libfacedetction.cpp) message(*********************************************************) diff --git a/pphumanseg/CMakeLists.txt b/pphumanseg/CMakeLists.txt index 55debb3..b373394 100644 --- a/pphumanseg/CMakeLists.txt +++ b/pphumanseg/CMakeLists.txt @@ -21,7 +21,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_pphunmanseg.cpp) message(*********************************************************) diff --git a/u2net/CMakeLists.txt b/u2net/CMakeLists.txt index 866a4ce..6f3754a 100644 --- a/u2net/CMakeLists.txt +++ b/u2net/CMakeLists.txt @@ -21,7 +21,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS u2net.cpp) message(*********************************************************) diff --git a/utils/common_include.h b/utils/common_include.h index 8b4fee5..a7f2112 100644 --- a/utils/common_include.h +++ b/utils/common_include.h @@ -1,6 +1,8 @@ #pragma once // tensorrt #include +// fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 +#include #include #include diff --git a/yolor/CMakeLists.txt b/yolor/CMakeLists.txt index 8ea16d1..090877b 100644 --- a/yolor/CMakeLists.txt +++ b/yolor/CMakeLists.txt @@ -20,7 +20,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_yolor.cpp) message(*********************************************************) diff --git a/yolov3/CMakeLists.txt b/yolov3/CMakeLists.txt index 5d699d4..b335068 100644 --- a/yolov3/CMakeLists.txt +++ b/yolov3/CMakeLists.txt @@ -20,7 +20,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_yolov3.cpp) message(*********************************************************) diff --git a/yolov4/CMakeLists.txt b/yolov4/CMakeLists.txt index ae8d541..84175ac 100644 --- a/yolov4/CMakeLists.txt +++ b/yolov4/CMakeLists.txt @@ -21,7 +21,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_yolov4.cpp) message(*********************************************************) diff --git a/yolov5/CMakeLists.txt b/yolov5/CMakeLists.txt index 055f6b7..efaf316 100644 --- a/yolov5/CMakeLists.txt +++ b/yolov5/CMakeLists.txt @@ -21,7 +21,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_yolov5.cpp) message(*********************************************************) diff --git a/yolov6/CMakeLists.txt b/yolov6/CMakeLists.txt index f25fae8..6f9519f 100644 --- a/yolov6/CMakeLists.txt +++ b/yolov6/CMakeLists.txt @@ -20,7 +20,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_yolov6.cpp) message(*********************************************************) diff --git a/yolov7/CMakeLists.txt b/yolov7/CMakeLists.txt index 1a89b60..9b8677e 100644 --- a/yolov7/CMakeLists.txt +++ b/yolov7/CMakeLists.txt @@ -20,7 +20,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_yolov7.cpp) message(*********************************************************) diff --git a/yolov8/CMakeLists.txt b/yolov8/CMakeLists.txt index db34741..af0f8b1 100644 --- a/yolov8/CMakeLists.txt +++ b/yolov8/CMakeLists.txt @@ -21,7 +21,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_yolov8.cpp) message(*********************************************************) diff --git a/yolox/CMakeLists.txt b/yolox/CMakeLists.txt index a92e8c8..a51c5cc 100644 --- a/yolox/CMakeLists.txt +++ b/yolox/CMakeLists.txt @@ -21,7 +21,9 @@ file(GLOB CPPS ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/../utils/*.cpp ${TensorRT_ROOT}/samples/common/logger.cpp - ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + ${TensorRT_ROOT}/samples/common/sampleOptions.cpp + #fix issues https://github.com/FeiYull/TensorRT-Alpha/issues/34 + ${TensorRT_ROOT}/samples/common/sampleUtils.cpp ) list(REMOVE_ITEM CPPS app_yolox.cpp) message(*********************************************************)