diff --git a/Code/MF_TRTInfer/MA_TRTInferAlgoBase.cpp b/Code/MF_TRTInfer/MA_TRTInferAlgoBase.cpp index dc4826a..b4654bf 100644 --- a/Code/MF_TRTInfer/MA_TRTInferAlgoBase.cpp +++ b/Code/MF_TRTInfer/MA_TRTInferAlgoBase.cpp @@ -2,7 +2,7 @@ #include "ML_Log.h" #include -MA_TRTInferAlgoBase::MA_TRTInferAlgoBase(const utils::InitParameter& param) +MA_TRTInferAlgoBase::MA_TRTInferAlgoBase(const trtUtils::InitParameter& param) { mStream = nullptr; m_param = param; @@ -71,12 +71,12 @@ bool MA_TRTInferAlgoBase::check() return true; } -bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector& _bufImgs, std::vector* _detectRes, int* _user) +bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector& _bufImgs, std::vector* _detectRes, int* _user) { return true; } -bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector& _bufImgs, std::vector* _detectRes, int* _user) +bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector& _bufImgs, std::vector* _detectRes, int* _user) { return true; } diff --git a/Code/MF_TRTInfer/MA_TRTInferAlgoBase.h b/Code/MF_TRTInfer/MA_TRTInferAlgoBase.h index 4535c8c..ddd015a 100644 --- a/Code/MF_TRTInfer/MA_TRTInferAlgoBase.h +++ b/Code/MF_TRTInfer/MA_TRTInferAlgoBase.h @@ -7,13 +7,13 @@ class ML_Log; class MA_TRTInferAlgoBase : public MI_VisionInterface { public: - MA_TRTInferAlgoBase(const utils::InitParameter& param); + MA_TRTInferAlgoBase(const trtUtils::InitParameter& param); ~MA_TRTInferAlgoBase(); virtual bool initEngine(const std::string& _onnxFileName); virtual bool check(); - virtual bool doTRTInfer(const std::vector& _bufImgs, std::vector* _detectRes, int* _user); - virtual bool doTRTInfer(const std::vector& _matImgs, std::vector* _detectRes, int* _user); + virtual bool doTRTInfer(const std::vector& _bufImgs, std::vector* _detectRes, int* _user); + virtual bool doTRTInfer(const std::vector& _matImgs, std::vector* _detectRes, int* _user); virtual std::string getError(); virtual void freeMemeory(); @@ -42,7 +42,7 @@ protected: std::unique_ptr m_engine{ nullptr }; std::unique_ptr m_context{ nullptr }; cudaStream_t mStream{ nullptr }; - utils::InitParameter m_param; + trtUtils::InitParameter m_param; std::shared_ptr mLogPtr{ nullptr }; }; diff --git a/Code/MF_TRTInfer/MF_ImageClassificationBase.cpp b/Code/MF_TRTInfer/MF_ImageClassificationBase.cpp index 55737c0..9e11c14 100644 --- a/Code/MF_TRTInfer/MF_ImageClassificationBase.cpp +++ b/Code/MF_TRTInfer/MF_ImageClassificationBase.cpp @@ -1,6 +1,6 @@ #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) { } diff --git a/Code/MF_TRTInfer/MF_ImageClassificationBase.h b/Code/MF_TRTInfer/MF_ImageClassificationBase.h index 0fd6d2a..e2cbc59 100644 --- a/Code/MF_TRTInfer/MF_ImageClassificationBase.h +++ b/Code/MF_TRTInfer/MF_ImageClassificationBase.h @@ -5,7 +5,7 @@ class MF_ImageClassificationBase : public MA_TRTInferAlgoBase { public: - MF_ImageClassificationBase(const utils::InitParameter& _param); + MF_ImageClassificationBase(const trtUtils::InitParameter& _param); ~MF_ImageClassificationBase();