diff --git a/envs/maix_r329.py b/envs/maix_r329.py index 757f553..3462ee7 100644 --- a/envs/maix_r329.py +++ b/envs/maix_r329.py @@ -108,9 +108,9 @@ _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=[ @@ -118,10 +118,10 @@ ], 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 index d26731b..da1d332 100644 --- a/envs/maix_v83x.py +++ b/envs/maix_v83x.py @@ -37,9 +37,9 @@ _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=[ @@ -47,10 +47,10 @@ ], 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 deleted file mode 160000 index 253f008..0000000 --- a/ext_modules/_maix_speech/Maix-Speech +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 253f0082363b9675336be51b139ebc14b5d51a2a