tidy up some redundant files.

cpp_onnx/include/Model.h

@@ -13,5 +13,5 @@ class Model {
     virtual std::string rescoring() = 0;
 };
 
-Model *create_model(const char *path, int mode);
+Model *create_model(const char *path);
 #endif

cpp_onnx/src/lib/Model.cpp

 #include "precomp.h"
 
-Model *create_model(const char *path, int mode)
+Model *create_model(const char *path)
 {
     Model *mm;
 
 
-    mm = new paraformer::ModelImp(path, mode);
+    mm = new paraformer::ModelImp(path);
 
     return mm;
 }

cpp_onnx/src/lib/paraformer_onnx.cpp

@@ -3,20 +3,12 @@
 using namespace std;
 using namespace paraformer;
 
-ModelImp::ModelImp(const char* path, int mode,int nNumThread)
+ModelImp::ModelImp(const char* path,int nNumThread)
 {
     string model_path = pathAppend(path, "model.onnx");
     string vocab_path = pathAppend(path, "vocab.txt");
 
-    fe = new FeatureExtract(mode);
-
-    //p_helper = new ModelParamsHelper(wenet_path.c_str(), 500);
-
-    //encoder = new Encoder(&p_helper->params.encoder);
-    //predictor = new Predictor(&p_helper->params.predictor);
-    //decoder = new Decoder(&p_helper->params.decoder);
-
-
+    fe = new FeatureExtract(3);
 
     //sessionOptions.SetInterOpNumThreads(nNumThread);
     sessionOptions.SetGraphOptimizationLevel(GraphOptimizationLevel::ORT_ENABLE_EXTENDED);
@@ -48,18 +40,15 @@ ModelImp::ModelImp(const char* path, int mode,int nNumThread)
 
 ModelImp::~ModelImp()
 {
-    delete fe;
-    //delete p_helper;
-    //delete encoder;
-    //delete predictor;
-    // 
-    //delete decoder;
+    if(fe)
+        delete fe;
     if (m_session)
     {
         delete m_session;
         m_session = nullptr;
     }
-    delete vocab;
+    if(vocab)
+        delete vocab;
 }
 
 void ModelImp::reset()

cpp_onnx/src/lib/paraformer_onnx.h

@@ -39,7 +39,7 @@ namespace paraformer {
         //string m_strOutputName, m_strOutputNameLen;
 
     public:
-        ModelImp(const char* path, int mode, int nNumThread=4);
+        ModelImp(const char* path, int nNumThread=4);
         ~ModelImp();
         void reset();
         string forward_chunk(float* din, int len, int flag);

cpp_onnx/tester/tester.cpp

@@ -18,6 +18,14 @@ int main(int argc, char *argv[])
         printf("Usage: %s /path/to/model_dir /path/to/wav/file", argv[0]);
         exit(-1);
     }
+
+    Model* mm = create_model(argv[1]);
+    if (!mm)
+    {
+        printf("Cannot load ASR Model from: %s, there must be files model.onnx and vocab.txt", argv[1]);
+        exit(-1);
+    }
+
     struct timeval start, end;
     Audio audio(0);
     if (!audio.loadwav(argv[2]))
@@ -27,7 +35,7 @@ int main(int argc, char *argv[])
     }
     audio.disp();
     gettimeofday(&start, NULL);
-    Model *mm = create_model(argv[1], 3);
+
     gettimeofday(&end, NULL);
     long seconds = (end.tv_sec - start.tv_sec);
     long micros = ((seconds * 1000000) + end.tv_usec) - (start.tv_usec);