Skip to content

Add tree label-synchronous beam-search algorithm #129

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

Open
wants to merge 4 commits into
base: lexiconfree_labelsync_search
Choose a base branch
from
Open

Add tree label-synchronous beam-search algorithm #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b35b967
Add TreeLabelsyncBeamSearch
larissakl May 30, 2025
8712b59
Formatting
larissakl May 30, 2025
e9286d0
Merge branch 'lexiconfree_labelsync_search' into tree_labelsync_search
larissakl Jul 29, 2025
9303672
Correct two more Modules.make
larissakl Jul 29, 2025
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
2 changes: 2 additions & 0 deletions Modules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ endif
LIBS_SEARCH = src/Search/libSprintSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeLabelsyncBeamSearch/libSprintLexiconfreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeTimesyncBeamSearch/libSprintLexiconfreeTimesyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeLabelsyncBeamSearch/libSprintTreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeTimesyncBeamSearch/libSprintTreeTimesyncBeamSearch.$(a)
ifdef MODULE_SEARCH_WFST
LIBS_SEARCH += src/Search/Wfst/libSprintSearchWfst.$(a)
LIBS_SEARCH += src/OpenFst/libSprintOpenFst.$(a)
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -144,6 +144,7 @@ endif
LIBS_SEARCH = src/Search/libSprintSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeLabelsyncBeamSearch/libSprintLexiconfreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeTimesyncBeamSearch/libSprintLexiconfreeTimesyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeLabelsyncBeamSearch/libSprintTreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeTimesyncBeamSearch/libSprintTreeTimesyncBeamSearch.$(a)
ifdef MODULE_SEARCH_WFST
LIBS_SEARCH += src/Search/Wfst/libSprintSearchWfst.$(a)
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -144,6 +144,7 @@ endif
LIBS_SEARCH = src/Search/libSprintSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeLabelsyncBeamSearch/libSprintLexiconfreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeTimesyncBeamSearch/libSprintLexiconfreeTimesyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeLabelsyncBeamSearch/libSprintTreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeTimesyncBeamSearch/libSprintTreeTimesyncBeamSearch.$(a)
ifdef MODULE_SEARCH_WFST
LIBS_SEARCH += src/Search/Wfst/libSprintSearchWfst.$(a)
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -144,6 +144,7 @@ endif
LIBS_SEARCH = src/Search/libSprintSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeLabelsyncBeamSearch/libSprintLexiconfreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeTimesyncBeamSearch/libSprintLexiconfreeTimesyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeLabelsyncBeamSearch/libSprintTreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeTimesyncBeamSearch/libSprintTreeTimesyncBeamSearch.$(a)
ifdef MODULE_SEARCH_WFST
LIBS_SEARCH += src/Search/Wfst/libSprintSearchWfst.$(a)
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -148,6 +148,7 @@ endif
LIBS_SEARCH = src/Search/libSprintSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeLabelsyncBeamSearch/libSprintLexiconfreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeTimesyncBeamSearch/libSprintLexiconfreeTimesyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeLabelsyncBeamSearch/libSprintTreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeTimesyncBeamSearch/libSprintTreeTimesyncBeamSearch.$(a)
ifdef MODULE_SEARCH_WFST
LIBS_SEARCH += src/Search/Wfst/libSprintSearchWfst.$(a)
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -149,6 +149,7 @@ endif
LIBS_SEARCH = src/Search/libSprintSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeLabelsyncBeamSearch/libSprintLexiconfreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeTimesyncBeamSearch/libSprintLexiconfreeTimesyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeLabelsyncBeamSearch/libSprintTreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeTimesyncBeamSearch/libSprintTreeTimesyncBeamSearch.$(a)
ifdef MODULE_SEARCH_WFST
LIBS_SEARCH += src/Search/Wfst/libSprintSearchWfst.$(a)
Expand Down
1 change: 1 addition & 0 deletions apptainer/2025-04-23_tensorflow-2.17_onnx-1.20_v1/makefiles/Modules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ endif
LIBS_SEARCH = src/Search/libSprintSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeLabelsyncBeamSearch/libSprintLexiconfreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeTimesyncBeamSearch/libSprintLexiconfreeTimesyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeLabelsyncBeamSearch/libSprintTreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeTimesyncBeamSearch/libSprintTreeTimesyncBeamSearch.$(a)
ifdef MODULE_SEARCH_WFST
LIBS_SEARCH += src/Search/Wfst/libSprintSearchWfst.$(a)
Expand Down
1 change: 1 addition & 0 deletions apptainer/2025-04-23_tensorflow-2.17_onnx-1.20_v2/makefiles/Modules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ endif
LIBS_SEARCH = src/Search/libSprintSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeLabelsyncBeamSearch/libSprintLexiconfreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/LexiconfreeTimesyncBeamSearch/libSprintLexiconfreeTimesyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeLabelsyncBeamSearch/libSprintTreeLabelsyncBeamSearch.$(a)
LIBS_SEARCH += src/Search/TreeTimesyncBeamSearch/libSprintTreeTimesyncBeamSearch.$(a)
ifdef MODULE_SEARCH_WFST
LIBS_SEARCH += src/Search/Wfst/libSprintSearchWfst.$(a)
Expand Down
4 changes: 4 additions & 0 deletions src/Search/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ LIBSPRINTSEARCH_O += $(OBJDIR)/MinimumBayesRiskSearchUtil.o
endif
SUBDIRS += LexiconfreeLabelsyncBeamSearch
SUBDIRS += LexiconfreeTimesyncBeamSearch
SUBDIRS += TreeLabelsyncBeamSearch
SUBDIRS += TreeTimesyncBeamSearch
ifdef MODULE_SEARCH_WFST
SUBDIRS += Wfst
Expand Down Expand Up @@ -74,6 +75,9 @@ LexiconfreeLabelsyncBeamSearch:
LexiconfreeTimesyncBeamSearch:
$(MAKE) -C $@ libSprintLexiconfreeTimesyncBeamSearch.$(a)

TreeLabelsyncBeamSearch:
$(MAKE) -C $@ libSprintTreeLabelsyncBeamSearch.$(a)

TreeTimesyncBeamSearch:
$(MAKE) -C $@ libSprintTreeTimesyncBeamSearch.$(a)

Expand Down
5 changes: 5 additions & 0 deletions src/Search/Module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "LexiconfreeLabelsyncBeamSearch/LexiconfreeLabelsyncBeamSearch.hh"
#include "LexiconfreeTimesyncBeamSearch/LexiconfreeTimesyncBeamSearch.hh"
#include "TreeBuilder.hh"
#include "TreeLabelsyncBeamSearch/TreeLabelsyncBeamSearch.hh"
#include "TreeTimesyncBeamSearch/TreeTimesyncBeamSearch.hh"
#ifdef MODULE_SEARCH_WFST
#include <Search/Wfst/ExpandingFsaSearch.hh>
Expand All @@ -38,6 +39,7 @@ Module_::Module_() {
const Core::Choice Module_::searchTypeV2Choice(
"lexiconfree-labelsync-beam-search", SearchTypeV2::LexiconfreeLabelsyncBeamSearchType,
"lexiconfree-timesync-beam-search", SearchTypeV2::LexiconfreeTimesyncBeamSearchType,
"tree-labelsync-beam-search", SearchTypeV2::TreeLabelsyncBeamSearchType,
"tree-timesync-beam-search", SearchTypeV2::TreeTimesyncBeamSearchType,
Core::Choice::endMark());

Expand Down Expand Up @@ -117,6 +119,9 @@ SearchAlgorithmV2* Module_::createSearchAlgorithmV2(const Core::Configuration& c
case LexiconfreeTimesyncBeamSearchType:
searchAlgorithm = new Search::LexiconfreeTimesyncBeamSearch(config);
break;
case TreeLabelsyncBeamSearchType:
searchAlgorithm = new Search::TreeLabelsyncBeamSearch(config);
break;
case TreeTimesyncBeamSearchType:
searchAlgorithm = new Search::TreeTimesyncBeamSearch(config);
break;
Expand Down
1 change: 1 addition & 0 deletions src/Search/Module.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ enum SearchType {
enum SearchTypeV2 {
LexiconfreeLabelsyncBeamSearchType,
LexiconfreeTimesyncBeamSearchType,
TreeLabelsyncBeamSearchType,
TreeTimesyncBeamSearchType
};

Expand Down
24 changes: 24 additions & 0 deletions src/Search/TreeLabelsyncBeamSearch/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!gmake

TOPDIR = ../../..

include $(TOPDIR)/Makefile.cfg

# -----------------------------------------------------------------------------

SUBDIRS =
TARGETS = libSprintTreeLabelsyncBeamSearch.$(a)

LIBSPRINTTREELABELSYNCBEAMSEARCH_O = $(OBJDIR)/TreeLabelsyncBeamSearch.o


# -----------------------------------------------------------------------------

all: $(TARGETS)

libSprintTreeLabelsyncBeamSearch.$(a): $(LIBSPRINTTREELABELSYNCBEAMSEARCH_O)
$(MAKELIB) $@ $^

include $(TOPDIR)/Rules.make

sinclude $(LIBSPRINTTREELABELSYNCBEAMSEARCH_O:.o=.d)
Loading