From d5724f1f09375fa817cc122833051de014683fd2 Mon Sep 17 00:00:00 2001 From: chenjian Date: Thu, 12 May 2022 12:57:24 +0000 Subject: [PATCH] fix --- .../image/text_recognition/ch_pp-ocrv3/README.md | 13 ++----------- .../image/text_recognition/ch_pp-ocrv3/character.py | 2 +- .../image/text_recognition/ch_pp-ocrv3/module.py | 13 +++++++++++++ .../text_recognition/ch_pp-ocrv3/requirements.txt | 2 ++ modules/image/text_recognition/ch_pp-ocrv3/utils.py | 13 +++++++++++++ .../text_recognition/ch_pp-ocrv3_det/README.md | 13 ++----------- .../text_recognition/ch_pp-ocrv3_det/module.py | 13 +++++++++++++ .../text_recognition/ch_pp-ocrv3_det/processor.py | 13 +++++++++++++ .../ch_pp-ocrv3_det/requirements.txt | 2 ++ 9 files changed, 61 insertions(+), 23 deletions(-) mode change 100644 => 100755 modules/image/text_recognition/ch_pp-ocrv3/README.md create mode 100644 modules/image/text_recognition/ch_pp-ocrv3/requirements.txt mode change 100644 => 100755 modules/image/text_recognition/ch_pp-ocrv3_det/README.md create mode 100644 modules/image/text_recognition/ch_pp-ocrv3_det/requirements.txt diff --git a/modules/image/text_recognition/ch_pp-ocrv3/README.md b/modules/image/text_recognition/ch_pp-ocrv3/README.md old mode 100644 new mode 100755 index 0bf8f215..ac3812a7 --- a/modules/image/text_recognition/ch_pp-ocrv3/README.md +++ b/modules/image/text_recognition/ch_pp-ocrv3/README.md @@ -35,18 +35,9 @@ - ### 1、环境依赖 - - paddlepaddle >= 1.7.2 + - paddlepaddle >= 2.2 - - paddlehub >= 1.6.0 | [如何安装paddlehub](../../../../docs/docs_ch/get_start/installation.rst) - - - shapely - - - pyclipper - - - ```shell - $ pip install shapely pyclipper - ``` - - **该Module依赖于第三方库shapely和pyclipper,使用该Module之前,请先安装shapely和pyclipper。** + - paddlehub >= 2.2 | [如何安装paddlehub](../../../../docs/docs_ch/get_start/installation.rst) - ### 2、安装 diff --git a/modules/image/text_recognition/ch_pp-ocrv3/character.py b/modules/image/text_recognition/ch_pp-ocrv3/character.py index 571f8f99..eaa45a58 100644 --- a/modules/image/text_recognition/ch_pp-ocrv3/character.py +++ b/modules/image/text_recognition/ch_pp-ocrv3/character.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/modules/image/text_recognition/ch_pp-ocrv3/module.py b/modules/image/text_recognition/ch_pp-ocrv3/module.py index 402ac8a2..133f8d78 100644 --- a/modules/image/text_recognition/ch_pp-ocrv3/module.py +++ b/modules/image/text_recognition/ch_pp-ocrv3/module.py @@ -1,4 +1,17 @@ # -*- coding:utf-8 -*- +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import argparse import ast import copy diff --git a/modules/image/text_recognition/ch_pp-ocrv3/requirements.txt b/modules/image/text_recognition/ch_pp-ocrv3/requirements.txt new file mode 100644 index 00000000..7159e62c --- /dev/null +++ b/modules/image/text_recognition/ch_pp-ocrv3/requirements.txt @@ -0,0 +1,2 @@ +shapely +pyclipper diff --git a/modules/image/text_recognition/ch_pp-ocrv3/utils.py b/modules/image/text_recognition/ch_pp-ocrv3/utils.py index 18aa6cee..d6309f2f 100644 --- a/modules/image/text_recognition/ch_pp-ocrv3/utils.py +++ b/modules/image/text_recognition/ch_pp-ocrv3/utils.py @@ -1,4 +1,17 @@ # -*- coding:utf-8 -*- +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from __future__ import absolute_import from __future__ import division from __future__ import print_function diff --git a/modules/image/text_recognition/ch_pp-ocrv3_det/README.md b/modules/image/text_recognition/ch_pp-ocrv3_det/README.md old mode 100644 new mode 100755 index a974bdd9..d1bf63bf --- a/modules/image/text_recognition/ch_pp-ocrv3_det/README.md +++ b/modules/image/text_recognition/ch_pp-ocrv3_det/README.md @@ -35,18 +35,9 @@ - ### 1、环境依赖 - - paddlepaddle >= 1.7.2 + - paddlepaddle >= 2.2 - - paddlehub >= 1.6.0 | [如何安装paddlehub](../../../../docs/docs_ch/get_start/installation.rst) - - - shapely - - - pyclipper - - - ```shell - $ pip install shapely pyclipper - ``` - - **该Module依赖于第三方库shapely和pyclipper,使用该Module之前,请先安装shapely和pyclipper。** + - paddlehub >= 2.2 | [如何安装paddlehub](../../../../docs/docs_ch/get_start/installation.rst) - ### 2、安装 diff --git a/modules/image/text_recognition/ch_pp-ocrv3_det/module.py b/modules/image/text_recognition/ch_pp-ocrv3_det/module.py index 67968153..52d50a60 100644 --- a/modules/image/text_recognition/ch_pp-ocrv3_det/module.py +++ b/modules/image/text_recognition/ch_pp-ocrv3_det/module.py @@ -1,4 +1,17 @@ # -*- coding:utf-8 -*- +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from __future__ import absolute_import from __future__ import division from __future__ import print_function diff --git a/modules/image/text_recognition/ch_pp-ocrv3_det/processor.py b/modules/image/text_recognition/ch_pp-ocrv3_det/processor.py index 2de68254..46a3b263 100644 --- a/modules/image/text_recognition/ch_pp-ocrv3_det/processor.py +++ b/modules/image/text_recognition/ch_pp-ocrv3_det/processor.py @@ -1,4 +1,17 @@ # -*- coding:utf-8 -*- +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from __future__ import absolute_import from __future__ import division from __future__ import print_function diff --git a/modules/image/text_recognition/ch_pp-ocrv3_det/requirements.txt b/modules/image/text_recognition/ch_pp-ocrv3_det/requirements.txt new file mode 100644 index 00000000..7159e62c --- /dev/null +++ b/modules/image/text_recognition/ch_pp-ocrv3_det/requirements.txt @@ -0,0 +1,2 @@ +shapely +pyclipper -- GitLab