From 6e6d77432fb2f77af6b30e638f2d6eeef974ee12 Mon Sep 17 00:00:00 2001
From: Topdu <784990967@qq.com>
Date: Mon, 27 Jun 2022 09:01:38 +0000
Subject: [PATCH] fix ci export bug

---
 configs/rec/rec_r45_abinet.yml                |  2 --
 configs/rec/rec_svtrnet.yml                   |  2 --
 configs/rec/rec_svtrnet_ch.yml                |  4 ----
 ppocr/data/imaug/rec_img_aug.py               | 17 ++---------------
 test_tipc/configs/rec_svtrnet/rec_svtrnet.yml |  6 ++----
 5 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/configs/rec/rec_r45_abinet.yml b/configs/rec/rec_r45_abinet.yml
index 3cf4cddb..1e03db8b 100644
--- a/configs/rec/rec_r45_abinet.yml
+++ b/configs/rec/rec_r45_abinet.yml
@@ -72,7 +72,6 @@ Train:
           ignore_index: *ignore_index
       - ABINetRecResizeImg:
           image_shape: [3, 32, 128]
-          padding: False
       - KeepKeys:
           keep_keys: ['image', 'label', 'length'] # dataloader will return list in this order
   loader:
@@ -93,7 +92,6 @@ Eval:
           ignore_index: *ignore_index
       - ABINetRecResizeImg:
           image_shape: [3, 32, 128]
-          padding: False
       - KeepKeys:
           keep_keys: ['image', 'label', 'length'] # dataloader will return list in this order
   loader:
diff --git a/configs/rec/rec_svtrnet.yml b/configs/rec/rec_svtrnet.yml
index 5896b105..c1f5cc38 100644
--- a/configs/rec/rec_svtrnet.yml
+++ b/configs/rec/rec_svtrnet.yml
@@ -84,7 +84,6 @@ Train:
           channel_first: False
       - CTCLabelEncode: # Class handling label
       - SVTRRecResizeImg:
-          character_dict_path:
           image_shape: [3, 64, 256]
           padding: False
       - KeepKeys:
@@ -105,7 +104,6 @@ Eval:
           channel_first: False
       - CTCLabelEncode: # Class handling label
       - SVTRRecResizeImg:
-          character_dict_path:
           image_shape: [3, 64, 256]
           padding: False
       - KeepKeys:
diff --git a/configs/rec/rec_svtrnet_ch.yml b/configs/rec/rec_svtrnet_ch.yml
index c4ce4ccc..0d3f63d1 100644
--- a/configs/rec/rec_svtrnet_ch.yml
+++ b/configs/rec/rec_svtrnet_ch.yml
@@ -110,8 +110,6 @@ Train:
     - RecAug: null
     - CTCLabelEncode: null
     - SVTRRecResizeImg:
-        character_dict_path: null
-        infer_mode: False
         image_shape:
         - 3
         - 32
@@ -139,8 +137,6 @@ Eval:
         channel_first: false
     - CTCLabelEncode: null
     - SVTRRecResizeImg:
-        character_dict_path: null
-        infer_mode: False
         image_shape:
         - 3
         - 32
diff --git a/ppocr/data/imaug/rec_img_aug.py b/ppocr/data/imaug/rec_img_aug.py
index 1de8e6ee..26773d0a 100644
--- a/ppocr/data/imaug/rec_img_aug.py
+++ b/ppocr/data/imaug/rec_img_aug.py
@@ -312,14 +312,8 @@ class GrayRecResizeImg(object):
 
 
 class ABINetRecResizeImg(object):
-    def __init__(self,
-                 image_shape,
-                 infer_mode=False,
-                 character_dict_path=None,
-                 **kwargs):
+    def __init__(self, image_shape, **kwargs):
         self.image_shape = image_shape
-        self.infer_mode = infer_mode
-        self.character_dict_path = character_dict_path
 
     def __call__(self, data):
         img = data['image']
@@ -330,15 +324,8 @@ class ABINetRecResizeImg(object):
 
 
 class SVTRRecResizeImg(object):
-    def __init__(self,
-                 image_shape,
-                 infer_mode=False,
-                 character_dict_path='./ppocr/utils/ppocr_keys_v1.txt',
-                 padding=True,
-                 **kwargs):
+    def __init__(self, image_shape, padding=True, **kwargs):
         self.image_shape = image_shape
-        self.infer_mode = infer_mode
-        self.character_dict_path = character_dict_path
         self.padding = padding
 
     def __call__(self, data):
diff --git a/test_tipc/configs/rec_svtrnet/rec_svtrnet.yml b/test_tipc/configs/rec_svtrnet/rec_svtrnet.yml
index bffd8ac0..140b17e0 100644
--- a/test_tipc/configs/rec_svtrnet/rec_svtrnet.yml
+++ b/test_tipc/configs/rec_svtrnet/rec_svtrnet.yml
@@ -84,8 +84,7 @@ Train:
           img_mode: BGR
           channel_first: False
       - CTCLabelEncode: # Class handling label
-      - RecResizeImg:
-          character_dict_path:
+      - SVTRRecResizeImg:
           image_shape: [3, 64, 256]
           padding: False
       - KeepKeys:
@@ -106,8 +105,7 @@ Eval:
           img_mode: BGR
           channel_first: False
       - CTCLabelEncode: # Class handling label
-      - RecResizeImg:
-          character_dict_path:
+      - SVTRRecResizeImg:
           image_shape: [3, 64, 256]
           padding: False
       - KeepKeys:
-- 
GitLab