moved pmdl model wrapper to pmdl folder

aandroide · Dec 31, 2020 · e837c7f · e837c7f
1 parent d2a65f4
commit e837c7f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/examples/Python/generate_pmdl.py b/examples/Python/generate_pmdl.py
@@ -4,7 +4,7 @@
 import uuid
 from scipy.io import wavfile
 from pmdl import snowboy_pmdl_config
-from lib.snowboy_model import SnowboyPersonalEnroll, SnowboyTemplateCut
+from pmdl.snowboy_pmdl import SnowboyPersonalEnroll, SnowboyTemplateCut
 
 def check_enroll_output(enroll_ans):
     if enroll_ans == -1:

diff --git a/examples/Python/lib b/examples/Python/lib
diff --git a/examples/Python/pmdl/lib b/examples/Python/pmdl/lib
@@ -0,0 +1 @@
+../../../lib/
diff --git a/examples/Python/pmdl/snowboy_pmdl.py b/examples/Python/pmdl/snowboy_pmdl.py
@@ -0,0 +1,12 @@
+import os
+import sys
+import platform
+
+if platform.system() == "Darwin":
+    sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "lib/osx/pmdl"))
+    from snowboy import *
+elif platform.linux_distribution()[0] == "Ubuntu" and platform.linux_distribution()[1] == "16.04":
+    sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "lib/ubuntu64/pmdl"))
+    from snowboy import *
+else:
+    raise ImportError("pmdl generator only runs on OSX or Ubuntu 16.04.")
diff --git a/lib/__init__.py b/lib/__init__.py
diff --git a/lib/osx/__init__.py b/lib/osx/__init__.py
diff --git a/lib/snowboy_model.py b/lib/snowboy_model.py
diff --git a/lib/ubuntu64/__init__.py b/lib/ubuntu64/__init__.py