Unverified Commit c402c010 authored by Xiaomeng Zhao's avatar Xiaomeng Zhao Committed by GitHub
Browse files

Merge pull request #2072 from opendatalab/dev

refactor(ocr): remove redundant code and improve code quality 
parents 01d1e086 bb30f32e
# Copyright (c) Opendatalab. All rights reserved. # Copyright (c) Opendatalab. All rights reserved.
import copy import copy
import os.path import os.path
import warnings
from pathlib import Path from pathlib import Path
import cv2 import cv2
...@@ -92,7 +93,8 @@ class PytorchPaddleOCR(TextSystem): ...@@ -92,7 +93,8 @@ class PytorchPaddleOCR(TextSystem):
exit(0) exit(0)
img = check_img(img) img = check_img(img)
imgs = [img] imgs = [img]
with warnings.catch_warnings():
warnings.simplefilter("ignore", category=RuntimeWarning)
if det and rec: if det and rec:
ocr_res = [] ocr_res = []
for img in imgs: for img in imgs:
......
...@@ -371,12 +371,6 @@ class TextRecognizer(BaseOCRV20): ...@@ -371,12 +371,6 @@ class TextRecognizer(BaseOCRV20):
gsrm_slf_attn_bias1_inp = torch.from_numpy(gsrm_slf_attn_bias1_list) gsrm_slf_attn_bias1_inp = torch.from_numpy(gsrm_slf_attn_bias1_list)
gsrm_slf_attn_bias2_inp = torch.from_numpy(gsrm_slf_attn_bias2_list) gsrm_slf_attn_bias2_inp = torch.from_numpy(gsrm_slf_attn_bias2_list)
# if self.use_gpu:
# inp = inp.cuda()
# encoder_word_pos_inp = encoder_word_pos_inp.cuda()
# gsrm_word_pos_inp = gsrm_word_pos_inp.cuda()
# gsrm_slf_attn_bias1_inp = gsrm_slf_attn_bias1_inp.cuda()
# gsrm_slf_attn_bias2_inp = gsrm_slf_attn_bias2_inp.cuda()
inp = inp.to(self.device) inp = inp.to(self.device)
encoder_word_pos_inp = encoder_word_pos_inp.to(self.device) encoder_word_pos_inp = encoder_word_pos_inp.to(self.device)
gsrm_word_pos_inp = gsrm_word_pos_inp.to(self.device) gsrm_word_pos_inp = gsrm_word_pos_inp.to(self.device)
...@@ -398,8 +392,6 @@ class TextRecognizer(BaseOCRV20): ...@@ -398,8 +392,6 @@ class TextRecognizer(BaseOCRV20):
with torch.no_grad(): with torch.no_grad():
inp = torch.from_numpy(norm_img_batch) inp = torch.from_numpy(norm_img_batch)
# if self.use_gpu:
# inp = inp.cuda()
inp = inp.to(self.device) inp = inp.to(self.device)
preds = self.net(inp) preds = self.net(inp)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment