Просмотр исходного кода

[refator] modify to fit new api

boji123 2 лет назад
Родитель
Сommit
adb66de3c6

+ 2 - 2
funasr/runtime/grpc/Readme.md

@@ -48,7 +48,7 @@ To do.
 # or run server directly
 ./build/bin/paraformer-server \
   --port-id <string> \
-  --offline-model-dir <string> \
+  --model-dir <string> \
   --online-model-dir <string> \
   --quantize <string> \
   --vad-dir <string> \
@@ -59,7 +59,7 @@ To do.
 Where:
   --port-id <string> (required) the port server listen to
 
-  --offline-model-dir <string> (required) the offline asr model path
+  --model-dir <string> (required) the offline asr model path
   --online-model-dir <string> (required) the online asr model path
   --quantize <string> (optional) false (Default), load the model of model.onnx in model_dir. If set true, load the model of model_quant.onnx in model_dir
 

+ 3 - 3
funasr/runtime/grpc/paraformer-server.cc

@@ -208,7 +208,7 @@ int main(int argc, char* argv[]) {
   google::InitGoogleLogging(argv[0]);
 
   TCLAP::CmdLine cmd("funasr-onnx-2pass", ' ', "1.0");
-  TCLAP::ValueArg<std::string>  offline_model_dir("", OFFLINE_MODEL_DIR, "the asr offline model path, which contains model.onnx, config.yaml, am.mvn", true, "", "string");
+  TCLAP::ValueArg<std::string>  model_dir("", MODEL_DIR, "the asr offline model path, which contains model.onnx, config.yaml, am.mvn", true, "", "string");
   TCLAP::ValueArg<std::string>  online_model_dir("", ONLINE_MODEL_DIR, "the asr online model path, which contains encoder.onnx, decoder.onnx, config.yaml, am.mvn", true, "", "string");
   TCLAP::ValueArg<std::string>  quantize("", QUANTIZE, "false (Default), load the model of model.onnx in model_dir. If set true, load the model of model_quant.onnx in model_dir", false, "false", "string");
   TCLAP::ValueArg<std::string>  vad_dir("", VAD_DIR, "the vad online model path, which contains model.onnx, vad.yaml, vad.mvn", false, "", "string");
@@ -218,7 +218,7 @@ int main(int argc, char* argv[]) {
   TCLAP::ValueArg<std::int32_t>  onnx_thread("", "onnx-inter-thread", "onnxruntime SetIntraOpNumThreads", false, 1, "int32_t");
   TCLAP::ValueArg<std::string> port_id("", PORT_ID, "port id", true, "", "string");
 
-  cmd.add(offline_model_dir);
+  cmd.add(model_dir);
   cmd.add(online_model_dir);
   cmd.add(quantize);
   cmd.add(vad_dir);
@@ -230,7 +230,7 @@ int main(int argc, char* argv[]) {
   cmd.parse(argc, argv);
 
   std::map<std::string, std::string> config;
-  GetValue(offline_model_dir, OFFLINE_MODEL_DIR, config);
+  GetValue(model_dir, MODEL_DIR, config);
   GetValue(online_model_dir, ONLINE_MODEL_DIR, config);
   GetValue(quantize, QUANTIZE, config);
   GetValue(vad_dir, VAD_DIR, config);

+ 1 - 1
funasr/runtime/grpc/run_server.sh

@@ -2,7 +2,7 @@
 
 ./build/bin/paraformer-server \
   --port-id 10100 \
-  --offline-model-dir funasr_models/damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-onnx \
+  --model-dir funasr_models/damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-onnx \
   --online-model-dir funasr_models/damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-online \
   --quantize true \
   --vad-dir funasr_models/damo/speech_fsmn_vad_zh-cn-16k-common-onnx \