Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup old Theano code #86

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Cleanup old Theano code #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Modules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ******
Expand Down
1 change: 0 additions & 1 deletion apptainer/2022-10-21_tensorflow-1.15_arm_v1/makefiles/Modules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ******
Expand Down
1 change: 0 additions & 1 deletion apptainer/2022-10-21_tensorflow-1.15_v1/makefiles/Modules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ******
Expand Down
1 change: 0 additions & 1 deletion apptainer/2023-05-08_tensorflow-2.8_v1/makefiles/Modules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ******
Expand Down
1 change: 0 additions & 1 deletion apptainer/2023-08-09_tensorflow-2.8_onnx-1.15_v1/makefiles/Modules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ******
Expand Down
1 change: 0 additions & 1 deletion apptainer/2023-11-08_tensorflow-2.14_v1/makefiles/Modules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ******
Expand Down
18 changes: 1 addition & 17 deletions src/Bliss/CorpusDescription.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
#include <Modules.hh>
#include <iomanip>

#ifdef MODULE_THEANO_INTERFACE
#include "TheanoSegmentOrderingVisitor.hh"
#endif
#ifdef MODULE_PYTHON
#include "PythonSegmentOrdering.hh"
#endif
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/Bliss/CorpusDescription.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions src/Bliss/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
201 changes: 0 additions & 201 deletions src/Bliss/TheanoCommunicator.cc
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions src/Bliss/TheanoCommunicator.hh
View file
Open in desktop

This file was deleted.

Loading