Skip to content

Commit f0432e6

Browse files
committed
Fix checking funasr nano tokenizer on Windows
1 parent a3e11d1 commit f0432e6

1 file changed

Lines changed: 25 additions & 9 deletions

File tree

sherpa-onnx/csrc/offline-funasr-nano-model-config.cc

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
#include "sherpa-onnx/csrc/offline-funasr-nano-model-config.h"
66

7-
#include <string>
87
#include <sstream>
8+
#include <string>
9+
910
#include "sherpa-onnx/csrc/file-utils.h"
1011
#include "sherpa-onnx/csrc/macros.h"
1112

@@ -21,8 +22,9 @@ void OfflineFunASRNanoModelConfig::Register(ParseOptions *po) {
2122
po->Register("funasr-nano-embedding", &embedding,
2223
"Path to embedding.onnx for FunASR-nano");
2324

24-
po->Register("funasr-nano-tokenizer", &tokenizer,
25-
"Path to tokenizer directory (e.g., Qwen3-0.6B) for FunASR-nano");
25+
po->Register(
26+
"funasr-nano-tokenizer", &tokenizer,
27+
"Path to tokenizer directory (e.g., Qwen3-0.6B) for FunASR-nano");
2628

2729
po->Register("funasr-nano-system-prompt", &system_prompt,
2830
"System prompt for FunASR-nano");
@@ -39,8 +41,7 @@ void OfflineFunASRNanoModelConfig::Register(ParseOptions *po) {
3941
po->Register("funasr-nano-top-p", &top_p,
4042
"Top-p (nucleus) sampling threshold for FunASR-nano");
4143

42-
po->Register("funasr-nano-seed", &seed,
43-
"Random seed for FunASR-nano");
44+
po->Register("funasr-nano-seed", &seed, "Random seed for FunASR-nano");
4445
}
4546

4647
bool OfflineFunASRNanoModelConfig::Validate() const {
@@ -70,9 +71,25 @@ bool OfflineFunASRNanoModelConfig::Validate() const {
7071
return false;
7172
}
7273

73-
if (!FileExists(tokenizer)) {
74-
SHERPA_ONNX_LOGE("--funasr-nano-tokenizer: '%s' does not exist",
75-
tokenizer.c_str());
74+
if (!FileExists(tokenizer + "/vocab.json")) {
75+
SHERPA_ONNX_LOGE(
76+
"'%s/vocab.json' does not exist. Please check --funasr-nano-tokenizer",
77+
tokenizer.c_str());
78+
return false;
79+
}
80+
81+
if (!FileExists(tokenizer + "/merges.txt")) {
82+
SHERPA_ONNX_LOGE(
83+
"'%s/merges.txt' does not exist. Please check --funasr-nano-tokenizer",
84+
tokenizer.c_str());
85+
return false;
86+
}
87+
88+
if (!FileExists(tokenizer + "/tokenizer.json")) {
89+
SHERPA_ONNX_LOGE(
90+
"'%s/tokenizer.json' does not exist. Please check "
91+
"--funasr-nano-tokenizer",
92+
tokenizer.c_str());
7693
return false;
7794
}
7895

@@ -127,4 +144,3 @@ std::string OfflineFunASRNanoModelConfig::ToString() const {
127144
}
128145

129146
} // namespace sherpa_onnx
130-

0 commit comments

Comments
 (0)