diff --git a/Makefile b/Makefile index e49177b..cbb0659 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,13 @@ EXTRAS ?= DOCKER_BASE_IMAGE = docker.io/ocrd/core-cuda-tf2:v3.3.0 DOCKER_TAG = ocrd/eynollah -#MODEL := 'https://qurator-data.de/eynollah/2021-04-25/models_eynollah.tar.gz' -#MODEL := 'https://qurator-data.de/eynollah/2022-04-05/models_eynollah_renamed.tar.gz' -MODEL := 'https://qurator-data.de/eynollah/2022-04-05/models_eynollah.tar.gz' -#MODEL := 'https://github.com/qurator-spk/eynollah/releases/download/v0.3.0/models_eynollah.tar.gz' -#MODEL := 'https://github.com/qurator-spk/eynollah/releases/download/v0.3.1/models_eynollah.tar.gz' +#SEG_MODEL := https://qurator-data.de/eynollah/2021-04-25/models_eynollah.tar.gz +#SEG_MODEL := https://qurator-data.de/eynollah/2022-04-05/models_eynollah_renamed.tar.gz +SEG_MODEL := https://qurator-data.de/eynollah/2022-04-05/models_eynollah.tar.gz +#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 + +BIN_MODEL := https://github.com/qurator-spk/sbb_binarization/releases/download/v0.0.11/saved_model_2021_03_09.zip PYTEST_ARGS ?= @@ -34,20 +36,29 @@ help: @echo " EXTRAS comma-separated list of features (like 'OCR,plotting') for 'install' [$(EXTRAS)]" @echo " DOCKER_TAG Docker image tag for 'docker' [$(DOCKER_TAG)]" @echo " PYTEST_ARGS pytest args for 'test' (Set to '-s' to see log output during test execution, '-vv' to see individual tests. [$(PYTEST_ARGS)]" - @echo " MODEL URL of 'models' archive to download for 'test' [$(MODEL)]" + @echo " SEG_MODEL URL of 'models' archive to download for segmentation 'test' [$(SEG_MODEL)]" + @echo " BIN_MODEL URL of 'models' archive to download for binarization 'test' [$(BIN_MODEL)]" @echo "" # END-EVAL # Download and extract models to $(PWD)/models_eynollah -models: models_eynollah +models: models_eynollah default-2021-03-09 models_eynollah: models_eynollah.tar.gz tar zxf models_eynollah.tar.gz models_eynollah.tar.gz: - wget $(MODEL) + wget $(SEG_MODEL) + +default-2021-03-09: $(notdir $(BIN_MODEL)) + unzip $(notdir $(BIN_MODEL)) + mkdir $@ + mv $(basename $(notdir $(BIN_MODEL))) $@ + +$(notdir $(BIN_MODEL)): + wget $(BIN_MODEL) build: $(PIP) install build @@ -65,14 +76,17 @@ deps-test: models_eynollah $(PIP) install -r requirements-test.txt smoke-test: TMPDIR != mktemp -d -smoke-test: tests/resources/kant_aufklaerung_1784_0020.tif deps-test +smoke-test: tests/resources/kant_aufklaerung_1784_0020.tif eynollah layout -i $< -o $(TMPDIR) -m $(CURDIR)/models_eynollah fgrep -q http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15 $(TMPDIR)/$(basename $(