From 1c43e8bbb4452e4efc1f7baf6649c2945c1eff2f Mon Sep 17 00:00:00 2001
From: WenmuZhou <zjwenmu@gmail.com>
Date: Mon, 30 Nov 2020 16:54:18 +0800
Subject: [PATCH] Adapt to windows

---
 tools/infer/predict_cls.py | 14 +++++++-------
 tools/infer/predict_det.py |  5 +++--
 tools/infer/predict_rec.py |  7 ++++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/tools/infer/predict_cls.py b/tools/infer/predict_cls.py
index f9c4cc0f..7d7e4720 100755
--- a/tools/infer/predict_cls.py
+++ b/tools/infer/predict_cls.py
@@ -132,7 +132,7 @@ def main(args):
         valid_image_file_list.append(image_file)
         img_list.append(img)
     try:
-        img_list, cls_res, elapse = text_classifier(img_list)
+        img_list, cls_res, predict_time = text_classifier(img_list)
     except Exception as e:
         print(e)
         logger.info(
@@ -143,10 +143,10 @@ def main(args):
             "Please set --rec_image_shape='3,32,100' and --rec_char_type='en' ")
         exit()
     for ino in range(len(img_list)):
-        print("Predicts of %s:%s" % (valid_image_file_list[ino], cls_res[ino]))
-    print("Total predict time for %d images, cost: %.3f" %
-          (len(img_list), elapse))
+        print("Predicts of {}:{}".format(valid_image_file_list[ino], cls_res[
+            ino]))
+    print("Total predict time for {} images, cost: {:.3f}".format(
+        len(img_list), predict_time))
 
-
-if __name__ == "__main__":
-    main(utility.parse_args())
+    if __name__ == "__main__":
+        main(utility.parse_args())
diff --git a/tools/infer/predict_det.py b/tools/infer/predict_det.py
index c395502b..4b4825a6 100755
--- a/tools/infer/predict_det.py
+++ b/tools/infer/predict_det.py
@@ -178,10 +178,11 @@ if __name__ == "__main__":
         if count > 0:
             total_time += elapse
         count += 1
-        print("Predict time of %s:" % image_file, elapse)
+        print("Predict time of {}: {}".format(image_file, elapse))
         src_im = utility.draw_text_det_res(dt_boxes, image_file)
         img_name_pure = os.path.split(image_file)[-1]
-        img_path = os.path.join(draw_img_save, "det_res_%s" % img_name_pure)
+        img_path = os.path.join(draw_img_save,
+                                "det_res_{}".format(img_name_pure))
         cv2.imwrite(img_path, src_im)
     if count > 1:
         print("Avg Time:", total_time / (count - 1))
diff --git a/tools/infer/predict_rec.py b/tools/infer/predict_rec.py
index 749a5fcd..c1f20ef3 100755
--- a/tools/infer/predict_rec.py
+++ b/tools/infer/predict_rec.py
@@ -145,9 +145,10 @@ def main(args):
             "Please set --rec_image_shape='3,32,100' and --rec_char_type='en' ")
         exit()
     for ino in range(len(img_list)):
-        print("Predicts of %s:%s" % (valid_image_file_list[ino], rec_res[ino]))
-    print("Total predict time for %d images, cost: %.3f" %
-          (len(img_list), predict_time))
+        print("Predicts of {}:{}".format(valid_image_file_list[ino], rec_res[
+            ino]))
+    print("Total predict time for {} images, cost: {:.3f}".format(
+        len(img_list), predict_time))
 
 
 if __name__ == "__main__":
-- 
GitLab