From c16b184a81ebb5a3d9face6bfce592c80f52eb30 Mon Sep 17 00:00:00 2001 From: Hanwen Zh <70364944+homework36@users.noreply.github.com> Date: Wed, 18 Jun 2025 11:39:29 -0400 Subject: [PATCH 1/4] use DDMAL forked packages ... for calamari and tfaip --- rodan-main/code/rodan/jobs/text_alignment/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rodan-main/code/rodan/jobs/text_alignment/requirements.txt b/rodan-main/code/rodan/jobs/text_alignment/requirements.txt index 6865939bf..39496de1c 100644 --- a/rodan-main/code/rodan/jobs/text_alignment/requirements.txt +++ b/rodan-main/code/rodan/jobs/text_alignment/requirements.txt @@ -1,8 +1,8 @@ #numpy==1.17.3; python_version > "3.4" -git+https://github.com/timothydereuse/calamari@a058d76#egg=calamari_ocr; python_version > "3.4" -git+https://github.com/DDMAL/tfaip@7fb7f49#egg=tfaip; python_version > "3.4" +https://github.com/DDMAL/calamari/archive/refs/tags/DDMAL-v1.0.0.zip#egg=calamari_ocr; python_version > "3.4" +https://github.com/DDMAL/tfaip/archive/refs/tags/v1.0.0.zip#egg=tfaip; python_version > "3.4" paiargparse==1.1.2; python_version > "3.4" scipy==1.7.3; python_version > "3.4" Unidecode==1.0.22; python_version > "3.4" scikit-image==0.17.2; python_version > "3.4" -keras==2.5.0rc0; python_version > "3.4" +keras==2.5.0rc0; python_version > "3.4" \ No newline at end of file From d25bd717ad946837ad37f28c0e447970fa2c7a4e Mon Sep 17 00:00:00 2001 From: Hanwen Zh <70364944+homework36@users.noreply.github.com> Date: Thu, 19 Jun 2025 09:51:37 -0400 Subject: [PATCH 2/4] use temporary test branch for calamari --- rodan-main/code/rodan/jobs/text_alignment/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rodan-main/code/rodan/jobs/text_alignment/requirements.txt b/rodan-main/code/rodan/jobs/text_alignment/requirements.txt index 39496de1c..507725efc 100644 --- a/rodan-main/code/rodan/jobs/text_alignment/requirements.txt +++ b/rodan-main/code/rodan/jobs/text_alignment/requirements.txt @@ -1,5 +1,5 @@ #numpy==1.17.3; python_version > "3.4" -https://github.com/DDMAL/calamari/archive/refs/tags/DDMAL-v1.0.0.zip#egg=calamari_ocr; python_version > "3.4" +git+https://github.com/DDMAL/calamari@DDMAL-test-branch#egg=calamari_ocr; python_version > "3.4" https://github.com/DDMAL/tfaip/archive/refs/tags/v1.0.0.zip#egg=tfaip; python_version > "3.4" paiargparse==1.1.2; python_version > "3.4" scipy==1.7.3; python_version > "3.4" From d0b9e3f9793d89ca3ebb5d78e8691adc3e6d13f2 Mon Sep 17 00:00:00 2001 From: Hanwen Zh <70364944+homework36@users.noreply.github.com> Date: Thu, 19 Jun 2025 11:11:46 -0400 Subject: [PATCH 3/4] add direct tensorflow link before calamari install --- rodan-main/code/rodan/jobs/text_alignment/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/rodan-main/code/rodan/jobs/text_alignment/requirements.txt b/rodan-main/code/rodan/jobs/text_alignment/requirements.txt index 507725efc..3eeddf37c 100644 --- a/rodan-main/code/rodan/jobs/text_alignment/requirements.txt +++ b/rodan-main/code/rodan/jobs/text_alignment/requirements.txt @@ -1,4 +1,5 @@ #numpy==1.17.3; python_version > "3.4" +https://files.pythonhosted.org/packages/63/b2/2822fad63bdaedf3da841443daf92775d6fff16aba7199415e06f8d8c50f/tensorflow-2.5.1-cp37-cp37m-manylinux2010_x86_64.whl; python_version > "3.4" git+https://github.com/DDMAL/calamari@DDMAL-test-branch#egg=calamari_ocr; python_version > "3.4" https://github.com/DDMAL/tfaip/archive/refs/tags/v1.0.0.zip#egg=tfaip; python_version > "3.4" paiargparse==1.1.2; python_version > "3.4" From ba753baac7df5b92d9f5efb9b927ac829127c14f Mon Sep 17 00:00:00 2001 From: Hanwen Zh <70364944+homework36@users.noreply.github.com> Date: Thu, 19 Jun 2025 11:29:41 -0400 Subject: [PATCH 4/4] use packaged calamari release instead of branch --- rodan-main/code/rodan/jobs/text_alignment/requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rodan-main/code/rodan/jobs/text_alignment/requirements.txt b/rodan-main/code/rodan/jobs/text_alignment/requirements.txt index 3eeddf37c..95de7747a 100644 --- a/rodan-main/code/rodan/jobs/text_alignment/requirements.txt +++ b/rodan-main/code/rodan/jobs/text_alignment/requirements.txt @@ -1,6 +1,8 @@ #numpy==1.17.3; python_version > "3.4" +# Specify the tensorflow url link to prevent docker hub build failure due to hash mismatch https://files.pythonhosted.org/packages/63/b2/2822fad63bdaedf3da841443daf92775d6fff16aba7199415e06f8d8c50f/tensorflow-2.5.1-cp37-cp37m-manylinux2010_x86_64.whl; python_version > "3.4" -git+https://github.com/DDMAL/calamari@DDMAL-test-branch#egg=calamari_ocr; python_version > "3.4" +# Install calamari and tfaip from our DDMAL fork +https://github.com/DDMAL/calamari/archive/refs/tags/DDMAL-v1.0.0.zip#egg=calamari_ocr; python_version > "3.4" https://github.com/DDMAL/tfaip/archive/refs/tags/v1.0.0.zip#egg=tfaip; python_version > "3.4" paiargparse==1.1.2; python_version > "3.4" scipy==1.7.3; python_version > "3.4"