Merge pull request #288 from bertsky/update-kraken

update ocrd_kraken

Author: stweil

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "clstm"]
-	path = clstm
-	url = https://github.com/tmbdev/clstm.git
 [submodule "ocrd_keraslm"]
 	path = ocrd_keraslm
 	url = https://github.com/OCR-D/ocrd_keraslm.git

Makefile

@@ -53,7 +53,7 @@ export PKG_CONFIG_PATH
 OCRD_EXECUTABLES = $(BIN)/ocrd # add more CLIs below
 CUSTOM_DEPS = unzip wget python3-venv parallel git less # add more packages for deps-ubuntu below (or modules as preqrequisites)
 
-DISABLED_MODULES ?= cor-asv-fst opencv-python ocrd_kraken clstm ocrd_ocropy
+DISABLED_MODULES ?= cor-asv-fst opencv-python ocrd_ocropy
 # Default to all submodules, but allow overriding by user
 # (and treat the empty value as if it was unset)
 # opencv-python is only needed for aarch64-linux-gnu and other less common platforms,
@@ -199,9 +199,6 @@ $(BIN)/ocrd: $(SHARE)/opencv-python
 endif
 
 ifneq ($(findstring ocrd_kraken, $(OCRD_MODULES)),)
-$(SHARE)/clstm: | $(SHARE)/numpy $(SHARE)
-CUSTOM_DEPS += scons libprotobuf-dev protobuf-compiler libpng-dev libeigen3-dev swig
-
 OCRD_EXECUTABLES += $(OCRD_KRAKEN)
 install-models: install-models-kraken
 .PHONY: install-models-kraken
@@ -210,7 +207,8 @@ install-models-kraken:
 	. $(ACTIVATE_VENV) && ocrd resmgr download ocrd-kraken-recognize '*'
 OCRD_KRAKEN := $(BIN)/ocrd-kraken-binarize
 OCRD_KRAKEN += $(BIN)/ocrd-kraken-segment
-$(call multirule,$(OCRD_KRAKEN)): ocrd_kraken $(SHARE)/clstm $(BIN)/ocrd
+OCRD_KRAKEN += $(BIN)/ocrd-kraken-recognize
+$(call multirule,$(OCRD_KRAKEN)): ocrd_kraken $(BIN)/ocrd
 	$(pip_install)
 endif
 
@@ -643,7 +641,7 @@ endef
 endif
 
 # avoid making these .PHONY so they do not have to be repeated:
-# clstm tesserocr
+# tesserocr
 $(SHARE)/%: % | $(ACTIVATE_VENV) $(SHARE)
 	. $(ACTIVATE_VENV) && cd $< && $(SEMPIP) $(PIP) install $(PIP_OPTIONS) .
 	@touch $@