From 76164048454ef781c29be941d6cc3a2801a349b1 Mon Sep 17 00:00:00 2001
From: lyblsgo <lyblsgo@163.com>
Date: 星期四, 16 三月 2023 17:06:19 +0800
Subject: [PATCH] fix c++ grpc onnx server
---
funasr/runtime/grpc/paraformer_server.cc | 36 ++++++++++++++++++++++--------------
funasr/runtime/grpc/Readme.md | 9 ++++++++-
funasr/runtime/grpc/rebuild.sh | 4 ----
funasr/runtime/grpc/paraformer_server.h | 11 ++++++++---
4 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/funasr/runtime/grpc/Readme.md b/funasr/runtime/grpc/Readme.md
index b8722c7..02582f4 100644
--- a/funasr/runtime/grpc/Readme.md
+++ b/funasr/runtime/grpc/Readme.md
@@ -27,6 +27,7 @@
-DCMAKE_INSTALL_PREFIX=$GRPC_INSTALL_DIR \
../..
make
+make install
popd
echo "export GRPC_INSTALL_DIR=/data/soft/grpc" >> ~/.bashrc
@@ -40,9 +41,15 @@
./rebuild.sh
```
+#### Step 4. Start grpc paraformer server
+```
+Usage: ./cmake/build/paraformer_server port thread_num /path/to/model_file
+./cmake/build/paraformer_server 10108 4 /data/asrmodel
+```
-#### Step 4. Start grpc python paraformer client on PC with MIC
+
+#### Step 5. Start grpc python paraformer client on PC with MIC
```
cd ../python/grpc
python grpc_main_client_mic.py --host $server_ip --port 10108
diff --git a/funasr/runtime/grpc/paraformer_server.cc b/funasr/runtime/grpc/paraformer_server.cc
index b721f05..e5814a5 100644
--- a/funasr/runtime/grpc/paraformer_server.cc
+++ b/funasr/runtime/grpc/paraformer_server.cc
@@ -29,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;
}
@@ -135,7 +136,7 @@
}
else {
RPASR_RESULT Result= RapidAsrRecogPCMBuffer(AsrHanlde, tmp_data.c_str(), data_len_int, RASR_NONE, NULL);
- std::string asr_result = "浣犲ソ浣犲ソ锛屾垜鏄痑sr璇嗗埆缁撴灉銆俿tatic";
+ 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);
@@ -169,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;
}
diff --git a/funasr/runtime/grpc/paraformer_server.h b/funasr/runtime/grpc/paraformer_server.h
index f7cc7a6..f356d94 100644
--- a/funasr/runtime/grpc/paraformer_server.h
+++ b/funasr/runtime/grpc/paraformer_server.h
@@ -31,6 +31,12 @@
using paraformer::Response;
using paraformer::ASR;
+typedef struct
+{
+ std::string msg;
+ float snippet_time;
+}RPASR_RECOG_RESULT;
+
class ASRServicer final : public ASR::Service {
private:
@@ -39,13 +45,12 @@
std::unordered_map<std::string, std::string> client_transcription;
public:
- ASRServicer();
+ ASRServicer(const char* model_path, int thread_num);
void clear_states(const std::string& user);
void clear_buffers(const std::string& user);
void clear_transcriptions(const std::string& user);
void disconnect(const std::string& user);
grpc::Status Recognize(grpc::ServerContext* context, grpc::ServerReaderWriter<Response, Request>* stream);
- int nThreadNum = 4;
- RPASR_HANDLE AsrHanlde=RapidAsrInit("/data/asrmodel/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch/", nThreadNum);
+ RPASR_HANDLE AsrHanlde;
};
diff --git a/funasr/runtime/grpc/rebuild.sh b/funasr/runtime/grpc/rebuild.sh
index 4b76012..9b41ed6 100644
--- a/funasr/runtime/grpc/rebuild.sh
+++ b/funasr/runtime/grpc/rebuild.sh
@@ -10,7 +10,3 @@
echo "Build cmake/build/paraformer_server successfully!"
-
-echo "Start server"
-
-./paraformer_server
\ No newline at end of file
--
Gitblit v1.9.1