Merge pull request #7 from OCR-D/bundle_network

network parameter default to bundled densenet121.tgc

Author: kba

ocrd_typegroups_classifier/ocrd-tool.json

@@ -17,7 +17,7 @@
         "network": {
           "description": "The file name of the neural network to use, including sufficient path information",
           "type": "string",
-          "required": true
+          "required": false
         },
         "stride": {
           "description": "Stride applied to the CNN on the image. Should be between 1 and 224. Smaller values increase the computation time.",

ocrd_typegroups_classifier/processor.py

@@ -1,6 +1,7 @@
 """
 Wrap TypegroupsClassifier as an ocrd.Processor
 """
+from pkg_resources import resource_filename
 
 from ocrd import Processor
 from ocrd_utils import (
@@ -43,6 +44,8 @@ def process(self):
         log = getLogger('ocrd_typegroups_classifier')
         assert_file_grp_cardinality(self.input_file_grp, 1)
         assert_file_grp_cardinality(self.output_file_grp, 1)
+        if 'network' not in self.parameter:
+            self.parameter['network'] = resource_filename(__name__, 'models/densenet121.tgc')
         network_file = self.parameter['network']
         stride = self.parameter['stride']
         classifier = TypegroupsClassifier.load(network_file)

tests/test.sh

@@ -3,16 +3,14 @@ set -ex
 
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-net="${SCRIPTDIR}/../ocrd_typegroups_classifier/models/densenet121.tgc"
-
 cd "$SCRIPTDIR/assets/pembroke_werke_1766/data"
 ocrd-typegroups-classifier \
     -l DEBUG \
     -g PHYS_0011 \
     -m mets.xml \
     -I DEFAULT \
     -O OCR-D-FONTIDENT \
-    -p <(echo '{"network": "'"$net"'", "stride":143}')
+    -P stride 143
 
 outfile="OCR-D-FONTIDENT/FILE_0010_OCR-D-FONTIDENT.xml"
 expected_fontfamily='fraktur'