Improved module import

WHG555 · Dec 31, 2020 · 7e4b186 · 7e4b186
1 parent cad009f
commit 7e4b186
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/examples/Python/model_generator.py → examples/Python/generate_pmdl.py b/examples/Python/model_generator.py → examples/Python/generate_pmdl.py
diff --git a/examples/Python/snowboy_model_config.py b/examples/Python/snowboy_model_config.py
@@ -7,7 +7,7 @@
 COMPTYPE = 'NONE'
 COMPNAME = 'not compressed'
 
-RES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'resources/model_generator')
+RES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'resources/pmdl')
 
 DEFAULT_LANG = 'en'
 VAD_RESOURCE = os.path.join(RES_DIR, DEFAULT_LANG, 'personal_enroll.res')

diff --git a/lib/osx/__init__.py b/lib/osx/__init__.py
diff --git a/lib/snowboy_model.py b/lib/snowboy_model.py
@@ -1,6 +1,8 @@
 import platform
 
 if platform.system() == "Darwin":
-    from osx.snowboy import *
+    from osx.pmdl.snowboy import *
+elif platform.linux_distribution()[0] == "Ubuntu" and platform.linux_distribution()[1] == "16.04":
+    from ubuntu64.pmdl.snowboy import *
 else:
-    from ubuntu64.snowboy import *
+    raise ImportError("pmdl generator only runs on OSX or Ubuntu 16.04.")
diff --git a/lib/ubuntu64/__init__.py b/lib/ubuntu64/__init__.py