Skip to content

Add model YOLOv5Lite Support #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 1, 2022
Merged

Add model YOLOv5Lite Support #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5c128c4
Add model YOLOv5Lite Support (#53)
ziqi-jin Jul 29, 2022
fc83115
Evaluation support model containing nms (#51)
felixhjh Jul 29, 2022
8b4dce5
Create develop.md
jiangjiajun Jul 29, 2022
ac3fe67
Update linux_and_mac.md
jiangjiajun Jul 29, 2022
4612159
Fix python compilation on OSX (#58)
jiangjiajun Jul 29, 2022
ed3d6f2
Fix requirements (#59)
jiangjiajun Jul 31, 2022
3a2b86f
Update windows.md
jiangjiajun Jul 31, 2022
8e7b540
Fix python usage on Windows (#60)
jiangjiajun Jul 31, 2022
f53a073
Fix python compilation on windows (#61)
jiangjiajun Jul 31, 2022
fc38ec9
fix compile tensorrt on Windows (#62)
jiangjiajun Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,11 @@ if(WITH_GPU)
else()
add_definitions(-DWITH_GPU)
include_directories(${CUDA_DIRECTORY}/include)
find_library(CUDA_LIB cudart ${CUDA_DIRECTORY}/lib64)
if(WIN32)
find_library(CUDA_LIB cudart ${CUDA_DIRECTORY}/lib/x64)
else()
find_library(CUDA_LIB cudart ${CUDA_DIRECTORY}/lib64)
endif()
list(APPEND DEPEND_LIBS ${CUDA_LIB})
endif()
endif()
Expand All @@ -158,7 +162,11 @@ if(ENABLE_TRT_BACKEND)
list(APPEND ALL_DEPLOY_SRCS ${DEPLOY_TRT_SRCS})
find_library(TRT_INFER_LIB nvinfer ${TRT_DIRECTORY}/lib)
find_library(TRT_ONNX_LIB nvonnxparser ${TRT_DIRECTORY}/lib)
find_library(TRT_CAFFE_LIB nvcaffe_parser ${TRT_DIRECTORY}/lib)
if(NOT WIN32)
find_library(TRT_CAFFE_LIB nvcaffe_parser ${TRT_DIRECTORY}/lib)
else()
set(TRT_CAFFE_LIB "")
endif()
find_library(TRT_PLUGIN_LIB nvinfer_plugin ${TRT_DIRECTORY}/lib)
list(APPEND DEPEND_LIBS ${TRT_INFER_LIB} ${TRT_ONNX_LIB} ${TRT_CAFFE_LIB} ${TRT_PLUGIN_LIB})

Expand Down
8 changes: 6 additions & 2 deletions FastDeploy.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ if(WITH_GPU)
if (NOT CUDA_DIRECTORY)
set(CUDA_DIRECTORY "/usr/local/cuda")
endif()
find_library(CUDA_LIB cudart ${CUDA_DIRECTORY}/lib64)
if(WIN32)
find_library(CUDA_LIB cudart ${CUDA_DIRECTORY}/lib/x64)
else()
find_library(CUDA_LIB cudart ${CUDA_DIRECTORY}/lib64)
endif()
if(NOT CUDA_LIB)
message(FATAL_ERROR "[FastDeploy] Cannot find library cudart in ${CUDA_DIRECTORY}, Please define CUDA_DIRECTORY, e.g -DCUDA_DIRECTORY=/path/to/cuda")
endif()
Expand All @@ -62,7 +66,7 @@ endif()

if(ENABLE_VISION)
if(WIN32)
set(OpenCV_DIR ${CMAKE_CURRENT_LIST_DIR}/install/opencv-win-x64-3.4.16/build)
set(OpenCV_DIR ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/opencv-win-x64-3.4.16/build)
find_package(OpenCV REQUIRED PATHS ${OpenCV_DIR})
list(APPEND FASTDEPLOY_INCS ${OpenCV_INCLUDE_DIRS})
list(APPEND FASTDEPLOY_LIBS ${OpenCV_LIBS})
Expand Down
10 changes: 6 additions & 4 deletions csrcs/fastdeploy/backends/tensorrt/common/sampleEngines.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <unordered_map>
#include <vector>

#include "NvCaffeParser.h"
//#include "NvCaffeParser.h"
#include "NvInfer.h"
#include "NvOnnxParser.h"

Expand All @@ -47,9 +47,9 @@ namespace sample {

namespace {

struct CaffeBufferShutter {
~CaffeBufferShutter() { nvcaffeparser1::shutdownProtobufLibrary(); }
};
//struct CaffeBufferShutter {
// ~CaffeBufferShutter() { nvcaffeparser1::shutdownProtobufLibrary(); }
//};

std::map<std::string, float>
readScalesFromCalibrationCache(const std::string& calibrationFile) {
Expand Down Expand Up @@ -121,6 +121,7 @@ Parser modelToNetwork(const ModelOptions& model,
Parser parser;
const std::string& modelName = model.baseModel.model;
switch (model.baseModel.format) {
/*
case ModelFormat::kCAFFE: {
using namespace nvcaffeparser1;
parser.caffeParser.reset(createCaffeParser());
Expand All @@ -145,6 +146,7 @@ Parser modelToNetwork(const ModelOptions& model,
}
break;
}
*/
case ModelFormat::kONNX: {
using namespace nvonnxparser;
parser.onnxParser.reset(
Expand Down
6 changes: 3 additions & 3 deletions csrcs/fastdeploy/backends/tensorrt/common/sampleEngines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <iostream>
#include <vector>

#include "NvCaffeParser.h"
//#include "NvCaffeParser.h"
#include "NvInfer.h"
#include "NvInferConsistency.h"
#include "NvInferSafeRuntime.h"
Expand All @@ -31,10 +31,10 @@
namespace sample {

struct Parser {
TrtUniquePtr<nvcaffeparser1::ICaffeParser> caffeParser;
// TrtUniquePtr<nvcaffeparser1::ICaffeParser> caffeParser;
TrtUniquePtr<nvonnxparser::IParser> onnxParser;

operator bool() const { return caffeParser || onnxParser; }
operator bool() const { return false || onnxParser; }
};

struct BuildEnvironment {
Expand Down
Loading