diff --git a/deploy/cpp_infer/src/preprocess_op.cpp b/deploy/cpp_infer/src/preprocess_op.cpp old mode 100644 new mode 100755 index 87d8dbbd774f7dd29843d9a2c2533368f1914272..37e33aee44167738261db4138793754aa657f22c --- a/deploy/cpp_infer/src/preprocess_op.cpp +++ b/deploy/cpp_infer/src/preprocess_op.cpp @@ -77,19 +77,10 @@ void ResizeImgType0::Run(const cv::Mat &img, cv::Mat &resize_img, int resize_h = int(float(h) * ratio); int resize_w = int(float(w) * ratio); - if (resize_h % 32 == 0) - resize_h = resize_h; - else if (resize_h / 32 < 1 + 1e-5) - resize_h = 32; - else - resize_h = (resize_h / 32) * 32; - if (resize_w % 32 == 0) - resize_w = resize_w; - else if (resize_w / 32 < 1 + 1e-5) - resize_w = 32; - else - resize_w = (resize_w / 32) * 32; + resize_h = max(int(round(float(resize_h) / 32) * 32), 32); + resize_w = max(int(round(float(resize_w) / 32) * 32), 32); + if (!use_tensorrt) { cv::resize(img, resize_img, cv::Size(resize_w, resize_h)); ratio_h = float(resize_h) / float(h); diff --git a/tools/infer/predict_det.py b/tools/infer/predict_det.py index 717a09ecdad9362b7ea6e556c1136f5791d2f06c..3707cb1791482bf2ac458025677db8b7ee98f2ad 100755 --- a/tools/infer/predict_det.py +++ b/tools/infer/predict_det.py @@ -39,7 +39,10 @@ class TextDetector(object): self.args = args self.det_algorithm = args.det_algorithm pre_process_list = [{ - 'DetResizeForTest': None + 'DetResizeForTest': { + 'limit_side_len': args.det_limit_side_len, + 'limit_type': args.det_limit_type + } }, { 'NormalizeImage': { 'std': [0.229, 0.224, 0.225], @@ -160,7 +163,6 @@ class TextDetector(object): shape_list = np.expand_dims(shape_list, axis=0) img = img.copy() starttime = time.time() - self.input_tensor.copy_from_cpu(img) self.predictor.run() outputs = []