cleanup theano code (#86)

Author: larissakl

Modules.make

@@ -65,7 +65,6 @@ MODULES += MODULE_MM_DT
 # ****** Neural Network ******
 MODULES += MODULE_NN
 MODULES += MODULE_NN_SEQUENCE_TRAINING
-MODULES += MODULE_THEANO_INTERFACE
 MODULES += MODULE_PYTHON
 
 # ****** OpenFst ******

apptainer/2022-10-21_tensorflow-1.15_arm_v1/makefiles/Modules.make

@@ -65,7 +65,6 @@ MODULES += MODULE_MM_DT
 # ****** Neural Network ******
 MODULES += MODULE_NN
 MODULES += MODULE_NN_SEQUENCE_TRAINING
-MODULES += MODULE_THEANO_INTERFACE
 MODULES += MODULE_PYTHON
 
 # ****** OpenFst ******

apptainer/2022-10-21_tensorflow-1.15_v1/makefiles/Modules.make

@@ -65,7 +65,6 @@ MODULES += MODULE_MM_DT
 # ****** Neural Network ******
 MODULES += MODULE_NN
 MODULES += MODULE_NN_SEQUENCE_TRAINING
-MODULES += MODULE_THEANO_INTERFACE
 MODULES += MODULE_PYTHON
 
 # ****** OpenFst ******

apptainer/2023-05-08_tensorflow-2.8_v1/makefiles/Modules.make

@@ -65,7 +65,6 @@ MODULES += MODULE_MM_DT
 # ****** Neural Network ******
 MODULES += MODULE_NN
 MODULES += MODULE_NN_SEQUENCE_TRAINING
-MODULES += MODULE_THEANO_INTERFACE
 MODULES += MODULE_PYTHON
 
 # ****** OpenFst ******

apptainer/2023-08-09_tensorflow-2.8_onnx-1.15_v1/makefiles/Modules.make

@@ -66,7 +66,6 @@ MODULES += MODULE_MM_DT
 # ****** Neural Network ******
 MODULES += MODULE_NN
 MODULES += MODULE_NN_SEQUENCE_TRAINING
-MODULES += MODULE_THEANO_INTERFACE
 MODULES += MODULE_PYTHON
 
 # ****** OpenFst ******

apptainer/2023-11-08_tensorflow-2.14_v1/makefiles/Modules.make

@@ -65,7 +65,6 @@ MODULES += MODULE_MM_DT
 # ****** Neural Network ******
 MODULES += MODULE_NN
 MODULES += MODULE_NN_SEQUENCE_TRAINING
-MODULES += MODULE_THEANO_INTERFACE
 MODULES += MODULE_PYTHON
 
 # ****** OpenFst ******

src/Bliss/CorpusDescription.cc

@@ -26,9 +26,6 @@
 #include <Modules.hh>
 #include <iomanip>
 
-#ifdef MODULE_THEANO_INTERFACE
-#include "TheanoSegmentOrderingVisitor.hh"
-#endif
 #ifdef MODULE_PYTHON
 #include "PythonSegmentOrdering.hh"
 #endif
@@ -215,10 +212,6 @@ const Core::ParameterBool CorpusDescription::paramSegmentOrderSortByTimeLength(
 const Core::ParameterInt CorpusDescription::paramSegmentOrderSortByTimeLengthChunkSize(
         "segment-order-sort-by-time-length-chunk-size",
         "Only sort each such chunk of segments. (-1 = disabled)", -1);
-const Core::ParameterBool CorpusDescription::paramTheanoSegmentOrder(
-        "theano-segment-order",
-        "use theano to specify the order of segments over shared memory",
-        false);
 const Core::ParameterBool CorpusDescription::paramPythonSegmentOrder(
         "python-segment-order",
         "use Python to specify the order of segments",
@@ -520,19 +513,10 @@ CorpusDescription::CorpusDescription(const Core::Configuration& c)
 
     // Handle the ordering.
     {
-        if (paramTheanoSegmentOrder(config)) {
-#ifdef MODULE_THEANO_INTERFACE
-            verify(!ordering_);
-            ordering_ = new TheanoSegmentOrderingVisitor();
-            log("Using Theano segment ordering");
-#else
-            criticalError("theano-segment-order not possible, MODULE_THEANO_INTERFACE disabled.");
-#endif
-        }
         if (paramPythonSegmentOrder(config)) {
 #ifdef MODULE_PYTHON
             if (ordering_)
-                criticalError("python-segment-order not possible, another ordering (theano?) already used");
+                criticalError("python-segment-order not possible, another ordering already used");
             std::string pyModPath = paramPythonSegmentOrderModPath(config);
             std::string pyModName = paramPythonSegmentOrderModName(config);
             std::string pyConfig  = paramPythonSegmentOrderConfig(config);

src/Bliss/CorpusDescription.hh

@@ -590,7 +590,6 @@ public:
     static const Core::ParameterBool         paramSegmentOrderSortByTimeLength;
     static const Core::ParameterInt          paramSegmentOrderSortByTimeLengthChunkSize;
     static const Core::ParameterBool         paramProgressReportingSegmentOrth;
-    static const Core::ParameterBool         paramTheanoSegmentOrder;
     static const Core::ParameterBool         paramPythonSegmentOrder;
     static const Core::ParameterString       paramPythonSegmentOrderModPath;
     static const Core::ParameterString       paramPythonSegmentOrderModName;

src/Bliss/Makefile

@@ -34,10 +34,6 @@ CHECK_O		= $(OBJDIR)/check.o 			\
 		  ../Math/libSprintMath.$(a)		\
 		  ../Core/libSprintCore.$(a)
 
-ifdef MODULE_THEANO_INTERFACE
-  LIBBLISS_O += $(OBJDIR)/TheanoCommunicator.o
-  LIBBLISS_O += $(OBJDIR)/TheanoSegmentOrderingVisitor.o
-endif
 ifdef MODULE_PYTHON
   LIBBLISS_O += $(OBJDIR)/PythonSegmentOrdering.o
   CHECK_O += ../Python/libSprintPython.$(a)