Import v1.7.6 r1

http://www.openfst.org/twiki/bin/viewfile/FST/FstDownload?filename=openfst-1.7.6.tar.gz;rev=1

AUTHORS

@@ -1,4 +1,6 @@
-Principal Contacts:
+Google, Inc.
+
+Principal developers:
 
 Cyril Allauzen     <[email protected]>
 Michael Riley      <[email protected]>
@@ -25,4 +27,5 @@ Jeffrey Sorensen
 Richard Sproat
 Ananda Theertha Suresh
 Terry Tai
+Lawrence Wolf-Sonkin
 Ke Wu

NEWS

@@ -1,4 +1,9 @@
 OpenFst: Release 1.7
+   * Adds MakeArcMapFst (1.7.6)
+   * Adds RealWeight and Real64Weight (1.7.6)
+   * Adds a new, idiomatic SymbolTable iterator interface (1.7.6)
+   * Improves symbol table lifetime management in pywrapfst (1.7.6)
+   * Improves the design of the FST class hierarchy in pywrapfst (1.7.6)
    * Removes unnecessary template parameters in constructors (1.7.5)
    * Converts RmEpsilonFstOptions from class to struct (1.7.5)
    * Eliminates redundant checks in Minimize (1.7.5)
@@ -35,7 +40,7 @@ OpenFst: Release 1.6
    * Fixed PROGRAM_FLAGS documentation string in binaries (1.6.8)
    * Fixed handling of symbol tables in EpsNormalize (1.6.8)
    * Fixed error reporting when FST arc type unknown (1.6.8)
-   * The `first_path` option to ShortestPath is now optimal for A* (1.6.7)
+   * The first_path option to ShortestPath is now optimal for A* (1.6.7)
    * Renames SymbolTable::kNoSymbol to kNoSymbol (1.6.7)
    * Exposes PowerMapper to the scripting API (1.6.7)
    * Fixes linking of the special SOs (1.6.7)
@@ -96,8 +101,8 @@ OpenFst: Release 1.5
      pointers where possible, and fixed reference-counting bugs (1.5.1)
    * When calling DeleteStates on a MutableFst with a shared impl, the impl
      is set to a new empty impl rather than copying and deleting (1.5.1)
-   * Prepended `Pdt` to the Expand libraries and classes in the PDT
-     extension, and prepended `MPdt` to the Expand libraries and classes
+   * Prepended Pdt to the Expand libraries and classes in the PDT
+     extension, and prepended MPdt to the Expand libraries and classes
      in the MPDT extension, so that both can be used in the same compilation
      unit (1.5.1)
    * Added option to PDT Replace for compiling a strongly-regular RTN into a

README

@@ -18,6 +18,7 @@ INSTALLATION:
   --enable-compress        Enable compression extension (def: no)
   --enable-const-fsts      Enable ConstFst extensions (def: no)
   --enable-far             Enable FAR extensions (def: no)
+  --enable-fsts            Enable all FST SO extensions (def: no)
   --enable-grm             Enable all dependencies of OpenGrm (def: no)
   --enable-linear-fsts     Enable LinearTagger/ClassifierFst extensions (def: no)
   --enable-lookahead-fsts  Enable LookAheadFst extensions (def: no)
@@ -60,7 +61,7 @@ USAGE:
   or /usr/local/include/fst/extensions.
 
 BUILDING WITH BAZEL:
-  As of release 1.7.2 it is possible to build the core library and binaries as
+  Release 1.7.2 provides the ability to build the core library and binaries as
   well as several extensions with Bazel and to depend on OpenFst as an
   external dependency in other projects compiled with Bazel. Please refer to
   https://bazel.build for information on using Bazel. OpenFst can be compiled
@@ -72,6 +73,8 @@ BUILDING WITH BAZEL:
 
   $ bazel test //:all
 
+  The Bazel build-file is provided as-is.
+
 DOCUMENTATION:
   See www.openfst.org for general documentation.
   See ./NEWS for updates since the last release.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenFst 1.7.5.
+# Generated by GNU Autoconf 2.69 for OpenFst 1.7.6.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenFst'
 PACKAGE_TARNAME='openfst'
-PACKAGE_VERSION='1.7.5'
-PACKAGE_STRING='OpenFst 1.7.5'
+PACKAGE_VERSION='1.7.6'
+PACKAGE_STRING='OpenFst 1.7.6'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -640,6 +640,8 @@ DL_LIBS
 libfstdir
 HAVE_GRM_FALSE
 HAVE_GRM_TRUE
+HAVE_FSTS_FALSE
+HAVE_FSTS_TRUE
 HAVE_SCRIPT_FALSE
 HAVE_SCRIPT_TRUE
 HAVE_BIN_FALSE
@@ -826,6 +828,7 @@ enable_pdt
 enable_python
 enable_special
 enable_bin
+enable_fsts
 enable_grm
 with_libfstdir
 '
@@ -1395,7 +1398,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenFst 1.7.5 to adapt to many kinds of systems.
+\`configure' configures OpenFst 1.7.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1466,7 +1469,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenFst 1.7.5:";;
+     short | recursive ) echo "Configuration of OpenFst 1.7.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1497,6 +1500,7 @@ Optional Features:
   --enable-python         enable Python extensions
   --enable-special        enable special-matcher extensions
   --enable-bin            enable fst::script and command-line binaries
+  --enable-fsts           enable all FST SOs
   --enable-grm            enable all dependencies of OpenGrm
 
 Optional Packages:
@@ -1598,7 +1602,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenFst configure 1.7.5
+OpenFst configure 1.7.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2039,7 +2043,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenFst $as_me 1.7.5, which was
+It was created by OpenFst $as_me 1.7.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2902,7 +2906,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openfst'
- VERSION='1.7.5'
+ VERSION='1.7.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4594,7 +4598,7 @@ fi
 
 # This library does not throw exceptions, so we do not generate exception
 # handling code. However, users are free to re-enable exception handling.
-CXX="$CXX -std=c++11 -fno-exceptions"
+CXX="$CXX -std=c++17 -fno-exceptions"
 
 # Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then :
@@ -9130,6 +9134,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
+      # flang / f18. f95 an alias for gfortran or flang on Debian
+      flang* | f18* | f95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
       icc* | ifort*)
@@ -16834,7 +16844,26 @@ else
 fi
 
 
-# --enable-grm enables dependencies of OpenGrm: far, mpdt, and pdt.
+# --enable-fsts is an alias to enable FST SO extensions: compact, const,
+# linear, lookahead, and ngram.
+# Check whether --enable-fsts was given.
+if test "${enable_fsts+set}" = set; then :
+  enableval=$enable_fsts;
+else
+  enable_fsts=no
+fi
+
+ if test "x$enable_fsts" != xno; then
+  HAVE_FSTS_TRUE=
+  HAVE_FSTS_FALSE='#'
+else
+  HAVE_FSTS_TRUE='#'
+  HAVE_FSTS_FALSE=
+fi
+
+
+# --enable-grm is an alias to enable all dependencies of OpenGrm: far, mpdt,
+# and pdt.
 # Check whether --enable-grm was given.
 if test "${enable_grm+set}" = set; then :
   enableval=$enable_grm;
@@ -17150,6 +17179,10 @@ if test -z "${HAVE_SCRIPT_TRUE}" && test -z "${HAVE_SCRIPT_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_SCRIPT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_FSTS_TRUE}" && test -z "${HAVE_FSTS_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_FSTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_GRM_TRUE}" && test -z "${HAVE_GRM_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_GRM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17551,7 +17584,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenFst $as_me 1.7.5, which was
+This file was extended by OpenFst $as_me 1.7.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17617,7 +17650,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenFst config.status 1.7.5
+OpenFst config.status 1.7.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,11 +1,11 @@
-AC_INIT([OpenFst], [1.7.5], [[email protected]])
+AC_INIT([OpenFst], [1.7.6], [[email protected]])
 AM_INIT_AUTOMAKE([foreign nostdinc -Wall -Werror subdir-objects])
 AM_PROG_AR
 
 AC_PROG_CXX
 # This library does not throw exceptions, so we do not generate exception
 # handling code. However, users are free to re-enable exception handling.
-CXX="$CXX -std=c++11 -fno-exceptions"
+CXX="$CXX -std=c++17 -fno-exceptions"
 
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -125,7 +125,17 @@ AC_ARG_ENABLE([bin],
 AM_CONDITIONAL([HAVE_BIN], [test "x$enable_bin" != xno])
 AM_CONDITIONAL([HAVE_SCRIPT], [test "x$enable_bin" != xno])
 
-# --enable-grm enables dependencies of OpenGrm: far, mpdt, and pdt.
+# --enable-fsts is an alias to enable FST SO extensions: compact, const,
+# linear, lookahead, and ngram.
+AC_ARG_ENABLE([fsts],
+              [AS_HELP_STRING([--enable-fsts],
+              [enable all FST SOs])],
+              [],
+              [enable_fsts=no])
+AM_CONDITIONAL([HAVE_FSTS], [test "x$enable_fsts" != xno])
+
+# --enable-grm is an alias to enable all dependencies of OpenGrm: far, mpdt,
+# and pdt.
 AC_ARG_ENABLE([grm],
               [AS_HELP_STRING([--enable-grm],
               [enable all dependencies of OpenGrm])],

ltmain.sh

@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-9"
+VERSION="2.4.6 Debian-2.4.6-11"
 package_revision=2.4.6
 
 
@@ -2141,7 +2141,7 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.6-9
+       version:        $progname $scriptversion Debian-2.4.6-11
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 

m4/libtool.m4

@@ -4704,6 +4704,12 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
+      # flang / f18. f95 an alias for gfortran or flang on Debian
+      flang* | f18* | f95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
       icc* | ifort*)

src/extensions/Makefile.am

@@ -14,6 +14,14 @@ if HAVE_FAR
 fardir = far
 endif
 
+if HAVE_FSTS
+compactdir = compact
+constdir = const
+lineardir = linear
+lookaheaddir = lookahead
+ngramdir = ngram
+endif
+
 if HAVE_GRM
 fardir = far
 pdtdir = pdt

src/extensions/Makefile.in

@@ -322,19 +322,24 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @HAVE_COMPACT_TRUE@compactdir = compact
+@HAVE_FSTS_TRUE@compactdir = compact
 @HAVE_COMPRESS_TRUE@compressdir = compress
 @HAVE_CONST_TRUE@constdir = const
+@HAVE_FSTS_TRUE@constdir = const
 @HAVE_FAR_TRUE@fardir = far
 @HAVE_GRM_TRUE@fardir = far
 @HAVE_PYTHON_TRUE@fardir = far
+@HAVE_FSTS_TRUE@lineardir = linear
+@HAVE_LINEAR_TRUE@lineardir = linear
+@HAVE_FSTS_TRUE@lookaheaddir = lookahead
+@HAVE_LOOKAHEAD_TRUE@lookaheaddir = lookahead
+@HAVE_FSTS_TRUE@ngramdir = ngram
+@HAVE_NGRAM_TRUE@ngramdir = ngram
 @HAVE_GRM_TRUE@pdtdir = pdt
 @HAVE_MPDT_TRUE@pdtdir = pdt
 @HAVE_PDT_TRUE@pdtdir = pdt
 @HAVE_GRM_TRUE@mpdtdir = mpdt
 @HAVE_MPDT_TRUE@mpdtdir = mpdt
-@HAVE_LINEAR_TRUE@lineardir = linear
-@HAVE_LOOKAHEAD_TRUE@lookaheaddir = lookahead
-@HAVE_NGRAM_TRUE@ngramdir = ngram
 @HAVE_PYTHON_TRUE@pywrapfstdir = python
 @HAVE_SPECIAL_TRUE@specialdir = special
 SUBDIRS = $(compactdir) $(compressdir) $(constdir) $(fardir) $(lineardir)  \

src/extensions/compact/Makefile.am

@@ -7,7 +7,7 @@ libfst_LTLIBRARIES = compact8_acceptor-fst.la compact8_string-fst.la compact8_un
 lib_LTLIBRARIES = libfstcompact.la
 
 libfstcompact_la_SOURCES = compact8_acceptor-fst.cc compact8_string-fst.cc compact8_unweighted-fst.cc compact8_unweighted_acceptor-fst.cc compact8_weighted_string-fst.cc compact16_acceptor-fst.cc compact16_string-fst.cc compact16_unweighted-fst.cc compact16_unweighted_acceptor-fst.cc compact16_weighted_string-fst.cc compact64_acceptor-fst.cc compact64_string-fst.cc compact64_unweighted-fst.cc compact64_unweighted_acceptor-fst.cc compact64_weighted_string-fst.cc
-libfstcompact_la_LDFLAGS = -version-info 18:0:0
+libfstcompact_la_LDFLAGS = -version-info 19:0:0
 
 compact8_acceptor_fst_la_SOURCES = compact8_acceptor-fst.cc
 compact8_acceptor_fst_la_LDFLAGS = -avoid-version -module

src/extensions/compact/Makefile.in

@@ -527,7 +527,7 @@ AM_CPPFLAGS = -I$(srcdir)/../../include $(ICU_CPPFLAGS)
 libfst_LTLIBRARIES = compact8_acceptor-fst.la compact8_string-fst.la compact8_unweighted-fst.la compact8_unweighted_acceptor-fst.la compact8_weighted_string-fst.la compact16_acceptor-fst.la compact16_string-fst.la compact16_unweighted-fst.la compact16_unweighted_acceptor-fst.la compact16_weighted_string-fst.la compact64_acceptor-fst.la compact64_string-fst.la compact64_unweighted-fst.la compact64_unweighted_acceptor-fst.la compact64_weighted_string-fst.la
 lib_LTLIBRARIES = libfstcompact.la
 libfstcompact_la_SOURCES = compact8_acceptor-fst.cc compact8_string-fst.cc compact8_unweighted-fst.cc compact8_unweighted_acceptor-fst.cc compact8_weighted_string-fst.cc compact16_acceptor-fst.cc compact16_string-fst.cc compact16_unweighted-fst.cc compact16_unweighted_acceptor-fst.cc compact16_weighted_string-fst.cc compact64_acceptor-fst.cc compact64_string-fst.cc compact64_unweighted-fst.cc compact64_unweighted_acceptor-fst.cc compact64_weighted_string-fst.cc
-libfstcompact_la_LDFLAGS = -version-info 18:0:0
+libfstcompact_la_LDFLAGS = -version-info 19:0:0
 compact8_acceptor_fst_la_SOURCES = compact8_acceptor-fst.cc
 compact8_acceptor_fst_la_LDFLAGS = -avoid-version -module
 compact8_string_fst_la_SOURCES = compact8_string-fst.cc

src/extensions/compress/Makefile.am

@@ -6,17 +6,17 @@ bin_PROGRAMS = fstcompress
 LDADD = libfstcompressscript.la \
         ../../script/libfstscript.la \
         ../../lib/libfst.la \
-        -lz -lm $(DL_LIBS)
+        -lm $(DL_LIBS)
 
 fstcompress_SOURCES = fstcompress.cc fstcompress-main.cc
 endif
 
 if HAVE_SCRIPT
 libfstcompressscript_la_SOURCES = compressscript.cc
-libfstcompressscript_la_LDFLAGS = -version-info 18:0:0
+libfstcompressscript_la_LDFLAGS = -version-info 19:0:0
 libfstcompressscript_la_LIBADD = ../../script/libfstscript.la \
                                  ../../lib/libfst.la \
-                                 -lz -lm $(DL_LIBS)
+                                 -lm $(DL_LIBS)
 endif
 
 if HAVE_SCRIPT