mirror of
https://github.com/PaddlePaddle/FastDeploy.git
synced 2025-12-24 13:28:13 +08:00
[Model] Integrate FlyCV image processing library (#375)
* Add falcon cmake * Update CMakeLists.txt * Add implementation for more preprocessors * Add more implementation * Add more implementations by flycv * Fix some name * fix some bug * ready to test * add fuse * fix fuse problem * add debug code * add debug * [Android] integrate flycv to Android (#459) * [Android] integrate flycv into Andorid * Falconcv (#27) * [Bug Fix ]Update ppseg visualize python api && demo (#454) Update ppseg visualize python api && demo * [Model] update pptracking letterboxresize and add some comment (#438) * add override mark * delete some * recovery * recovery * add tracking * add tracking py_bind and example * add pptracking * add pptracking * iomanip head file * add opencv_video lib * add python libs package Signed-off-by: ChaoII <849453582@qq.com> * complete comments Signed-off-by: ChaoII <849453582@qq.com> * add jdeTracker_ member variable Signed-off-by: ChaoII <849453582@qq.com> * add 'FASTDEPLOY_DECL' macro Signed-off-by: ChaoII <849453582@qq.com> * remove kwargs params Signed-off-by: ChaoII <849453582@qq.com> * [Doc]update pptracking docs * delete 'ENABLE_PADDLE_FRONTEND' switch * add pptracking unit test * update pptracking unit test Signed-off-by: ChaoII <849453582@qq.com> * modify test video file path and remove trt test * update unit test model url * remove 'FASTDEPLOY_DECL' macro Signed-off-by: ChaoII <849453582@qq.com> * fix build python packages about pptracking on win32 Signed-off-by: ChaoII <849453582@qq.com> * update comment Signed-off-by: ChaoII <849453582@qq.com> * add pptracking model explain Signed-off-by: ChaoII <849453582@qq.com> Signed-off-by: ChaoII <849453582@qq.com> Co-authored-by: Jason <jiangjiajun@baidu.com> Signed-off-by: ChaoII <849453582@qq.com> Co-authored-by: huangjianhui <852142024@qq.com> Co-authored-by: ChaoII <849453582@qq.com> Co-authored-by: Jason <jiangjiajun@baidu.com> * [cmake] optimize examples CMakeLists.txt Signed-off-by: ChaoII <849453582@qq.com> Co-authored-by: huangjianhui <852142024@qq.com> Co-authored-by: ChaoII <849453582@qq.com> Co-authored-by: Jason <jiangjiajun@baidu.com> * remove debug log * remove function * remove function Signed-off-by: ChaoII <849453582@qq.com> Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> Co-authored-by: huangjianhui <852142024@qq.com> Co-authored-by: ChaoII <849453582@qq.com>
This commit is contained in:
@@ -28,8 +28,39 @@ bool Processor::operator()(Mat* mat, ProcLib lib) {
|
||||
target = default_lib;
|
||||
}
|
||||
|
||||
bool ret = ImplByOpenCV(mat);
|
||||
return ret;
|
||||
if (target == ProcLib::FLYCV) {
|
||||
#ifdef ENABLE_FLYCV
|
||||
if (mat->mat_type != ProcLib::FLYCV) {
|
||||
if (mat->layout != Layout::HWC) {
|
||||
FDERROR << "Cannot convert cv::Mat to fcv::Mat while layout is not HWC." << std::endl;
|
||||
}
|
||||
fcv::Mat fcv_mat = ConvertOpenCVMatToFalconCV(*(mat->GetOpenCVMat()));
|
||||
mat->SetMat(fcv_mat);
|
||||
}
|
||||
return ImplByFalconCV(mat);
|
||||
#else
|
||||
FDASSERT(false, "FastDeploy didn't compile with FalconCV.");
|
||||
#endif
|
||||
}
|
||||
return ImplByOpenCV(mat);
|
||||
}
|
||||
|
||||
void EnableFlyCV() {
|
||||
#ifdef ENABLE_FLYCV
|
||||
Processor::default_lib = ProcLib::FLYCV;
|
||||
FDINFO << "Will change to use image processing library "
|
||||
<< Processor::default_lib << std::endl;
|
||||
#else
|
||||
FDWARNING << "FastDeploy didn't compile with FlyCV, "
|
||||
"will fallback to use OpenCV instead."
|
||||
<< std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
void DisableFlyCV() {
|
||||
Processor::default_lib = ProcLib::OPENCV;
|
||||
FDINFO << "Will change to use image processing library "
|
||||
<< Processor::default_lib << std::endl;
|
||||
}
|
||||
|
||||
} // namespace vision
|
||||
|
||||
Reference in New Issue
Block a user