refactor(MN_CN): Rename MN_cn_v4_5

espressif · Dec 16, 2021 · 649b24f · 649b24f
1 parent cc45d97
commit 649b24f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/Kconfig.projbuild b/Kconfig.projbuild
@@ -141,7 +141,7 @@ endchoice
 
 choice SR_MN_MODE_SEL
     prompt "speech commands recognition model"
-    default SR_MN_CN_MULTINET5_SINGLE_RECOGNITION
+    default SR_MN_CN_MULTINET4_5_SINGLE_RECOGNITION
     depends on USE_MULTINET
     help
         Select the model to be used.
@@ -174,8 +174,8 @@ choice SR_MN_MODE_SEL
         bool "chinese single recognition (MultiNet4)"
         depends on SR_MN_CHINESE && IDF_TARGET_ESP32S3
 
-    config SR_MN_CN_MULTINET5_SINGLE_RECOGNITION
-        bool "chinese single recognition (MultiNet5)"
+    config SR_MN_CN_MULTINET4_5_SINGLE_RECOGNITION
+        bool "chinese single recognition (MultiNet4.5)"
         depends on SR_MN_CHINESE && IDF_TARGET_ESP32S3
 
 endchoice

diff --git a/include/esp32s3/esp_mn_models.h b/include/esp32s3/esp_mn_models.h
@@ -39,9 +39,9 @@ extern const esp_mn_iface_t esp_sr_multinet5_quantized8;
 #elif CONFIG_SR_MN_CN_MULTINET3_CONTINUOUS_RECOGNITION
 #define MULTINET_MODEL esp_sr_multinet3_continuous_quantized_cn
 #define MULTINET_COEFF "mn3cn"
-#elif CONFIG_SR_MN_CN_MULTINET5_SINGLE_RECOGNITION
+#elif CONFIG_SR_MN_CN_MULTINET4_5_SINGLE_RECOGNITION
 #define MULTINET_MODEL esp_sr_multinet4_single_quantized_cn
-#define MULTINET_COEFF "mn5cn"
+#define MULTINET_COEFF "mn4_5cn"
 #elif CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION
 #define MULTINET_MODEL esp_sr_multinet5_quantized
 #define MULTINET_COEFF "mn5en"

diff --git a/lib/esp32s3/libmultinet.a b/lib/esp32s3/libmultinet.a
diff --git a/libversion b/libversion
@@ -1 +1 @@
-4949e6c67e2bde9ac4978345623dcc098f34c404
+2ff2713a9e508f2160f5b318374925d6c12af917
diff --git a/model/movemodel.py b/model/movemodel.py
@@ -62,8 +62,8 @@ def calculate_total_size(folder_path):
     multinet_model = 'mn3cn'
 elif "CONFIG_SR_MN_CN_MULTINET4_SINGLE_RECOGNITION" in MN_STRING:
     multinet_model = 'mn4cn'
-elif "CONFIG_SR_MN_CN_MULTINET5_SINGLE_RECOGNITION" in MN_STRING:
-    multinet_model = 'mn5cn'
+elif "CONFIG_SR_MN_CN_MULTINET4_5_SINGLE_RECOGNITION" in MN_STRING:
+    multinet_model = 'mn4_5cn'
 elif "CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8" in MN_STRING:
     multinet_model = 'mn5q8en'
 elif "CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION" in MN_STRING:

diff --git a/model/multinet_model/mn5cn/_MODEL_INFO_ → model/multinet_model/mn4_5cn/_MODEL_INFO_ b/model/multinet_model/mn5cn/_MODEL_INFO_ → model/multinet_model/mn4_5cn/_MODEL_INFO_
diff --git a/model/multinet_model/mn5cn/mn5cn_data → model/multinet_model/mn4_5cn/mn4_5cn_data b/model/multinet_model/mn5cn/mn5cn_data → model/multinet_model/mn4_5cn/mn4_5cn_data
diff --git a/model/multinet_model/mn5cn/mn5cn_index → model/multinet_model/mn4_5cn/mn4_5cn_index b/model/multinet_model/mn5cn/mn5cn_index → model/multinet_model/mn4_5cn/mn4_5cn_index
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4949e6c67e2bde9ac4978345623dcc098f34c404
		2ff2713a9e508f2160f5b318374925d6c12af917