Yaxin
/
Wafer_Inspection
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码优化

Browse Source
main
熊继淙 1 year ago
parent e1119953ac
commit 2cd5976bde
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

6
Code/MF_TRTInfer/MA_TRTInferAlgoBase.cpp
Unescape Escape View File

@ -2,7 +2,7 @@
#include "ML_Log.h" #include "ML_Log.h"
#include <time.h> #include <time.h>
MA_TRTInferAlgoBase::MA_TRTInferAlgoBase(const utils::InitParameter& param) MA_TRTInferAlgoBase::MA_TRTInferAlgoBase(const trtUtils::InitParameter& param)
{ {
mStream = nullptr; mStream = nullptr;
m_param = param; m_param = param;
@ -71,12 +71,12 @@ bool MA_TRTInferAlgoBase::check()
return true; return true;
} }
bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector<MN_VisionImage::MS_ImageParam>& _bufImgs, std::vector<utils::MR_Result>* _detectRes, int* _user) bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector<MN_VisionImage::MS_ImageParam>& _bufImgs, std::vector<trtUtils::MR_Result>* _detectRes, int* _user)
{ {
return true; return true;
} }
bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector<cv::Mat>& _bufImgs, std::vector<utils::MR_Result>* _detectRes, int* _user) bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector<cv::Mat>& _bufImgs, std::vector<trtUtils::MR_Result>* _detectRes, int* _user)
{ {
return true; return true;
} }

8
Code/MF_TRTInfer/MA_TRTInferAlgoBase.h
Unescape Escape View File

@ -7,13 +7,13 @@ class ML_Log;
class MA_TRTInferAlgoBase : public MI_VisionInterface class MA_TRTInferAlgoBase : public MI_VisionInterface
{ {
public: public:
MA_TRTInferAlgoBase(const utils::InitParameter& param); MA_TRTInferAlgoBase(const trtUtils::InitParameter& param);
~MA_TRTInferAlgoBase(); ~MA_TRTInferAlgoBase();
virtual bool initEngine(const std::string& _onnxFileName); virtual bool initEngine(const std::string& _onnxFileName);
virtual bool check(); virtual bool check();
virtual bool doTRTInfer(const std::vector<MN_VisionImage::MS_ImageParam>& _bufImgs, std::vector<utils::MR_Result>* _detectRes, int* _user); virtual bool doTRTInfer(const std::vector<MN_VisionImage::MS_ImageParam>& _bufImgs, std::vector<trtUtils::MR_Result>* _detectRes, int* _user);
virtual bool doTRTInfer(const std::vector<cv::Mat>& _matImgs, std::vector<utils::MR_Result>* _detectRes, int* _user); virtual bool doTRTInfer(const std::vector<cv::Mat>& _matImgs, std::vector<trtUtils::MR_Result>* _detectRes, int* _user);
virtual std::string getError(); virtual std::string getError();
virtual void freeMemeory(); virtual void freeMemeory();
@ -42,7 +42,7 @@ protected:
std::unique_ptr<nvinfer1::ICudaEngine> m_engine{ nullptr }; std::unique_ptr<nvinfer1::ICudaEngine> m_engine{ nullptr };
std::unique_ptr<nvinfer1::IExecutionContext> m_context{ nullptr }; std::unique_ptr<nvinfer1::IExecutionContext> m_context{ nullptr };
cudaStream_t mStream{ nullptr }; cudaStream_t mStream{ nullptr };
utils::InitParameter m_param; trtUtils::InitParameter m_param;
std::shared_ptr<ML_Log> mLogPtr{ nullptr }; std::shared_ptr<ML_Log> mLogPtr{ nullptr };
}; };

2
Code/MF_TRTInfer/MF_ImageClassificationBase.cpp
Unescape Escape View File

@ -1,6 +1,6 @@
#include "MF_ImageClassificationBase.h" #include "MF_ImageClassificationBase.h"
MF_ImageClassificationBase::MF_ImageClassificationBase(const utils::InitParameter& _param):MA_TRTInferAlgoBase(_param) MF_ImageClassificationBase::MF_ImageClassificationBase(const trtUtils::InitParameter& _param):MA_TRTInferAlgoBase(_param)
{ {
} }

2
Code/MF_TRTInfer/MF_ImageClassificationBase.h
Unescape Escape View File

@ -5,7 +5,7 @@
class MF_ImageClassificationBase : public MA_TRTInferAlgoBase class MF_ImageClassificationBase : public MA_TRTInferAlgoBase
{ {
public: public:
MF_ImageClassificationBase(const utils::InitParameter& _param); MF_ImageClassificationBase(const trtUtils::InitParameter& _param);
~MF_ImageClassificationBase(); ~MF_ImageClassificationBase();

Write Preview
Loading…
Cancel
Save