Merge pull request tesseract-ocr#2614 from stweil/training

Move source files which are used for training only to src/training
hyphinwang · Aug 12, 2019 · 73f7135 · 73f7135
2 parents 23afe83 + e84cb24
commit 73f7135
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -333,9 +333,7 @@ include_directories(src/opencl)
 include_directories(src/textord)
 include_directories(src/viewer)
 include_directories(src/wordrec)
-if(CMAKE_EXPORT_COMPILE_COMMANDS)
-  include_directories(src/training)
-endif()
+include_directories(src/training)
 if(ANDROID_TOOLCHAIN)
   include_directories(${ANDROID_TOOLCHAIN}/sysroot/usr/include)
   add_compile_definitions(__ANDROID_API_FUTURE__)

diff --git a/src/classify/Makefile.am b/src/classify/Makefile.am
@@ -3,6 +3,7 @@ AM_CPPFLAGS += \
     -I$(top_srcdir)/src/ccutil \
     -I$(top_srcdir)/src/ccstruct \
     -I$(top_srcdir)/src/dict \
+    -I$(top_srcdir)/src/training \
     -I$(top_srcdir)/src/viewer
 
 if DISABLED_LEGACY_ENGINE
@@ -23,16 +24,13 @@ noinst_HEADERS += \
     adaptive.h \
     cluster.h \
     clusttool.h \
-    errorcounter.h \
     featdefs.h \
     float2int.h \
     fpoint.h \
-    intfeaturedist.h \
-    intfeaturemap.h \
     intfeaturespace.h \
     intfx.h intmatcher.h \
     intproto.h kdtree.h \
-    mastertrainer.h mf.h \
+    mf.h \
     mfdefs.h \
     mfoutline.h \
     mfx.h \
@@ -42,12 +40,10 @@ noinst_HEADERS += \
     outfeat.h \
     picofeat.h \
     protos.h \
-    sampleiterator.h \
     shapeclassifier.h \
     shapetable.h \
     tessclassifier.h \
-    trainingsample.h \
-    trainingsampleset.h
+    trainingsample.h
 endif
 
 noinst_LTLIBRARIES = libtesseract_classify.la
@@ -63,18 +59,14 @@ libtesseract_classify_la_SOURCES += \
     cluster.cpp \
     clusttool.cpp \
     cutoffs.cpp \
-    errorcounter.cpp \
     featdefs.cpp \
     float2int.cpp \
     fpoint.cpp \
-    intfeaturedist.cpp \
-    intfeaturemap.cpp \
     intfeaturespace.cpp \
     intfx.cpp \
     intmatcher.cpp \
     intproto.cpp \
     kdtree.cpp \
-    mastertrainer.cpp \
     mf.cpp mfdefs.cpp \
     mfoutline.cpp \
     mfx.cpp \
@@ -84,10 +76,8 @@ libtesseract_classify_la_SOURCES += \
     outfeat.cpp \
     picofeat.cpp \
     protos.cpp \
-    sampleiterator.cpp \
     shapeclassifier.cpp \
     shapetable.cpp \
     tessclassifier.cpp \
-    trainingsample.cpp \
-    trainingsampleset.cpp
+    trainingsample.cpp
 endif
diff --git a/src/lstm/Makefile.am b/src/lstm/Makefile.am
@@ -26,20 +26,20 @@ endif
 
 pkginclude_HEADERS =
 
-noinst_HEADERS = convolve.h ctc.h
+noinst_HEADERS = convolve.h
 noinst_HEADERS += fullyconnected.h functions.h input.h
 noinst_HEADERS += lstm.h lstmrecognizer.h maxpool.h
-noinst_HEADERS += network.h networkbuilder.h networkio.h networkscratch.h
+noinst_HEADERS += network.h networkio.h networkscratch.h
 noinst_HEADERS += parallel.h plumbing.h recodebeam.h reconfig.h reversed.h
 noinst_HEADERS += series.h static_shape.h stridemap.h
 noinst_HEADERS += tfnetwork.h weightmatrix.h
 
 noinst_LTLIBRARIES = libtesseract_lstm.la
 
 libtesseract_lstm_la_SOURCES = \
-        convolve.cpp ctc.cpp fullyconnected.cpp functions.cpp input.cpp \
+        convolve.cpp fullyconnected.cpp functions.cpp input.cpp \
         lstm.cpp lstmrecognizer.cpp maxpool.cpp \
-        networkbuilder.cpp network.cpp networkio.cpp \
+        network.cpp networkio.cpp \
         parallel.cpp plumbing.cpp recodebeam.cpp reconfig.cpp reversed.cpp \
         series.cpp stridemap.cpp tfnetwork.cpp weightmatrix.cpp
 

diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt
@@ -76,6 +76,22 @@ set(common_training_src
     commandlineflags.h
     commontraining.cpp
     commontraining.h
+    ctc.cpp
+    ctc.h
+    errorcounter.cpp
+    errorcounter.h
+    intfeaturedist.cpp
+    intfeaturedist.h
+    intfeaturemap.cpp
+    intfeaturemap.h
+    mastertrainer.cpp
+    mastertrainer.h
+    networkbuilder.cpp
+    networkbuilder.h
+    sampleiterator.cpp
+    sampleiterator.h
+    trainingsampleset.cpp
+    trainingsampleset.h
 )
 add_library                 (common_training ${common_training_src})
 target_link_libraries       (common_training libtesseract tessopt)

diff --git a/src/training/Makefile.am b/src/training/Makefile.am
@@ -32,13 +32,15 @@ noinst_HEADERS = \
     boxchar.h \
     commandlineflags.h \
     commontraining.h \
+    ctc.h \
     degradeimage.h \
     icuerrorcode.h \
     fileio.h \
     lang_model_helpers.h \
     ligature_table.h \
     lstmtester.h \
     lstmtrainer.h \
+    networkbuilder.h \
     normstrngs.h \
     pango_font_info.h \
     stringrenderer.h \
@@ -54,7 +56,13 @@ noinst_HEADERS = \
     validator.h
 
 if !DISABLED_LEGACY_ENGINE
+    noinst_HEADERS += errorcounter.h
+    noinst_HEADERS += intfeaturedist.h
+    noinst_HEADERS += intfeaturemap.h
+    noinst_HEADERS += mastertrainer.h
     noinst_HEADERS += mergenf.h
+    noinst_HEADERS += sampleiterator.h
+    noinst_HEADERS += trainingsampleset.h
 endif
 
 
@@ -68,13 +76,15 @@ libtesseract_training_la_SOURCES = \
     boxchar.cpp \
     commandlineflags.cpp \
     commontraining.cpp \
+    ctc.cpp \
     degradeimage.cpp \
     icuerrorcode.cpp \
     fileio.cpp \
     lang_model_helpers.cpp \
     ligature_table.cpp \
     lstmtester.cpp \
     lstmtrainer.cpp \
+    networkbuilder.cpp \
     normstrngs.cpp \
     pango_font_info.cpp \
     stringrenderer.cpp \
@@ -87,6 +97,15 @@ libtesseract_training_la_SOURCES = \
     validate_myanmar.cpp \
     validator.cpp
 
+if !DISABLED_LEGACY_ENGINE
+libtesseract_training_la_SOURCES += errorcounter.cpp
+libtesseract_training_la_SOURCES += intfeaturedist.cpp
+libtesseract_training_la_SOURCES += intfeaturemap.cpp
+libtesseract_training_la_SOURCES += mastertrainer.cpp
+libtesseract_training_la_SOURCES += sampleiterator.cpp
+libtesseract_training_la_SOURCES += trainingsampleset.cpp
+endif
+
 libtesseract_tessopt_la_SOURCES = \
     tessopt.cpp
 

diff --git a/src/lstm/ctc.cpp → src/training/ctc.cpp b/src/lstm/ctc.cpp → src/training/ctc.cpp
diff --git a/src/lstm/ctc.h → src/training/ctc.h b/src/lstm/ctc.h → src/training/ctc.h
diff --git a/src/classify/errorcounter.cpp → src/training/errorcounter.cpp b/src/classify/errorcounter.cpp → src/training/errorcounter.cpp
diff --git a/src/classify/errorcounter.h → src/training/errorcounter.h b/src/classify/errorcounter.h → src/training/errorcounter.h
diff --git a/src/classify/intfeaturedist.cpp → src/training/intfeaturedist.cpp b/src/classify/intfeaturedist.cpp → src/training/intfeaturedist.cpp
diff --git a/src/classify/intfeaturedist.h → src/training/intfeaturedist.h b/src/classify/intfeaturedist.h → src/training/intfeaturedist.h
diff --git a/src/classify/intfeaturemap.cpp → src/training/intfeaturemap.cpp b/src/classify/intfeaturemap.cpp → src/training/intfeaturemap.cpp
diff --git a/src/classify/intfeaturemap.h → src/training/intfeaturemap.h b/src/classify/intfeaturemap.h → src/training/intfeaturemap.h
diff --git a/src/classify/mastertrainer.cpp → src/training/mastertrainer.cpp b/src/classify/mastertrainer.cpp → src/training/mastertrainer.cpp
diff --git a/src/classify/mastertrainer.h → src/training/mastertrainer.h b/src/classify/mastertrainer.h → src/training/mastertrainer.h
diff --git a/src/lstm/networkbuilder.cpp → src/training/networkbuilder.cpp b/src/lstm/networkbuilder.cpp → src/training/networkbuilder.cpp
diff --git a/src/lstm/networkbuilder.h → src/training/networkbuilder.h b/src/lstm/networkbuilder.h → src/training/networkbuilder.h
diff --git a/src/classify/sampleiterator.cpp → src/training/sampleiterator.cpp b/src/classify/sampleiterator.cpp → src/training/sampleiterator.cpp
diff --git a/src/classify/sampleiterator.h → src/training/sampleiterator.h b/src/classify/sampleiterator.h → src/training/sampleiterator.h
diff --git a/src/classify/trainingsampleset.cpp → src/training/trainingsampleset.cpp b/src/classify/trainingsampleset.cpp → src/training/trainingsampleset.cpp
diff --git a/src/classify/trainingsampleset.h → src/training/trainingsampleset.h b/src/classify/trainingsampleset.h → src/training/trainingsampleset.h
diff --git a/unittest/Makefile.am b/unittest/Makefile.am
@@ -260,7 +260,7 @@ indexmapbidi_test_SOURCES = indexmapbidi_test.cc
 indexmapbidi_test_LDADD = $(TRAINING_LIBS)
 
 intfeaturemap_test_SOURCES = intfeaturemap_test.cc
-intfeaturemap_test_LDADD = $(TESS_LIBS)
+intfeaturemap_test_LDADD = $(TRAINING_LIBS)
 
 intsimdmatrix_test_SOURCES = intsimdmatrix_test.cc
 intsimdmatrix_test_LDADD = $(TESS_LIBS)
@@ -303,7 +303,7 @@ lstmtrainer_test_SOURCES = lstmtrainer_test.cc
 lstmtrainer_test_LDADD = $(ABSEIL_LIBS) $(TRAINING_LIBS) $(LEPTONICA_LIBS)
 
 mastertrainer_test_SOURCES = mastertrainer_test.cc
-mastertrainer_test_LDADD = $(ABSEIL_LIBS) $(TRAINING_LIBS)
+mastertrainer_test_LDADD = $(ABSEIL_LIBS) $(TRAINING_LIBS) $(LEPTONICA_LIBS)
 
 matrix_test_SOURCES = matrix_test.cc
 matrix_test_LDADD = $(TESS_LIBS)