Skip to content

GitLab

Commit 6fb61526 authored by Leif's avatar Leif
Browse files

Merge remote-tracking branch 'upstream/dygraph' into dy1

parents 1fd7e118 a78afa23
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10630 additions and 47 deletions
ppocr/modeling/transforms/tps.py
View file @ 6fb61526
...@@ -203,9 +203,9 @@ class GridGenerator(nn.Layer): ...@@ -203,9 +203,9 @@ class GridGenerator(nn.Layer):
def build_C_paddle(self): def build_C_paddle(self):
""" Return coordinates of fiducial points in I_r; C """ """ Return coordinates of fiducial points in I_r; C """
F = self.F F = self.F
ctrl_pts_x = paddle.linspace(-1.0, 1.0, int(F / 2)) ctrl_pts_x = paddle.linspace(-1.0, 1.0, int(F / 2), dtype='float64')
ctrl_pts_y_top = -1 * paddle.ones([int(F / 2)]) ctrl_pts_y_top = -1 * paddle.ones([int(F / 2)], dtype='float64')
ctrl_pts_y_bottom = paddle.ones([int(F / 2)]) ctrl_pts_y_bottom = paddle.ones([int(F / 2)], dtype='float64')
ctrl_pts_top = paddle.stack([ctrl_pts_x, ctrl_pts_y_top], axis=1) ctrl_pts_top = paddle.stack([ctrl_pts_x, ctrl_pts_y_top], axis=1)
ctrl_pts_bottom = paddle.stack([ctrl_pts_x, ctrl_pts_y_bottom], axis=1) ctrl_pts_bottom = paddle.stack([ctrl_pts_x, ctrl_pts_y_bottom], axis=1)
C = paddle.concat([ctrl_pts_top, ctrl_pts_bottom], axis=0) C = paddle.concat([ctrl_pts_top, ctrl_pts_bottom], axis=0)
...@@ -213,12 +213,14 @@ class GridGenerator(nn.Layer): ...@@ -213,12 +213,14 @@ class GridGenerator(nn.Layer):
def build_P_paddle(self, I_r_size): def build_P_paddle(self, I_r_size):
I_r_height, I_r_width = I_r_size I_r_height, I_r_width = I_r_size
I_r_grid_x = ( I_r_grid_x = (paddle.arange(
paddle.arange(-I_r_width, I_r_width, 2).astype('float32') + 1.0 -I_r_width, I_r_width, 2, dtype='float64') + 1.0
) / I_r_width # self.I_r_width ) / paddle.to_tensor(np.array([I_r_width]))
I_r_grid_y = (
paddle.arange(-I_r_height, I_r_height, 2).astype('float32') + 1.0 I_r_grid_y = (paddle.arange(
) / I_r_height # self.I_r_height -I_r_height, I_r_height, 2, dtype='float64') + 1.0
) / paddle.to_tensor(np.array([I_r_height]))
# P: self.I_r_width x self.I_r_height x 2 # P: self.I_r_width x self.I_r_height x 2
P = paddle.stack(paddle.meshgrid(I_r_grid_x, I_r_grid_y), axis=2) P = paddle.stack(paddle.meshgrid(I_r_grid_x, I_r_grid_y), axis=2)
P = paddle.transpose(P, perm=[1, 0, 2]) P = paddle.transpose(P, perm=[1, 0, 2])
...@@ -228,7 +230,7 @@ class GridGenerator(nn.Layer): ...@@ -228,7 +230,7 @@ class GridGenerator(nn.Layer):
def build_inv_delta_C_paddle(self, C): def build_inv_delta_C_paddle(self, C):
""" Return inv_delta_C which is needed to calculate T """ """ Return inv_delta_C which is needed to calculate T """
F = self.F F = self.F
hat_C = paddle.zeros((F, F), dtype='float32') # F x F hat_C = paddle.zeros((F, F), dtype='float64') # F x F
for i in range(0, F): for i in range(0, F):
for j in range(i, F): for j in range(i, F):
if i == j: if i == j:
...@@ -241,13 +243,21 @@ class GridGenerator(nn.Layer): ...@@ -241,13 +243,21 @@ class GridGenerator(nn.Layer):
delta_C = paddle.concat( # F+3 x F+3 delta_C = paddle.concat( # F+3 x F+3
[ [
paddle.concat( paddle.concat(
[paddle.ones((F, 1)), C, hat_C], axis=1), # F x F+3 [paddle.ones(
(F, 1), dtype='float64'), C, hat_C], axis=1), # F x F+3
paddle.concat( paddle.concat(
[paddle.zeros((2, 3)), paddle.transpose( [
C, perm=[1, 0])], paddle.zeros(
(2, 3), dtype='float64'), paddle.transpose(
C, perm=[1, 0])
],
axis=1), # 2 x F+3 axis=1), # 2 x F+3
paddle.concat( paddle.concat(
[paddle.zeros((1, 3)), paddle.ones((1, F))], [
paddle.zeros(
(1, 3), dtype='float64'), paddle.ones(
(1, F), dtype='float64')
],
axis=1) # 1 x F+3 axis=1) # 1 x F+3
], ],
axis=0) axis=0)
...@@ -268,7 +278,9 @@ class GridGenerator(nn.Layer): ...@@ -268,7 +278,9 @@ class GridGenerator(nn.Layer):
# rbf: n x F # rbf: n x F
rbf = paddle.multiply( rbf = paddle.multiply(
paddle.square(rbf_norm), paddle.log(rbf_norm + eps)) paddle.square(rbf_norm), paddle.log(rbf_norm + eps))
P_hat = paddle.concat([paddle.ones((n, 1)), P, rbf], axis=1) P_hat = paddle.concat(
[paddle.ones(
(n, 1), dtype='float64'), P, rbf], axis=1)
return P_hat # n x F+3 return P_hat # n x F+3
def get_expand_tensor(self, batch_C_prime): def get_expand_tensor(self, batch_C_prime):
......
ppocr/postprocess/rec_postprocess.py
View file @ 6fb61526
...@@ -24,7 +24,9 @@ class BaseRecLabelDecode(object): ...@@ -24,7 +24,9 @@ class BaseRecLabelDecode(object):
character_type='ch', character_type='ch',
use_space_char=False): use_space_char=False):
support_character_type = [ support_character_type = [
'ch', 'en', 'en_sensitive', 'french', 'german', 'japan', 'korean' 'ch', 'en', 'en_sensitive', 'french', 'german', 'japan', 'korean', 'it',
'xi', 'pu', 'ru', 'ar', 'ta', 'ug', 'fa', 'ur', 'rs', 'oc', 'rsc', 'bg',
'uk', 'be', 'te', 'ka', 'chinese_cht', 'hi', 'mr', 'ne'
] ]
assert character_type in support_character_type, "Only {} are supported now but get {}".format( assert character_type in support_character_type, "Only {} are supported now but get {}".format(
support_character_type, character_type) support_character_type, character_type)
...@@ -60,7 +62,7 @@ class BaseRecLabelDecode(object): ...@@ -60,7 +62,7 @@ class BaseRecLabelDecode(object):
def add_special_char(self, dict_character): def add_special_char(self, dict_character):
return dict_character return dict_character
def decode(self, text_index, text_prob=None, is_remove_duplicate=True): def decode(self, text_index, text_prob=None, is_remove_duplicate=False):
""" convert text-index into text-label. """ """ convert text-index into text-label. """
result_list = [] result_list = []
ignored_tokens = self.get_ignored_tokens() ignored_tokens = self.get_ignored_tokens()
...@@ -107,10 +109,10 @@ class CTCLabelDecode(BaseRecLabelDecode): ...@@ -107,10 +109,10 @@ class CTCLabelDecode(BaseRecLabelDecode):
preds_idx = preds.argmax(axis=2) preds_idx = preds.argmax(axis=2)
preds_prob = preds.max(axis=2) preds_prob = preds.max(axis=2)
text = self.decode(preds_idx, preds_prob) text = self.decode(preds_idx, preds_prob, is_remove_duplicate=True)
if label is None: if label is None:
return text return text
label = self.decode(label, is_remove_duplicate=False) label = self.decode(label)
return text, label return text, label
def add_special_char(self, dict_character): def add_special_char(self, dict_character):
......
ppocr/utils/dict/ar_dict.txt 0 → 100644
View file @ 6fb61526
a
r
b
i
c
_
m
g
/
1
0
I
L
S
V
R
C
2
v
l
6
3
9
.
j
p
ا
ل
م
ر
ج
و
ح
ي
ة
5
8
7
أ
ب
ض
4
ك
س
ه
ث
ن
ط
ع
ت
غ
خ
ف
ئ
ز
إ
د
ص
ظ
ذ
ش
ى
ق
ؤ
آ
ء
s
e
n
w
t
u
z
d
A
N
G
h
o
E
T
H
O
B
y
F
U
J
X
W
P
Z
M
k
q
Y
Q
D
f
K
x
'
%
-
#
@
!
&
$
,
:
é
?
+
É
(
ppocr/utils/dict/be_dict.txt 0 → 100644
View file @ 6fb61526
b
e
_
i
m
g
/
2
0
I
L
S
V
R
C
1
v
a
l
6
9
4
3
.
j
p
п
а
з
б
у
г
н
ц
ь
8
м
л
і
о
ў
ы
7
5
М
х
с
р
ф
я
е
д
ж
ю
ч
й
к
Д
в
Б
т
І
ш
ё
э
К
Л
Н
А
Ж
Г
В
П
З
Е
О
Р
С
У
Ё
Й
Т
Ч
Э
Ц
Ю
Ш
Ф
Х
Я
Ь
Ы
Ў
s
c
n
w
M
o
t
T
E
A
B
u
h
y
k
r
H
d
Y
O
U
F
f
x
D
G
N
K
P
z
J
X
W
Z
Q
%
-
q
@
'
!
#
&
,
:
$
(
?
é
+
É
ppocr/utils/dict/bg_dict.txt 0 → 100644
View file @ 6fb61526
!
#
$
%
&
'
(
+
,
-
.
/
0
1
2
3
4
5
6
7
8
9
:
?
@
A
B
C
D
E
F
G
H
I
J
K
L
M
N
O
P
Q
R
S
T
U
V
W
X
Y
Z
_
a
b
c
d
e
f
g
h
i
j
k
l
m
n
o
p
q
r
s
t
u
v
w
x
y
z
É
é
А
Б
В
Г
Д
Е
Ж
З
И
Й
К
Л
М
Н
О
П
Р
С
Т
У
Ф
Х
Ц
Ч
Ш
Щ
Ъ
Ю
Я
а
б
в
г
д
е
ж
з
и
й
к
л
м
н
о
п
р
с
т
у
ф
х
ц
ч
ш
щ
ъ
ь
ю
я
ppocr/utils/dict/chinese_cht_dict.txt 0 → 100644
View file @ 6fb61526
This diff is collapsed.
ppocr/utils/dict/fa_dict.txt 0 → 100644
View file @ 6fb61526
f
a
_
i
m
g
/
1
3
I
L
S
V
R
C
2
0
v
l
6
8
5
.
j
p
و
د
ر
ك
ن
ش
ه
ا
4
9
ی
ج
ِ
7
غ
ل
س
ز
ّ
ت
ک
گ
ي
م
ب
ف
چ
خ
ق
ژ
آ
ص
پ
َ
ع
ئ
ح
ٔ
ض
ُ
ذ
أ
ى
ط
ظ
ث
ة
ً
ء
ؤ
ْ
ۀ
إ
ٍ
ٌ
ٰ
ٓ
ٱ
s
c
e
n
w
N
E
W
Y
D
O
H
A
d
z
r
T
G
o
t
x
h
b
B
M
Z
u
P
F
y
q
U
K
k
J
Q
'
X
#
?
%
$
,
:
&
!
-
(
É
@
é
+
ppocr/utils/dict/german_dict.txt
View file @ 6fb61526
! !
" "
#
$ $
% %
& &
...@@ -72,7 +74,7 @@ l ...@@ -72,7 +74,7 @@ l
m m
n n
o o
p p
q q
r r
s s
...@@ -83,45 +85,59 @@ w ...@@ -83,45 +85,59 @@ w
x x
y y
z z
¡
¢
£ £
¤
¥
¦
§ §
¨
©
ª
«
¬
­ ­
®
¯
° °
±
²
³
´ ´
µ µ
· ·
¸
¹
º º
»
¼
½
¿ ¿
 Á
à Ä
Å Å
Ê É
Î Ï
Ð Ô
Ö
Ü
ß
à
á á
â â
ã
ä
å å
æ æ
ç
è
é é
ê
ë
í
ï
ñ
ò
ó
ô
ö
ø
ù
ú
û
ü
ō
Š
Ÿ
ʒ
β
δ
з
Ṡ
‘
€
©
ª
«
¬
ppocr/utils/dict/hi_dict.txt 0 → 100644
View file @ 6fb61526
!
#
$
%
&
'
(
+
,
-
.
/
0
1
2
3
4
5
6
7
8
9
:
?
@
A
B
C
D
E
F
G
H
I
J
K
L
M
N
O
P
Q
R
S
T
U
V
W
X
Y
Z
_
a
b
c
d
e
f
g
h
i
j
k
l
m
n
o
p
q
r
s
t
u
v
w
x
y
z
É
é
ँ
ं
ः
अ
आ
इ
ई
उ
ऊ
ऋ
ए
ऐ
ऑ
ओ
औ
क
ख
ग
घ
ङ
च
छ
ज
झ
ञ
ट
ठ
ड
ढ
ण
त
थ
द
ध
न
प
फ
ब
भ
म
य
र
ल
ळ
व
श
ष
स
ह
़
ा
ि
ी
ु
ू
ृ
ॅ
े
ै
ॉ
ो
ौ
्
क़
ख़
ग़
ज़
ड़
ढ़
फ़
०
१
२
३
४
५
६
७
८
९
॰
ppocr/utils/dict/it_dict.txt 0 → 100644
View file @ 6fb61526
i
t
_
m
g
/
5
I
L
S
V
R
C
2
0
1
v
a
l
7
8
9
6
.
j
p
e
r
o
d
s
n
3
4
P
u
c
A
-
,
"
z
h
f
b
q
ì
'
à
O
è
G
ù
é
ò
;
F
E
B
N
H
k
:
U
T
X
D
K
?
[
M
­
x
y
(
)
W
ö
º
w
]
Q
J
+
ü
!
È
á
%
=
»
ñ
Ö
Y
ä
í
Z
«
@
ó
ø
ï
ú
ê
ç
Á
É
Å
ß
{
}
&
`
û
î
#
$
ppocr/utils/dict/ka_dict.txt 0 → 100644
View file @ 6fb61526
k
a
_
i
m
g
/
1
2
I
L
S
V
R
C
0
v
l
6
4
8
.
j
p
ಗ
ು
ಣ
ಪ
ಡ
ಿ
ಸ
ಲ
ಾ
ದ
್
7
5
3
ವ
ಷ
ಬ
ಹ
ೆ
9
ಅ
ಳ
ನ
ರ
ಉ
ಕ
ಎ
ೇ
ಂ
ೈ
ೊ
ೀ
ಯ
ೋ
ತ
ಶ
ಭ
ಧ
ಚ
ಜ
ೂ
ಮ
ಒ
ೃ
ಥ
ಇ
ಟ
ಖ
ಆ
ಞ
ಫ
-
ಢ
ಊ
ಓ
ಐ
ಃ
ಘ
ಝ
ೌ
ಠ
ಛ
ಔ
ಏ
ಈ
ಋ
೨
೦
೧
೮
೯
೪
,
೫
೭
೩
೬
ಙ
s
c
e
n
w
o
u
t
d
E
A
T
B
Z
N
G
O
q
z
r
x
P
K
M
J
U
D
f
F
h
b
W
Y
y
H
X
Q
'
#
&
!
@
$
:
%
é
É
(
?
+
ppocr/utils/dict/mr_dict.txt 0 → 100644
View file @ 6fb61526
!
#
$
%
&
'
(
+
,
-
.
/
0
1
2
3
4
5
6
7
8
9
:
?
@
A
B
C
D
E
F
G
H
I
J
K
L
M
N
O
P
Q
R
S
T
U
V
W
X
Y
Z
_
a
b
c
d
e
f
g
h
i
j
k
l
m
n
o
p
q
r
s
t
u
v
w
x
y
z
É
é
ँ
ं
ः
अ
आ
इ
ई
उ
ऊ
ए
ऐ
ऑ
ओ
औ
क
ख
ग
घ
च
छ
ज
झ
ञ
ट
ठ
ड
ढ
ण
त
थ
द
ध
न
प
फ
ब
भ
म
य
र
ऱ
ल
ळ
व
श
ष
स
ह
़
ा
ि
ी
ु
ू
ृ
ॅ
े
ै
ॉ
ो
ौ
्
०
१
२
३
४
५
६
७
८
९
ppocr/utils/dict/ne_dict.txt 0 → 100644
View file @ 6fb61526
!
#
$
%
&
'
(
+
,
-
.
/
0
1
2
3
4
5
6
7
8
9
:
?
@
A
B
C
D
E
F
G
H
I
J
K
L
M
N
O
P
Q
R
S
T
U
V
W
X
Y
Z
_
a
b
c
d
e
f
g
h
i
j
k
l
m
n
o
p
q
r
s
t
u
v
w
x
y
z
É
é
ः
अ
आ
इ
ई
उ
ऊ
ऋ
ए
ऐ
ओ
औ
क
ख
ग
घ
ङ
च
छ
ज
झ
ञ
ट
ठ
ड
ढ
ण
त
थ
द
ध
न
ऩ
प
फ
ब
भ
म
य
र
ऱ
ल
व
श
ष
स
ह
़
ा
ि
ी
ु
ू
ृ
े
ै
ो
ौ
्
॒
ॠ
।
०
१
२
३
४
५
६
७
८
९
ppocr/utils/dict/oc_dict.txt 0 → 100644
View file @ 6fb61526
o
c
_
i
m
g
/
2
0
I
L
S
V
R
C
1
v
a
l
4
3
.
j
p
r
e
è
t
9
7
5
8
n
'
b
s
6
q
u
á
d
ò
à
h
z
f
ï
í
A
ç
x
ó
é
P
O
Ò
ü
k
À
F
-
ú
­
æ
Á
D
E
w
K
T
N
y
U
Z
G
B
J
H
M
W
Y
X
Q
%
$
,
@
&
!
:
(
#
?
+
É
ppocr/utils/dict/pu_dict.txt 0 → 100644
View file @ 6fb61526
p
u
_
i
m
g
/
8
I
L
S
V
R
C
2
0
1
v
a
l
6
7
4
5
.
j
q
e
s
t
ã
o
x
9
c
n
r
z
ç
õ
3
A
U
d
º
ô
­
,
E
;
ó
á
b
D
?
ú
ê
-
h
P
f
à
N
í
O
M
G
É
é
â
F
:
T
Á
"
Q
)
W
J
B
H
(
ö
%
Ö
«
w
K
y
!
k
]
'
Z
+
Ç
Õ
Y
À
X
µ
»
ª
Í
ü
ä
´
è
ñ
ß
ï
Ú
ë
Ô
Ï
Ó
[
Ì
<
Â
ò
§
³
ø
å
#
$
&
@
ppocr/utils/dict/rs_dict.txt 0 → 100644
View file @ 6fb61526
r
s
_
i
m
g
/
1
I
L
S
V
R
C
2
0
v
a
l
7
5
8
6
.
j
p
t
d
9
3
e
š
4
k
u
ć
c
n
đ
o
z
č
b
ž
f
Z
T
h
M
F
O
Š
B
H
A
E
Đ
Ž
D
P
G
Č
K
U
N
J
Ć
w
y
W
x
Y
X
q
Q
#
&
$
,
-
%
'
@
!
:
?
(
É
é
+
ppocr/utils/dict/rsc_dict.txt 0 → 100644
View file @ 6fb61526
r
s
c
_
i
m
g
/
5
I
L
S
V
R
C
2
0
1
v
a
l
9
7
8
.
j
p
м
а
с
и
р
ћ
е
ш
3
4
о
г
н
з
в
л
6
т
ж
у
к
п
њ
д
ч
С
ј
ф
ц
љ
х
О
И
А
б
Ш
К
ђ
џ
М
В
З
Д
Р
У
Н
Т
Б
?
П
Х
Ј
Ц
Г
Љ
Л
Ф
e
n
w
E
F
A
N
f
o
b
M
G
t
y
W
k
P
u
H
B
T
z
h
O
Y
d
U
K
D
x
X
J
Z
Q
q
'
-
@
é
#
!
,
%
$
:
&
+
(
É
ppocr/utils/dict/ru_dict.txt 0 → 100644
View file @ 6fb61526
к
в
а
з
и
у
р
о
н
я
х
п
л
ы
г
е
т
м
д
ж
ш
ь
с
ё
б
й
ч
ю
ц
щ
М
э
ф
А
ъ
С
Ф
Ю
В
К
Т
Н
О
Э
У
И
Г
Л
Р
Д
Б
Ш
П
З
Х
Е
Ж
Я
Ц
Ч
Й
Щ
0
1
2
3
4
5
6
7
8
9
a
b
c
d
e
f
g
h
i
j
k
l
m
n
o
p
q
r
s
t
u
v
w
x
y
z
A
B
C
D
E
F
G
H
I
J
K
L
M
N
O
P
Q
R
S
T
U
V
W
X
Y
Z
ppocr/utils/dict/ta_dict.txt 0 → 100644
View file @ 6fb61526
t
a
_
i
m
g
/
3
I
L
S
V
R
C
2
0
1
v
l
9
7
8
.
j
p
ப
ூ
த
ம
ி
வ
ர
்
ந
ோ
ன
6
ஆ
ற
ல
5
ள
ா
ொ
ழ
ு
4
ெ
ண
க
ட
ை
ே
ச
ய
ஒ
இ
அ
ங
உ
ீ
ஞ
எ
ஓ
ஃ
ஜ
ஷ
ஸ
ஏ
ஊ
ஹ
ஈ
ஐ
ௌ
ஔ
s
c
e
n
w
F
T
O
P
K
A
N
G
Y
E
M
H
U
B
o
b
D
d
r
W
u
y
f
X
k
q
h
J
z
Z
Q
x
-
'
$
,
%
@
é
!
#
+
É
&
:
(
?
ppocr/utils/dict/te_dict.txt 0 → 100644
View file @ 6fb61526
t
e
_
i
m
g
/
5
I
L
S
V
R
C
2
0
1
v
a
l
3
4
8
9
.
j
p
త
ె
ర
క
్
ి
ం
చ
ే
ద
ు
7
6
ఉ
ా
మ
ట
ో
వ
ప
ల
శ
ఆ
య
ై
భ
'
ీ
గ
ూ
డ
ధ
హ
న
జ
స
[
‌
ష
అ
ణ
ఫ
బ
ఎ
;
ళ
థ
ొ
ఠ
ృ
ఒ
ఇ
ః
ఊ
ఖ
-
ఐ
ఘ
ౌ
ఏ
ఈ
ఛ
,
ఓ
ఞ
|
?
:
ఢ
"
(
”
!
+
)
*
=
&
“
€
]
£
$
s
c
n
w
k
J
G
u
d
r
E
o
h
y
b
f
B
M
O
T
N
D
P
A
F
x
W
Y
U
H
K
X
z
Z
Q
q
É
%
#
@
é
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