Merge pull request #6071 from tink2123/fix_mkldnn

fix mkldnn for ppocrv3, and fix some typo

ppocr/data/imaug/label_ops.py

@@ -113,14 +113,14 @@ class BaseRecLabelEncode(object):
             dict_character = list(self.character_str)
             self.lower = True
         else:
-            self.character_str = ""
+            self.character_str = []
             with open(character_dict_path, "rb") as fin:
                 lines = fin.readlines()
                 for line in lines:
                     line = line.decode('utf-8').strip("\n").strip("\r\n")
-                    self.character_str += line
+                    self.character_str.append(line)
             if use_space_char:
-                self.character_str += " "
+                self.character_str.append(" ")
             dict_character = list(self.character_str)
         dict_character = self.add_special_char(dict_character)
         self.dict = {}

tools/infer/utility.py

@@ -301,7 +301,8 @@ def create_predictor(args, mode, logger):
         # enable memory optim
         config.enable_memory_optim()
         config.disable_glog_info()
-
+        config.delete_pass("reshape_transpose_matmul_v2_mkldnn_fuse_pass")
+        config.delete_pass("reshape_transpose_matmul_mkldnn_fuse_pass")
         config.delete_pass("conv_transpose_eltwiseadd_bn_fuse_pass")
         if mode == 'table':
             config.delete_pass("fc_fuse_pass")  # not supported for table