diff --git a/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.dll b/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.dll index f7facbe..8e89986 100644 Binary files a/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.dll and b/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.dll differ diff --git a/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.lib b/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.lib index ec376c5..02a50d6 100644 Binary files a/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.lib and b/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.lib differ diff --git a/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.pdb b/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.pdb index 131e6ef..0b40fa5 100644 Binary files a/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.pdb and b/Code/TestTRTInterDll/trtinfer_lib/MF_TRTInfer.pdb differ diff --git a/Code/TestTRTInterDll/trtinfer_lib/include/MI_Interface.h b/Code/TestTRTInterDll/trtinfer_lib/include/MI_Interface.h index 45780ba..0a8e35d 100644 --- a/Code/TestTRTInterDll/trtinfer_lib/include/MI_Interface.h +++ b/Code/TestTRTInterDll/trtinfer_lib/include/MI_Interface.h @@ -14,19 +14,19 @@ public: // 检查模型输入输出 virtual bool check() = 0; // 推理 - virtual bool doTRTInfer(const std::vector& _bufImg, std::vector* _detectRes, int* _user) = 0; + virtual bool doTRTInfer(const std::vector& _bufImg, std::vector* _detectRes, int* _user) = 0; // 推理 - virtual bool doTRTInfer(const std::vector& _matImgs, std::vector* _detectRes, int* _user) = 0; + virtual bool doTRTInfer(const std::vector& _matImgs, std::vector* _detectRes, int* _user) = 0; // 获取错误信息 virtual std::string getError() = 0; // 释放数据/内存 virtual void freeMemeory() = 0; - + // 轴径测量项目接口 virtual bool measureAxis(std::vector& measureRes, const MN_VisionImage::MS_ImageParam& _bufImg) = 0; }; // 导出接口类 -MI_ALGORITHM_EXPORT MI_VisionInterface* getInterfacePtr(const utils::InitParameter& _params); +MI_ALGORITHM_EXPORT MI_VisionInterface* getInterfacePtr(const trtUtils::InitParameter& _params); diff --git a/Code/TestTRTInterDll/trtinfer_lib/include/kernel_function.cuh b/Code/TestTRTInterDll/trtinfer_lib/include/kernel_function.cuh index dbc2e89..9a19408 100644 --- a/Code/TestTRTInterDll/trtinfer_lib/include/kernel_function.cuh +++ b/Code/TestTRTInterDll/trtinfer_lib/include/kernel_function.cuh @@ -11,33 +11,33 @@ bool __check_cuda_runtime(cudaError_t code, const char* op, const char* file, in //note: resize rgb with padding void resizeDevice(const int& batch_size, float* src, int src_width, int src_height, float* dst, int dstWidth, int dstHeight, - float paddingValue, utils::AffineMat matrix); + float paddingValue, trtUtils::AffineMat matrix); //overload:resize rgb with padding, but src's type is uin8 void resizeDevice(const int& batch_size, unsigned char* src, int src_width, int src_height, float* dst, int dstWidth, int dstHeight, - float paddingValue, utils::AffineMat matrix); + float paddingValue, trtUtils::AffineMat matrix); // overload: resize rgb/gray without padding void resizeDevice(const int& batchSize, float* src, int srcWidth, int srcHeight, float* dst, int dstWidth, int dstHeight, - utils::ColorMode mode, utils::AffineMat matrix); + trtUtils::ColorMode mode, trtUtils::AffineMat matrix); void bgr2rgbDevice(const int& batch_size, float* src, int srcWidth, int srcHeight, float* dst, int dstWidth, int dstHeight); void normDevice(const int& batch_size, float* src, int srcWidth, int srcHeight, float* dst, int dstWidth, int dstHeight, - utils::InitParameter norm_param); + trtUtils::InitParameter norm_param); void hwc2chwDevice(const int& batch_size, float* src, int srcWidth, int srcHeight, float* dst, int dstWidth, int dstHeight); -void decodeDevice(utils::InitParameter param, float* src, int srcWidth, int srcHeight, int srcLength, float* dst, int dstWidth, int dstHeight); +void decodeDevice(trtUtils::InitParameter param, float* src, int srcWidth, int srcHeight, int srcLength, float* dst, int dstWidth, int dstHeight); // nms fast -void nmsDeviceV1(utils::InitParameter param, float* src, int srcWidth, int srcHeight, int srcArea); +void nmsDeviceV1(trtUtils::InitParameter param, float* src, int srcWidth, int srcHeight, int srcArea); // nms sort -void nmsDeviceV2(utils::InitParameter param, float* src, int srcWidth, int srcHeight, int srcArea, +void nmsDeviceV2(trtUtils::InitParameter param, float* src, int srcWidth, int srcHeight, int srcArea, int* idx, float* conf); \ No newline at end of file diff --git a/Code/TestTRTInterDll/trtinfer_lib/include/utils.h b/Code/TestTRTInterDll/trtinfer_lib/include/utils.h index 5b3dea6..a21b952 100644 --- a/Code/TestTRTInterDll/trtinfer_lib/include/utils.h +++ b/Code/TestTRTInterDll/trtinfer_lib/include/utils.h @@ -14,7 +14,7 @@ #endif -namespace utils +namespace trtUtils { namespace dataSets {