apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-24 17:10:35 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix conflict for ascend

Browse Source
This commit is contained in:
yunyaoXYY
2022-12-19 10:15:53 +00:00
parent e7eea47b8b
commit f920096e7c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fastdeploy/fastdeploy_model.cc
View File

@@ -73,6 +73,7 @@ bool FastDeployModel::InitRuntimeWithSpecifiedBackend() {
if (!IsSupported(valid_cann_backends, runtime_option.backend)) { if (!IsSupported(valid_cann_backends, runtime_option.backend)) {
FDERROR << "The valid cann backends of model " << ModelName() << " are " << Str(valid_cann_backends) << ", " << runtime_option.backend << " is not supported." << std::endl; FDERROR << "The valid cann backends of model " << ModelName() << " are " << Str(valid_cann_backends) << ", " << runtime_option.backend << " is not supported." << std::endl;
return false; return false;
}
} else if (use_xpu) { } else if (use_xpu) {
if (!IsSupported(valid_xpu_backends, runtime_option.backend)) { if (!IsSupported(valid_xpu_backends, runtime_option.backend)) {
FDERROR << "The valid xpu backends of model " << ModelName() << " are " << Str(valid_xpu_backends) << ", " << runtime_option.backend << " is not supported." << std::endl; FDERROR << "The valid xpu backends of model " << ModelName() << " are " << Str(valid_xpu_backends) << ", " << runtime_option.backend << " is not supported." << std::endl;

2
fastdeploy/fastdeploy_model.h
View File

@@ -151,7 +151,9 @@ class FASTDEPLOY_DECL FastDeployModel {
bool CreateTimVXBackend(); bool CreateTimVXBackend();
bool CreateXPUBackend(); bool CreateXPUBackend();
bool CreateCANNBackend(); bool CreateCANNBackend();
std::shared_ptr<Runtime> runtime_; std::shared_ptr<Runtime> runtime_;
bool runtime_initialized_ = false;
// whether to record inference time // whether to record inference time
bool enable_record_time_of_runtime_ = false; bool enable_record_time_of_runtime_ = false;

2
fastdeploy/vision/ocr/ppocr/rec_preprocessor.cc
View File

@@ -45,10 +45,10 @@ void OcrRecognizerResizeImage(FDMat* mat, float max_wh_ratio,
void OcrRecognizerResizeImageOnAscend(FDMat* mat, void OcrRecognizerResizeImageOnAscend(FDMat* mat,
const std::vector<int>& rec_image_shape) { const std::vector<int>& rec_image_shape) {
int img_h, img_w;
img_h = rec_image_shape[1]; img_h = rec_image_shape[1];
img_w = rec_image_shape[2]; img_w = rec_image_shape[2];
if (mat->Width() >= img_w) { if (mat->Width() >= img_w) {
Resize::Run(mat, img_w, img_h); // Reszie W to 320 Resize::Run(mat, img_w, img_h); // Reszie W to 320
} else { } else {