From 7a97143aad0f7f4215f236014e04be9feecfea39 Mon Sep 17 00:00:00 2001 From: LittleMouse Date: Mon, 29 Sep 2025 15:15:00 +0800 Subject: [PATCH] [update] update sdk version & chip name --- ext_components/ax_msp/Kconfig | 8 ++++---- ext_components/ax_msp/SConstruct | 4 ++-- .../main_depth_anything/src/EngineWrapper.cpp | 4 ++-- .../main_melotts/src/runner/EngineWrapper.cpp | 4 ++-- .../main_whisper/src/runner/EngineWrapper.cpp | 4 ++-- projects/llm_framework/main_yolo/src/EngineWrapper.cpp | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ext_components/ax_msp/Kconfig b/ext_components/ax_msp/Kconfig index 7382424..ce8206e 100644 --- a/ext_components/ax_msp/Kconfig +++ b/ext_components/ax_msp/Kconfig @@ -12,8 +12,8 @@ menuconfig AX_MSP_ENABLED bool "enable ax620e bsp" help build by AXERA! - config AX_650N_MSP_ENABLED - bool "enable ax650n bsp" + config AX_650C_MSP_ENABLED + bool "enable ax650C bsp" help build by AXERA! config AX_520_MSP_ENABLED @@ -26,8 +26,8 @@ menuconfig AX_MSP_ENABLED prompt "choice common version" default MSP_V2_0_0_ENABLED depends on AX_MSP_ENABLED - config MSP_V3_0_0_ENABLED - bool "enable v3.0.0 bsp" + config MSP_V3_6_2_ENABLED + bool "enable v3.6.2 bsp" help build by m5stack! config MSP_V2_0_0_ENABLED diff --git a/ext_components/ax_msp/SConstruct b/ext_components/ax_msp/SConstruct index c4e1ad0..696c565 100644 --- a/ext_components/ax_msp/SConstruct +++ b/ext_components/ax_msp/SConstruct @@ -55,9 +55,9 @@ if 'CONFIG_AX_620E_MSP_ENABLED' in os.environ: 'REGISTER':'static' }) -if 'CONFIG_AX_650N_MSP_ENABLED' in os.environ: +if 'CONFIG_AX_650C_MSP_ENABLED' in os.environ: MSP_PATH = '' - if 'CONFIG_MSP_V3_0_0_ENABLED' in os.environ: + if 'CONFIG_MSP_V3_6_2_ENABLED' in os.environ: MSP_PATH = os.environ.get('EXT_MSP_PATH', check_wget_down("https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/linux/llm/m5stack_ax650n_msp.tar.gz", 'm5stack_ax650n_msp.tar.gz')) SRCS=[] diff --git a/projects/llm_framework/main_depth_anything/src/EngineWrapper.cpp b/projects/llm_framework/main_depth_anything/src/EngineWrapper.cpp index 1aad967..ab79dcf 100644 --- a/projects/llm_framework/main_depth_anything/src/EngineWrapper.cpp +++ b/projects/llm_framework/main_depth_anything/src/EngineWrapper.cpp @@ -14,7 +14,7 @@ #include -#if defined(CONFIG_AX_650N_MSP_ENABLED) +#if defined(CONFIG_AX_650C_MSP_ENABLED) static const char *strAlgoModelType[AX_ENGINE_MODEL_TYPE_BUTT] = {"3.6T", "7.2T", "18T"}; #endif @@ -32,7 +32,7 @@ typedef enum axNPU_TYPE_E { AX_BL_VNPU_2 = (1 << 4) /* running under BIG-LITTLE VNPU2 */ } AX_NPU_TYPE_E; -#if defined(CONFIG_AX_650N_MSP_ENABLED) +#if defined(CONFIG_AX_650C_MSP_ENABLED) static AX_S32 CheckModelVNpu(const std::string &strModel, const AX_ENGINE_MODEL_TYPE_T &eModelType, const AX_S32 &nNpuType, AX_U32 &nNpuSet) { diff --git a/projects/llm_framework/main_melotts/src/runner/EngineWrapper.cpp b/projects/llm_framework/main_melotts/src/runner/EngineWrapper.cpp index bc7590a..3ddc9dd 100644 --- a/projects/llm_framework/main_melotts/src/runner/EngineWrapper.cpp +++ b/projects/llm_framework/main_melotts/src/runner/EngineWrapper.cpp @@ -13,7 +13,7 @@ #include #include -#if defined(CONFIG_AX_650N_MSP_ENABLED) +#if defined(CONFIG_AX_650C_MSP_ENABLED) static const char *strAlgoModelType[AX_ENGINE_MODEL_TYPE_BUTT] = {"3.6T", "7.2T", "18T"}; #endif @@ -32,7 +32,7 @@ typedef enum axNPU_TYPE_E { AX_BL_VNPU_2 = (1 << 4) /* running under BIG-LITTLE VNPU2 */ } AX_NPU_TYPE_E; -#if defined(CONFIG_AX_650N_MSP_ENABLED) +#if defined(CONFIG_AX_650C_MSP_ENABLED) static AX_S32 CheckModelVNpu(const std::string &strModel, const AX_ENGINE_MODEL_TYPE_T &eModelType, const AX_S32 &nNpuType, AX_U32 &nNpuSet) { AX_ENGINE_NPU_ATTR_T stNpuAttr; memset(&stNpuAttr, 0x00, sizeof(stNpuAttr)); diff --git a/projects/llm_framework/main_whisper/src/runner/EngineWrapper.cpp b/projects/llm_framework/main_whisper/src/runner/EngineWrapper.cpp index bb0e7f8..e9574be 100644 --- a/projects/llm_framework/main_whisper/src/runner/EngineWrapper.cpp +++ b/projects/llm_framework/main_whisper/src/runner/EngineWrapper.cpp @@ -14,7 +14,7 @@ #include -#if defined(CONFIG_AX_650N_MSP_ENABLED) +#if defined(CONFIG_AX_650C_MSP_ENABLED) static const char *strAlgoModelType[AX_ENGINE_MODEL_TYPE_BUTT] = {"3.6T", "7.2T", "18T"}; #endif @@ -33,7 +33,7 @@ typedef enum axNPU_TYPE_E { AX_BL_VNPU_2 = (1 << 4) /* running under BIG-LITTLE VNPU2 */ } AX_NPU_TYPE_E; -#if defined(CONFIG_AX_650N_MSP_ENABLED) +#if defined(CONFIG_AX_650C_MSP_ENABLED) static AX_S32 CheckModelVNpu(const std::string &strModel, const AX_ENGINE_MODEL_TYPE_T &eModelType, const AX_S32 &nNpuType, AX_U32 &nNpuSet) { AX_ENGINE_NPU_ATTR_T stNpuAttr; memset(&stNpuAttr, 0x00, sizeof(stNpuAttr)); diff --git a/projects/llm_framework/main_yolo/src/EngineWrapper.cpp b/projects/llm_framework/main_yolo/src/EngineWrapper.cpp index 72f16a6..7b5b97d 100644 --- a/projects/llm_framework/main_yolo/src/EngineWrapper.cpp +++ b/projects/llm_framework/main_yolo/src/EngineWrapper.cpp @@ -15,7 +15,7 @@ #include -#if defined(CONFIG_AX_650N_MSP_ENABLED) +#if defined(CONFIG_AX_650C_MSP_ENABLED) static const char* strAlgoModelType[AX_ENGINE_MODEL_TYPE_BUTT] = {"3.6T", "7.2T", "18T"}; #endif @@ -33,7 +33,7 @@ typedef enum axNPU_TYPE_E { AX_BL_VNPU_2 = (1 << 4) /* running under BIG-LITTLE VNPU2 */ } AX_NPU_TYPE_E; -#if defined(CONFIG_AX_650N_MSP_ENABLED) +#if defined(CONFIG_AX_650C_MSP_ENABLED) static AX_S32 CheckModelVNpu(const std::string& strModel, const AX_ENGINE_MODEL_TYPE_T& eModelType, const AX_S32& nNpuType, AX_U32& nNpuSet) {