[clear] _maix_speech

sipeed · Apr 12, 2022 · 494392d · 494392d
1 parent 1a0cee7
commit 494392d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/envs/maix_r329.py b/envs/maix_r329.py
@@ -108,20 +108,20 @@
 _maix_speech_module = Pybind11Extension("_maix_speech",
     include_dirs=[
         get_incs(
-            'ext_modules/_maix_speech/Maix-Speech/components/asr_lib/include'),
+            'ext_modules/libmaix/components/maix_speech/Maix-Speech/components/asr_lib/include'),
         get_incs(
-            'ext_modules/_maix_speech/Maix-Speech/components/utils/include')
+            'ext_modules/libmaix/components/maix_speech/Maix-Speech/components/utils/include')
     ],
     sources = get_srcs('ext_modules/_maix_speech', exclude=["utils", "projects"]),
     libraries=[
         "ms_asr_r329", "aipudrv", "asound"
     ],
     library_dirs=[
         ext_so,
-        "./ext_modules/_maix_speech/Maix-Speech/components/asr_lib/lib/r329",
+        "./ext_modules/libmaix/components/maix_speech/Maix-Speech/components/asr_lib/lib/r329",
     ],
     extra_objects=[
-        "./ext_modules/_maix_speech/Maix-Speech/components/asr_lib/lib/r329/libms_asr_r329.a",
+        "./ext_modules/libmaix/components/maix_speech/Maix-Speech/components/asr_lib/lib/r329/libms_asr_r329.a",
     ],
     extra_compile_args=['-march=armv8-a', '-std=c++11', '-std=gnu++11'],
     # extra_compile_args=['-D__ARM__', '-D__ARMV7__', '-DCONF_KERNEL_IOMMU', '-DCONF_KERNEL_VERSION_4_9', '-std=c++11', '-std=gnu++11'],

diff --git a/envs/maix_v83x.py b/envs/maix_v83x.py
@@ -37,20 +37,20 @@
 _maix_speech_module = Pybind11Extension("_maix_speech",
     include_dirs=[
         get_incs(
-            'ext_modules/_maix_speech/Maix-Speech/components/asr_lib/include'),
+            './ext_modules/libmaix/components/maix_speech/Maix-Speech/components/asr_lib/include'),
         get_incs(
-            'ext_modules/_maix_speech/Maix-Speech/components/utils/include')
+            './ext_modules/libmaix/components/maix_speech/Maix-Speech/components/utils/include')
     ],
     sources = get_srcs('ext_modules/_maix_speech', exclude=["utils", "projects"]),
     libraries=[
         "ms_asr_v83x", "asound"
     ],
     library_dirs=[
         ext_so,
-        "./ext_modules/_maix_speech/Maix-Speech/components/asr_lib/lib/v83x",
+        "./ext_modules/libmaix/components/maix_speech/Maix-Speech/components/asr_lib/lib/v83x",
     ],
     extra_objects=[
-        "./ext_modules/_maix_speech/Maix-Speech/components/asr_lib/lib/v83x/libms_asr_v83x.a",
+        "./ext_modules/libmaix/components/maix_speech/Maix-Speech/components/asr_lib/lib/v83x/libms_asr_v83x.a",
     ],
     extra_compile_args=['-D__ARM__', '-D__ARMV7__', '-DCONF_KERNEL_IOMMU', '-DCONF_KERNEL_VERSION_4_9', '-std=c++11', '-std=gnu++11'],
     extra_link_args=[

diff --git a/ext_modules/_maix_speech/Maix-Speech b/ext_modules/_maix_speech/Maix-Speech