From 33235f2be2bf68284b1b90a1e4be08b3040bb9de Mon Sep 17 00:00:00 2001 From: Nickolay Shmyrev Date: Fri, 15 May 2015 00:19:30 +0200 Subject: [PATCH 1/4] Update to latest fixes --- pocketsphinx | 2 +- sphinxbase | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pocketsphinx b/pocketsphinx index 2286ecc..97bfdf5 160000 --- a/pocketsphinx +++ b/pocketsphinx @@ -1 +1 @@ -Subproject commit 2286ecc956e60109d88453ce179fd4d3dc3d098e +Subproject commit 97bfdf56af232bf4d6e7c4c4a4c7076f7e06348c diff --git a/sphinxbase b/sphinxbase index 5c74d60..b0f3348 160000 --- a/sphinxbase +++ b/sphinxbase @@ -1 +1 @@ -Subproject commit 5c74d60ebc9df2bd199b2db5746e68274967ac92 +Subproject commit b0f33487bb3e75b9048f1010684a5c8da2bdf2db From d9a4bac1cc5e484e570f81dfa1ecbb935dd3f321 Mon Sep 17 00:00:00 2001 From: Nickolay Shmyrev Date: Tue, 23 Jun 2015 10:16:43 +0200 Subject: [PATCH 2/4] Updated to latest state --- pocketsphinx | 2 +- sphinxbase | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pocketsphinx b/pocketsphinx index 97bfdf5..56048a6 160000 --- a/pocketsphinx +++ b/pocketsphinx @@ -1 +1 @@ -Subproject commit 97bfdf56af232bf4d6e7c4c4a4c7076f7e06348c +Subproject commit 56048a6e76ccaefbb221a9863e71410af72e82f9 diff --git a/sphinxbase b/sphinxbase index b0f3348..18aec4d 160000 --- a/sphinxbase +++ b/sphinxbase @@ -1 +1 @@ -Subproject commit b0f33487bb3e75b9048f1010684a5c8da2bdf2db +Subproject commit 18aec4d11c5fc724a15f899bc1222bfcfe589def From ac70b158c915cd133c4f3cbb67329548f72139c3 Mon Sep 17 00:00:00 2001 From: Nickolay Shmyrev Date: Wed, 15 Jul 2015 00:27:01 +0200 Subject: [PATCH 3/4] Updated to latest HEAD No need for winmm or libsphinxad in python --- example.py | 2 +- pocketsphinx | 2 +- setup.py | 19 ++++--------------- sphinxbase | 2 +- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/example.py b/example.py index 8cdc900..c16d02c 100644 --- a/example.py +++ b/example.py @@ -9,7 +9,7 @@ # Create a decoder with certain model config = Decoder.default_config() config.set_string('-hmm', path.join(MODELDIR, 'en-us/en-us')) -config.set_string('-lm', path.join(MODELDIR, 'en-us/en-us.lm.dmp')) +config.set_string('-lm', path.join(MODELDIR, 'en-us/en-us.lm.bin')) config.set_string('-dict', path.join(MODELDIR, 'en-us/cmudict-en-us.dict')) decoder = Decoder(config) diff --git a/pocketsphinx b/pocketsphinx index 56048a6..dce8758 160000 --- a/pocketsphinx +++ b/pocketsphinx @@ -1 +1 @@ -Subproject commit 56048a6e76ccaefbb221a9863e71410af72e82f9 +Subproject commit dce8758aa6783c4fccb8a5d8824a5ff5a0e4fc1c diff --git a/setup.py b/setup.py index 998b7b4..5966ea1 100644 --- a/setup.py +++ b/setup.py @@ -55,14 +55,12 @@ PY2 = sys.version_info[0] == 2 libsphinxbase = ( - [s for s in glob('sphinxbase/src/libsphinxbase/lm/*.c') if 'lm3g_templates.c' not in s] + + glob('sphinxbase/src/libsphinxbase/lm/*.c') + glob('sphinxbase/src/libsphinxbase/feat/*.c') + glob('sphinxbase/src/libsphinxbase/util/*.c') + glob('sphinxbase/src/libsphinxbase/fe/*.c') ) -libsphinxad = [] - libpocketsphinx = glob('pocketsphinx/src/libpocketsphinx/*.c') sb_include_dirs = ['sphinxbase/include', 'sphinxbase/include/sphinxbase'] @@ -82,9 +80,6 @@ extra_compile_args = [] if sys.platform.startswith('linux'): - libsphinxad.extend([ - 'sphinxbase/src/libsphinxad/ad_oss.c' - ]) sb_include_dirs.extend(['include']) extra_compile_args.extend([ '-Wno-unused-label', @@ -94,11 +89,7 @@ '-Wno-unused-variable' ]) elif sys.platform.startswith('win'): - libsphinxad.extend([ - 'sphinxbase/src/libsphinxad/ad_win32.c' - ]) sb_include_dirs.extend(['sphinxbase/include/win32']) - libraries.append('winmm') define_macros.extend([ ('WIN32', None), ('_WINDOWS', None), @@ -112,19 +103,17 @@ '/wd4018' ]) elif sys.platform.startswith('darwin'): - pass + sb_include_dirs.extend(['include']) else: pass sb_sources = ( libsphinxbase + - libsphinxad + ['sphinxbase/swig/sphinxbase.i'] ) ps_sources = ( libsphinxbase + - libsphinxad + libpocketsphinx + ['pocketsphinx/swig/pocketsphinx.i'] ) @@ -147,14 +136,14 @@ setup( name='pocketsphinx', - version='0.0.4', + version='0.0.5', description='Python interface to CMU SphinxBase and PocketSphinx libraries', long_description=__doc__, author='Dmitry Prazdnichnov', author_email='dp@bambucha.org', maintainer='Dmitry Prazdnichnov', maintainer_email='dp@bambucha.org', - url='https://github.com/bambocher/pocketsphinx-python', + url='https://github.com/cmusphinx/pocketsphinx-python', download_url='https://pypi.python.org/pypi/pocketsphinx', packages=['sphinxbase', 'pocketsphinx'], ext_modules=[ diff --git a/sphinxbase b/sphinxbase index 18aec4d..5e0f0e9 160000 --- a/sphinxbase +++ b/sphinxbase @@ -1 +1 @@ -Subproject commit 18aec4d11c5fc724a15f899bc1222bfcfe589def +Subproject commit 5e0f0e92ddc0c25064020a5b2a3d9edcd575e206 From 58e2aa3780d8b592a5d8b4dc3329e53f370fe56b Mon Sep 17 00:00:00 2001 From: Nickolay Shmyrev Date: Tue, 21 Jul 2015 09:10:51 +0200 Subject: [PATCH 4/4] Our model is now .lm.bin Fixes issue #3 --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 1badc7a..41006cb 100644 --- a/readme.md +++ b/readme.md @@ -83,7 +83,7 @@ DATADIR = "pocketsphinx/test/data" # Create a decoder with certain model config = Decoder.default_config() config.set_string('-hmm', path.join(MODELDIR, 'en-us/en-us')) -config.set_string('-lm', path.join(MODELDIR, 'en-us/en-us.lm.dmp')) +config.set_string('-lm', path.join(MODELDIR, 'en-us/en-us.lm.bin')) config.set_string('-dict', path.join(MODELDIR, 'en-us/cmudict-en-us.dict')) decoder = Decoder(config)