apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2026-05-06 07:28:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FlyCV] optimize the integration of FlyCV (#492)

Browse Source 
* [Backend] fix lite backend save model error

* [Backend] fixed typos

* [FlyCV] optimize the integration of FlyCV

* [cmake] close some tests options

* [cmake] close some test option

* [FlyCV] remove un-need warnings

* [FlyCV] remove un-need GetMat method

* [FlyCV] optimize FlyCV codes

* [cmake] remove un-need cmake function in examples/CMakelists

* [cmake] support gflags for Android
This commit is contained in:
DefTruth
2022-11-04 09:19:03 +08:00
committed by GitHub
parent 5b1fecd668
commit a36d49a973
56 changed files with 670 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fastdeploy/vision/common/processors/base.cc
+101 -14
View File
@@ -13,6 +13,7 @@
// limitations under the License.
#include "fastdeploy/vision/common/processors/base.h"
#include "fastdeploy/utils/utils.h"
namespace fastdeploy {
@@ -21,27 +22,18 @@ namespace vision {
ProcLib Processor::default_lib = ProcLib::DEFAULT;
bool Processor::operator()(Mat* mat, ProcLib lib) {
// if default_lib is set
// then use default_lib
ProcLib target = lib;
if (default_lib != ProcLib::DEFAULT) {
if (lib == ProcLib::DEFAULT) {
target = default_lib;
}
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);
return ImplByFlyCV(mat);
#else
FDASSERT(false, "FastDeploy didn't compile with FalconCV.");
FDASSERT(false, "FastDeploy didn't compile with FlyCV.");
#endif
}
// DEFAULT & OPENCV
return ImplByOpenCV(mat);
}
@@ -52,7 +44,7 @@ void EnableFlyCV() {
<< Processor::default_lib << std::endl;
#else
FDWARNING << "FastDeploy didn't compile with FlyCV, "
"will fallback to use OpenCV instead."
"will fallback to use OpenCV instead."
<< std::endl;
#endif
}
@@ -63,5 +55,100 @@ void DisableFlyCV() {
<< Processor::default_lib << std::endl;
}
cv::Mat CreateOpenCVMatFromTensor(const FDTensor& tensor) {
FDDataType type = tensor.dtype;
FDASSERT(tensor.shape.size() == 3,
"When create FD Mat from tensor, tensor shape should be 3-Dim, HWC "
"layout");
int64_t height = tensor.shape[0];
int64_t width = tensor.shape[1];
int64_t channel = tensor.shape[2];
cv::Mat ocv_mat;
// reference to outside FDTensor, zero copy
switch (type) {
case FDDataType::UINT8:
ocv_mat = cv::Mat(height, width, CV_8UC(channel),
const_cast<void*>(tensor.Data()));
break;
case FDDataType::INT8:
ocv_mat = cv::Mat(height, width, CV_8SC(channel),
const_cast<void*>(tensor.Data()));
break;
case FDDataType::INT16:
ocv_mat = cv::Mat(height, width, CV_16SC(channel),
const_cast<void*>(tensor.Data()));
break;
case FDDataType::INT32:
ocv_mat = cv::Mat(height, width, CV_32SC(channel),
const_cast<void*>(tensor.Data()));
break;
case FDDataType::FP32:
ocv_mat = cv::Mat(height, width, CV_32FC(channel),
const_cast<void*>(tensor.Data()));
break;
case FDDataType::FP64:
ocv_mat = cv::Mat(height, width, CV_64FC(channel),
const_cast<void*>(tensor.Data()));
break;
default:
FDASSERT(false,
"Tensor type %d is not supported While calling "
"CreateFDMatFromTensor.",
type);
break;
}
return ocv_mat;
}
#ifdef ENABLE_FLYCV
fcv::Mat CreateFlyCVMatFromTensor(const FDTensor& tensor) {
FDDataType type = tensor.dtype;
FDASSERT(tensor.shape.size() == 3,
"When create FD Mat from tensor, tensor shape should be 3-Dim, HWC "
"layout");
int64_t height = tensor.shape[0];
int64_t width = tensor.shape[1];
int64_t channel = tensor.shape[2];
fcv::Mat fcv_mat;
auto fcv_type = CreateFlyCVDataType(type, static_cast<int>(channel));
switch (type) {
case FDDataType::UINT8:
fcv_mat =
fcv::Mat(width, height, fcv_type, const_cast<void*>(tensor.Data()));
break;
case FDDataType::FP32:
fcv_mat =
fcv::Mat(width, height, fcv_type, const_cast<void*>(tensor.Data()));
break;
case FDDataType::FP64:
fcv_mat =
fcv::Mat(width, height, fcv_type, const_cast<void*>(tensor.Data()));
break;
default:
FDASSERT(false,
"Tensor type %d is not supported While calling "
"CreateFDMatFromTensor.",
type);
break;
}
return fcv_mat;
}
#endif
Mat CreateFDMatFromTensor(const FDTensor& tensor) {
if (Processor::default_lib == ProcLib::FLYCV) {
#ifdef ENABLE_FLYCV
fcv::Mat fcv_mat = CreateFlyCVMatFromTensor(tensor);
Mat mat = Mat(fcv_mat);
return mat;
#else
FDASSERT(false, "FastDeploy didn't compiled with FlyCV!");
#endif
}
cv::Mat ocv_mat = CreateOpenCVMatFromTensor(tensor);
Mat mat = Mat(ocv_mat);
return mat;
}
} // namespace vision
} // namespace fastdeploy