WIP Python fixes

examples/Python3/demo.py

@@ -1,6 +1,8 @@
-import snowboydecoder
+#!/usr/bin/env python3
+from snowboy import snowboydecoder
 import sys
 import signal
+import os
 
 interrupted = False
 
@@ -14,22 +16,30 @@ def interrupt_callback():
     global interrupted
     return interrupted
 
-if len(sys.argv) == 1:
-    print("Error: need to specify model name")
+if len(sys.argv) != 2:
+    print("Error: need to specify 1 model name")
     print("Usage: python demo.py your.model")
     sys.exit(-1)
 
-model = sys.argv[1]
+def main():
+    model = sys.argv[1]
+    if not os.path.isfile(model):
+        print("Error: Not a valid model.")
+        sys.exit(-1)
 
-# capture SIGINT signal, e.g., Ctrl+C
-signal.signal(signal.SIGINT, signal_handler)
+    # capture SIGINT signal, e.g., Ctrl+C
+    signal.signal(signal.SIGINT, signal_handler)
 
-detector = snowboydecoder.HotwordDetector(model, sensitivity=0.5)
-print('Listening... Press Ctrl+C to exit')
+    detector = snowboydecoder.HotwordDetector(model, sensitivity=0.5)
+    detector.detector.ApplyFrontend(False)
+    print('Listening... Press Ctrl+C to exit')
 
-# main loop
-detector.start(detected_callback=snowboydecoder.play_audio_file,
-               interrupt_check=interrupt_callback,
-               sleep_time=0.03)
+    # main loop
+    detector.start(detected_callback=snowboydecoder.play_audio_file,
+                   interrupt_check=interrupt_callback,
+                   sleep_time=0.03)
 
-detector.terminate()
+    detector.terminate()
+
+if __name__ == "__main__":
+    main()

setup.py

@@ -7,13 +7,13 @@
 
 
 py_dir = 'Python' if sys.version_info[0] < 3 else 'Python3'
+swig_dir = os.path.join('swig', py_dir)
 
 class SnowboyBuild(build):
 
     def run(self):
 
         cmd = ['make']
-        swig_dir = os.path.join('swig', py_dir)
         def compile():
             call(cmd, cwd=swig_dir)
 
@@ -39,14 +39,14 @@ def compile():
 
 setup(
     name='snowboy',
-    version='1.3.0',
+    version='1.3.1',
     description='Snowboy is a customizable hotword detection engine',
     maintainer='KITT.AI',
     maintainer_email='[email protected]',
     license='Apache-2.0',
     url='https://snowboy.kitt.ai',
-    packages=find_packages(os.path.join('examples', py_dir)),
-    package_dir={'snowboy': os.path.join('examples', py_dir)},
+    packages=find_packages(swig_dir),
+    package_dir={'snowboy': swig_dir},
     py_modules=['snowboy.snowboydecoder', 'snowboy.snowboydetect'],
     package_data={'snowboy': ['resources/*']},
     zip_safe=False,

swig/Python/Makefile

@@ -35,7 +35,7 @@ else
   CXX := g++
   PYINC := $(shell python-config --cflags)
   PYLIBS := $(shell python-config --ldflags)
-  SWIGFLAGS := -shared
+  SWIGFLAGS := -Wl,-O1,--as-needed -shared
   CXXFLAGS += -std=c++0x
   # Make sure you have Atlas installed. You can statically link Atlas if you
   # would like to be able to move the library to a machine without Atlas.

swig/Python3/Makefile

@@ -39,14 +39,14 @@ else
   CXX := g++
   PYINC := $(shell python3-config --cflags)
   PYLIBS := $(shell python3-config --ldflags)
-  SWIGFLAGS := -shared
+  SWIGFLAGS := -Wl,-O1,--as-needed -shared
   CXXFLAGS += -std=c++0x
   # Make sure you have Atlas installed. You can statically link Atlas if you
   # would like to be able to move the library to a machine without Atlas.
   ifneq ("$(ldconfig -p | grep lapack_atlas)","")
     LDLIBS := -lm -ldl -lf77blas -lcblas -llapack_atlas -latlas
   else
-    LDLIBS := -lm -ldl -lf77blas -lcblas -llapack -latlas
+    LDLIBS := -lm -lcblas
   endif
   SNOWBOYDETECTLIBFILE = $(TOPDIR)/lib/ubuntu64/libsnowboy-detect.a
   ifneq (,$(findstring arm,$(shell uname -m)))