From b0ae5b9c6abfb1e32cfe5d0e316176e53104a2fa Mon Sep 17 00:00:00 2001 From: "Gerber, Mike" Date: Thu, 22 Apr 2021 21:11:49 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20ocrd-galley:=20Add=20support=20for?= =?UTF-8?q?=20ocrd-eynollah-segment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-eynollah | 7 +++---- my_ocrd_workflow | 1 + wrapper/qurator/ocrd_galley/cli.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile-eynollah b/Dockerfile-eynollah index 8ee7968..063851f 100644 --- a/Dockerfile-eynollah +++ b/Dockerfile-eynollah @@ -2,12 +2,12 @@ ARG DRONE_COMMIT="latest" FROM quratorspk/ocrd-galley-core-cuda10.0:$DRONE_COMMIT ARG PIP_INSTALL="pip install --no-cache-dir" -ARG EYNOLLAH_COMMIT="1184d3d" +ARG EYNOLLAH_VERSION="0.0.1" # Build pip installable stuff RUN ${PIP_INSTALL} \ - https://github.com/qurator-spk/eynollah/archive/$EYNOLLAH_COMMIT.tar.gz + "eynollah == ${EYNOLLAH_VERSION}" # Copy OCR models @@ -19,5 +19,4 @@ RUN pip check # Default command -# XXX needs to be changed when OCR-D support is ready -CMD ["eynollah"] +CMD ["ocrd-eynollah-segment"] diff --git a/my_ocrd_workflow b/my_ocrd_workflow index b80b5e1..46d3bc8 100755 --- a/my_ocrd_workflow +++ b/my_ocrd_workflow @@ -66,6 +66,7 @@ main() { #ocrd-tesserocr-segment-region --overwrite -I OCR-D-IMG-BIN -O OCR-D-SEG-REGION #ocrd-tesserocr-segment-line --overwrite -I OCR-D-SEG-REGION -O OCR-D-SEG-LINE #ocrd-cis-ocropy-segment --overwrite -I OCR-D-IMG-BIN -O OCR-D-SEG-LINE -P level-of-operation page + #ocrd-eynollah-segment -I OCR-D-IMG -O OCR-D-SEG-LINE -P models /var/lib/eynollah ocrd-sbb-textline-detector --overwrite -I OCR-D-IMG-BIN -O OCR-D-SEG-LINE -P model "/var/lib/textline_detection" do_validate diff --git a/wrapper/qurator/ocrd_galley/cli.py b/wrapper/qurator/ocrd_galley/cli.py index 5973b9e..0c9da4d 100644 --- a/wrapper/qurator/ocrd_galley/cli.py +++ b/wrapper/qurator/ocrd_galley/cli.py @@ -40,6 +40,7 @@ sub_images = { "ocrd-skimage-denoise-raw": "ocrd_wrap", "ocrd-skimage-binarize": "ocrd_wrap", "ocrd-skimage-denoise": "ocrd_wrap", + "ocrd-eynollah-segment": "eynollah" }