From 38de2af5bf9976d2f14f087d9a0d31991daf6783 Mon Sep 17 00:00:00 2001
From: Zhihao Du <neo.dzh@alibaba-inc.com>
Date: 星期四, 16 三月 2023 19:41:34 +0800
Subject: [PATCH] Merge branch 'main' into dev_dzh
---
funasr/runtime/grpc/paraformer_server.cc | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/funasr/runtime/grpc/paraformer_server.cc b/funasr/runtime/grpc/paraformer_server.cc
index 870cc18..e5814a5 100644
--- a/funasr/runtime/grpc/paraformer_server.cc
+++ b/funasr/runtime/grpc/paraformer_server.cc
@@ -15,6 +15,7 @@
#include "paraformer.grpc.pb.h"
#include "paraformer_server.h"
+
using grpc::Server;
using grpc::ServerBuilder;
using grpc::ServerContext;
@@ -28,7 +29,8 @@
using paraformer::Response;
using paraformer::ASR;
-ASRServicer::ASRServicer() {
+ASRServicer::ASRServicer(const char* model_path, int thread_num) {
+ AsrHanlde=RapidAsrInit(model_path, thread_num);
std::cout << "ASRServicer init" << std::endl;
init_flag = 0;
}
@@ -104,7 +106,8 @@
res.set_sentence(
R"({"success": true, "detail": "decoding data: " + std::to_string(tmp_data.length()) + " bytes"})"
);
- std::string data_len = std::to_string(tmp_data.length());
+ int data_len_int = tmp_data.length();
+ std::string data_len = std::to_string(data_len_int);
std::stringstream ss;
ss << R"({"success": true, "detail": "decoding data: )" << data_len << R"( bytes")" << R"("})";
std::string result = ss.str();
@@ -132,16 +135,8 @@
stream->Write(res);
}
else {
-
- // asr_result = onnx.infer(tmp_data)
- /* if (asr_result.find("text") != asr_result.end()) {
- asr_result = asr_result["text"];
- }
- else {
- asr_result = "";
- } */
-
- std::string asr_result = "浣犲ソ浣犲ソ锛屾垜鏄痑sr璇嗗埆缁撴灉銆俿tatic";
+ RPASR_RESULT Result= RapidAsrRecogPCMBuffer(AsrHanlde, tmp_data.c_str(), data_len_int, RASR_NONE, NULL);
+ std::string asr_result = ((RPASR_RECOG_RESULT*)Result)->msg;
auto end_time = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
std::string delay_str = std::to_string(end_time - begin_time);
@@ -175,19 +170,26 @@
}
-void RunServer() {
- std::string server_address("0.0.0.0:10108");
- ASRServicer service;
+void RunServer(const std::string& port, int thread_num, const char* model_path) {
+ std::string server_address;
+ server_address = "0.0.0.0:" + port;
+ ASRServicer service(model_path, thread_num);
- ServerBuilder builder;
- builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
- builder.RegisterService(&service);
- std::unique_ptr<Server> server(builder.BuildAndStart());
- std::cout << "Server listening on " << server_address << std::endl;
- server->Wait();
+ ServerBuilder builder;
+ builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
+ builder.RegisterService(&service);
+ std::unique_ptr<Server> server(builder.BuildAndStart());
+ std::cout << "Server listening on " << server_address << std::endl;
+ server->Wait();
}
-int main(int argc, char** argv) {
- RunServer();
- return 0;
+int main(int argc, char* argv[]) {
+ if (argc < 3)
+ {
+ printf("Usage: %s port thread_num /path/to/model_file\n", argv[0]);
+ exit(-1);
+ }
+
+ RunServer(argv[1], atoi(argv[2]), argv[3]);
+ return 0;
}
--
Gitblit v1.9.1