diff --git a/Makefile b/Makefile index e4ac5c6..eb6353a 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ WGET = wget -O #SEG_MODEL := https://github.com/qurator-spk/eynollah/releases/download/v0.3.0/models_eynollah.tar.gz #SEG_MODEL := https://github.com/qurator-spk/eynollah/releases/download/v0.3.1/models_eynollah.tar.gz #SEG_MODEL := https://zenodo.org/records/17194824/files/models_layout_v0_5_0.tar.gz?download=1 -EYNOLLAH_MODELS_URL := https://zenodo.org/records/17727267/files/models_all_v0_8_0.zip +EYNOLLAH_MODELS_URL := https://zenodo.org/records/21362927/files/models_inference_all_v0_9_0.zip EYNOLLAH_MODELS_ZIP = $(notdir $(EYNOLLAH_MODELS_URL)) EYNOLLAH_MODELS_DIR = $(EYNOLLAH_MODELS_ZIP:%.zip=%) diff --git a/README.md b/README.md index bf80bca..be21a7a 100644 --- a/README.md +++ b/README.md @@ -74,11 +74,11 @@ When using Eynollah with Docker, see [`docker.md`](https://github.com/qurator-sp ## Models -Pretrained models can be downloaded from [Zenodo](https://zenodo.org/records/17727267) or [Hugging Face](https://huggingface.co/SBB?search_models=eynollah). +Pretrained models can be downloaded from [Zenodo](https://doi.org/10.5281/zenodo.17194823) or [Hugging Face](https://huggingface.co/SBB?search_models=eynollah). -For fast runtime inference, download the ONNX models. +For fast runtime inference, download the ONNX models distributed as `models_inference_...zip`. -For finetuning training, download the original (Tensorflow / Torch) models +For finetuning training, download the original (Tensorflow / Torch) models distributed as `models_training...zip` (and install the `[training]` extra). For model documentation and model cards, see [`models.md`](https://github.com/qurator-spk/eynollah/tree/main/docs/models.md). diff --git a/src/eynollah/model_zoo/default_specs.py b/src/eynollah/model_zoo/default_specs.py index 18bf093..2b1196b 100644 --- a/src/eynollah/model_zoo/default_specs.py +++ b/src/eynollah/model_zoo/default_specs.py @@ -1,8 +1,8 @@ from .specs import EynollahModelSpec, EynollahModelSpecSet # NOTE: This needs to change whenever models/versions change -ZENODO = "https://zenodo.org/records/17727267" -MODELS_VERSION = "v0_8_0" +ZENODO = "https://zenodo.org/records/21362927" +MODELS_VERSION = "v0_9_0" def dist_url(dist_name: str="layout") -> str: return f'{ZENODO}/models_{dist_name}_{MODELS_VERSION}.zip' diff --git a/src/eynollah/ocrd-tool.json b/src/eynollah/ocrd-tool.json index 89ed0da..38a129d 100644 --- a/src/eynollah/ocrd-tool.json +++ b/src/eynollah/ocrd-tool.json @@ -84,6 +84,22 @@ } }, "resources": [ + { + "url": "https://zenodo.org/records/21362927/files/models_inference_all_v0_9_0.zip", + "name": "models_inference_all_v0_9_0", + "type": "archive", + "size": 5177204769, + "description": "Models for layout detection, reading order detection, textline detection, page extraction, column classification, table detection, binarization and image enhancement", + "version_range": ">= v0.9.0" + }, + { + "url": "https://zenodo.org/records/21362927/files/models_inference_all_v0_9_0.zip", + "name": "models_inference_all_v0_9_0", + "type": "archive", + "size": 5177204769, + "description": "Models for layout detection, reading order detection, textline detection, page extraction, column classification, table detection, binarization and image enhancement", + "version_range": ">= v0.9.0" + }, { "url": "https://zenodo.org/records/17727267/files/models_all_v0_8_0.zip", "name": "models_all_v0_8_0",