Fix cli for cross_fold_train (#235)

* Fix cli for cross_fold_train * Migration: BIDI_NORMALIZER fixed * Migration: BIDI_NORMALIZER fixed in 3to4
Calamari-OCR · May 11, 2021 · 8f72bc3 · 8f72bc3
1 parent 4006ff0
commit 8f72bc3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/calamari_ocr/ocr/savedmodel/migrations/version2to4.py b/calamari_ocr/ocr/savedmodel/migrations/version2to4.py
@@ -119,8 +119,8 @@ def recurse_convert(p: dict):
         elif t == 'STRIP_NORMALIZER':
             flat.append(text_processor("StripTextProcessor"))
         elif t == 'BIDI_NORMALIZER':
-            conv = [None, 'L', 'R']
-            flat.append(text_processor("BidiTextProcessor", args={'bidi_direction': conv[p.get('bidiDirection', 0)]}))
+            conv = {'BIDI_AUTO': None, 'BIDI_LTR': 'L', 'BIDI_RTL': 'R'}
+            flat.append(text_processor("BidiTextProcessor", args={'bidi_direction': conv[p.get('bidiDirection', 'BIDI_AUTO')]}))
         elif t == 'TEXT_NORMALIZER':
             conv = ['NFC', 'NFKC', 'NFD', 'NFKD']
             flat.append(text_processor("TextNormalizer", args={'unicode_normalization': conv[p.get('unicodeNormalization', 0)]}))

diff --git a/calamari_ocr/ocr/savedmodel/migrations/version3to4.py b/calamari_ocr/ocr/savedmodel/migrations/version3to4.py
@@ -82,6 +82,7 @@ def migrate3to4(trainer_params: dict) -> dict:
         "FinalPreparation": "calamari_ocr.ocr.dataset.imageprocessors.final_preparation:FinalPreparationProcessorParams",
         "AugmentationProcessor": "calamari_ocr.ocr.dataset.imageprocessors.augmentation:AugmentationProcessorParams",
         "StripTextProcessor": "calamari_ocr.ocr.dataset.textprocessors.basic_text_processors:StripTextProcessorParams",
+        "BidiTextProcessor": "calamari_ocr.ocr.dataset.textprocessors.basic_text_processors:BidiTextProcessorParams",
         "TextNormalizer": "calamari_ocr.ocr.dataset.textprocessors.text_normalizer:TextNormalizerProcessorParams",
         "TextRegularizer": "calamari_ocr.ocr.dataset.textprocessors.text_regularizer:TextRegularizerProcessorParams",
         "PrepareSampleProcessor": "calamari_ocr.ocr.dataset.imageprocessors.preparesample:PrepareSampleProcessorParams",

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
             'calamari-predict=calamari_ocr.scripts.predict:main',
             'calamari-resume-training=calamari_ocr.scripts.resume_training:main',
             'calamari-train=calamari_ocr.scripts.train:run',
-            'calamari-cross-fold-train=calamari_ocr.scripts.cross_fold_train:main',
+            'calamari-cross-fold-train=calamari_ocr.scripts.cross_fold_train:run',
             'calamari-predict-and-eval=calamari_ocr.scripts.predict_and_eval:run',
             'calamari-dataset-viewer=calamari_ocr.scripts.dataset_viewer:main',
             'calamari-dataset-statistics=calamari_ocr.scripts.dataset_statistics:main',