diff options
author | Alexander Gutkin <agutkin@google.com> | 2013-02-28 00:24:20 +0000 |
---|---|---|
committer | Alexander Gutkin <agutkin@google.com> | 2013-02-28 00:24:20 +0000 |
commit | 5b6dc79427b8f7eeb6a7ff68034ab8548ce670ea (patch) | |
tree | 19e17fc79b8873e66f211276d4dd169c480cede1 /src/extensions/far | |
parent | 3da1eb108d36da35333b2d655202791af854996b (diff) | |
download | openfst-5b6dc79427b8f7eeb6a7ff68034ab8548ce670ea.tar.gz |
Bumped OpenFST implementation to openfst-1.3.3-CL41851770.
Updated OpenFST implementation to the most recent version
used by Greco3 (corresponds to nlp::fst exported at Perforce
CL 41851770).
In particular this version has an improved PDT support.
Change-Id: I5aadfc962297eef73922c67e7d57866f11ee7d81
Diffstat (limited to 'src/extensions/far')
-rw-r--r-- | src/extensions/far/Makefile.am | 4 | ||||
-rw-r--r-- | src/extensions/far/Makefile.in | 62 | ||||
-rw-r--r-- | src/extensions/far/farcompilestrings.cc | 2 | ||||
-rw-r--r-- | src/extensions/far/farequal.cc | 4 | ||||
-rw-r--r-- | src/extensions/far/farextract.cc | 14 | ||||
-rw-r--r-- | src/extensions/far/farscript.cc | 10 |
6 files changed, 54 insertions, 42 deletions
diff --git a/src/extensions/far/Makefile.am b/src/extensions/far/Makefile.am index a7c2fff..1f063e3 100644 --- a/src/extensions/far/Makefile.am +++ b/src/extensions/far/Makefile.am @@ -9,11 +9,11 @@ libfst_LTLIBRARIES = libfstfar.la endif libfstfar_la_SOURCES = sttable.cc stlist.cc -libfstfar_la_LDFLAGS = -version-info 0:0:0 +libfstfar_la_LDFLAGS = -version-info 1:0:0 if HAVE_SCRIPT libfstfarscript_la_SOURCES = farscript.cc strings.cc main.cc -libfstfarscript_la_LDFLAGS = -version-info 0:0:0 +libfstfarscript_la_LDFLAGS = -version-info 1:0:0 endif if HAVE_BIN diff --git a/src/extensions/far/Makefile.in b/src/extensions/far/Makefile.in index 0635556..bbb6989 100644 --- a/src/extensions/far/Makefile.in +++ b/src/extensions/far/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -42,10 +42,10 @@ host_triplet = @host@ subdir = src/extensions/far DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_icu.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -74,6 +74,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libfstdir)" "$(DESTDIR)$(bindir)" LTLIBRARIES = $(libfst_LTLIBRARIES) libfstfar_la_LIBADD = @@ -182,6 +188,7 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -191,11 +198,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ -ICU_CFLAGS = @ICU_CFLAGS@ -ICU_CONFIG = @ICU_CONFIG@ -ICU_CPPFLAGS = @ICU_CPPFLAGS@ -ICU_CXXFLAGS = @ICU_CXXFLAGS@ -ICU_LIBS = @ICU_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -210,6 +212,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -235,6 +238,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -269,7 +273,6 @@ libexecdir = @libexecdir@ libfstdir = @libfstdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -289,9 +292,9 @@ AM_CPPFLAGS = -I$(srcdir)/../../include $(ICU_CPPFLAGS) @HAVE_SCRIPT_FALSE@libfst_LTLIBRARIES = libfstfar.la @HAVE_SCRIPT_TRUE@libfst_LTLIBRARIES = libfstfarscript.la libfstfar.la libfstfar_la_SOURCES = sttable.cc stlist.cc -libfstfar_la_LDFLAGS = -version-info 0:0:0 +libfstfar_la_LDFLAGS = -version-info 1:0:0 @HAVE_SCRIPT_TRUE@libfstfarscript_la_SOURCES = farscript.cc strings.cc main.cc -@HAVE_SCRIPT_TRUE@libfstfarscript_la_LDFLAGS = -version-info 0:0:0 +@HAVE_SCRIPT_TRUE@libfstfarscript_la_LDFLAGS = -version-info 1:0:0 @HAVE_BIN_TRUE@LDADD = libfstfarscript.la libfstfar.la ../../script/libfstscript.la \ @HAVE_BIN_TRUE@ ../../lib/libfst.la -lm -ldl @@ -366,9 +369,9 @@ clean-libfstLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libfstfar.la: $(libfstfar_la_OBJECTS) $(libfstfar_la_DEPENDENCIES) +libfstfar.la: $(libfstfar_la_OBJECTS) $(libfstfar_la_DEPENDENCIES) $(EXTRA_libfstfar_la_DEPENDENCIES) $(libfstfar_la_LINK) $(am_libfstfar_la_rpath) $(libfstfar_la_OBJECTS) $(libfstfar_la_LIBADD) $(LIBS) -libfstfarscript.la: $(libfstfarscript_la_OBJECTS) $(libfstfarscript_la_DEPENDENCIES) +libfstfarscript.la: $(libfstfarscript_la_OBJECTS) $(libfstfarscript_la_DEPENDENCIES) $(EXTRA_libfstfarscript_la_DEPENDENCIES) $(libfstfarscript_la_LINK) $(am_libfstfarscript_la_rpath) $(libfstfarscript_la_OBJECTS) $(libfstfarscript_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @@ -413,22 +416,22 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -farcompilestrings$(EXEEXT): $(farcompilestrings_OBJECTS) $(farcompilestrings_DEPENDENCIES) +farcompilestrings$(EXEEXT): $(farcompilestrings_OBJECTS) $(farcompilestrings_DEPENDENCIES) $(EXTRA_farcompilestrings_DEPENDENCIES) @rm -f farcompilestrings$(EXEEXT) $(CXXLINK) $(farcompilestrings_OBJECTS) $(farcompilestrings_LDADD) $(LIBS) -farcreate$(EXEEXT): $(farcreate_OBJECTS) $(farcreate_DEPENDENCIES) +farcreate$(EXEEXT): $(farcreate_OBJECTS) $(farcreate_DEPENDENCIES) $(EXTRA_farcreate_DEPENDENCIES) @rm -f farcreate$(EXEEXT) $(CXXLINK) $(farcreate_OBJECTS) $(farcreate_LDADD) $(LIBS) -farequal$(EXEEXT): $(farequal_OBJECTS) $(farequal_DEPENDENCIES) +farequal$(EXEEXT): $(farequal_OBJECTS) $(farequal_DEPENDENCIES) $(EXTRA_farequal_DEPENDENCIES) @rm -f farequal$(EXEEXT) $(CXXLINK) $(farequal_OBJECTS) $(farequal_LDADD) $(LIBS) -farextract$(EXEEXT): $(farextract_OBJECTS) $(farextract_DEPENDENCIES) +farextract$(EXEEXT): $(farextract_OBJECTS) $(farextract_DEPENDENCIES) $(EXTRA_farextract_DEPENDENCIES) @rm -f farextract$(EXEEXT) $(CXXLINK) $(farextract_OBJECTS) $(farextract_LDADD) $(LIBS) -farinfo$(EXEEXT): $(farinfo_OBJECTS) $(farinfo_DEPENDENCIES) +farinfo$(EXEEXT): $(farinfo_OBJECTS) $(farinfo_DEPENDENCIES) $(EXTRA_farinfo_DEPENDENCIES) @rm -f farinfo$(EXEEXT) $(CXXLINK) $(farinfo_OBJECTS) $(farinfo_LDADD) $(LIBS) -farprintstrings$(EXEEXT): $(farprintstrings_OBJECTS) $(farprintstrings_DEPENDENCIES) +farprintstrings$(EXEEXT): $(farprintstrings_OBJECTS) $(farprintstrings_DEPENDENCIES) $(EXTRA_farprintstrings_DEPENDENCIES) @rm -f farprintstrings$(EXEEXT) $(CXXLINK) $(farprintstrings_OBJECTS) $(farprintstrings_LDADD) $(LIBS) @@ -576,10 +579,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/src/extensions/far/farcompilestrings.cc b/src/extensions/far/farcompilestrings.cc index 765b908..c611ae9 100644 --- a/src/extensions/far/farcompilestrings.cc +++ b/src/extensions/far/farcompilestrings.cc @@ -32,7 +32,7 @@ DEFINE_string(key_suffix, "", "Suffix to append to keys"); DEFINE_int32(generate_keys, 0, "Generate N digit numeric keys (def: use file basenames)"); DEFINE_string(far_type, "default", - "FAR file format type: one of: \"default\", \"fst\"" + "FAR file format type: one of: \"default\", \"fst\", " "\"stlist\", \"sttable\""); DEFINE_bool(allow_negative_labels, false, "Allow negative labels (not recommended; may cause conflicts)"); diff --git a/src/extensions/far/farequal.cc b/src/extensions/far/farequal.cc index 94e607c..a32cccb 100644 --- a/src/extensions/far/farequal.cc +++ b/src/extensions/far/farequal.cc @@ -30,8 +30,8 @@ DEFINE_double(delta, fst::kDelta, "Comparison/quantization delta"); int main(int argc, char **argv) { namespace s = fst::script; - string usage = "Prints some basic information about the FSTs in an FST "; - usage += "archive.\n\n Usage:"; + string usage = "Compares the FSTs in two FST archives for equality."; + usage += "\n\n Usage:"; usage += argv[0]; usage += " in1.far in2.far\n"; usage += " Flags: begin_key end_key"; diff --git a/src/extensions/far/farextract.cc b/src/extensions/far/farextract.cc index 66b7840..e701e8a 100644 --- a/src/extensions/far/farextract.cc +++ b/src/extensions/far/farextract.cc @@ -27,11 +27,11 @@ DEFINE_string(filename_prefix, "", "Prefix to append to filenames"); DEFINE_string(filename_suffix, "", "Suffix to append to filenames"); DEFINE_int32(generate_filenames, 0, "Generate N digit numeric filenames (def: use keys)"); -DEFINE_string(begin_key, "", - "First key to extract (def: first key in archive)"); -DEFINE_string(end_key, "", - "Last key to extract (def: last key in archive)"); - +DEFINE_string(keys, "", + "Extract set of keys separated by comma (default) " + "including ranges delimited by dash (default)" ); +DEFINE_string(key_separator, ",", "Separator for individual keys"); +DEFINE_string(range_delimiter, "-", "Delimiter for ranges of keys"); int main(int argc, char **argv) { namespace s = fst::script; @@ -51,8 +51,8 @@ int main(int argc, char **argv) { const string &arc_type = fst::LoadArcTypeFromFar(ifilenames[0]); s::FarExtract(ifilenames, arc_type, FLAGS_generate_filenames, - FLAGS_begin_key, FLAGS_end_key, FLAGS_filename_prefix, - FLAGS_filename_suffix); + FLAGS_keys, FLAGS_key_separator, FLAGS_range_delimiter, + FLAGS_filename_prefix, FLAGS_filename_suffix); return 0; } diff --git a/src/extensions/far/farscript.cc b/src/extensions/far/farscript.cc index bc4ad0e..76da273 100644 --- a/src/extensions/far/farscript.cc +++ b/src/extensions/far/farscript.cc @@ -76,10 +76,14 @@ bool FarEqual(const string &filename1, const string &filename2, void FarExtract(const vector<string> &ifilenames, const string &arc_type, - int32 generate_filenames, const string &begin_key, - const string &end_key, const string &filename_prefix, + int32 generate_filenames, + const string &keys, + const string &key_separator, + const string &range_delimiter, + const string &filename_prefix, const string &filename_suffix) { - FarExtractArgs args(ifilenames, generate_filenames, begin_key, end_key, + FarExtractArgs args(ifilenames, generate_filenames, keys, + key_separator, range_delimiter, filename_prefix, filename_suffix); Apply<Operation<FarExtractArgs> >("FarExtract", arc_type, &args); |