..

XiaYucca · Jan 9, 2025 · 85600ea · 85600ea
1 parent f5dbf84
commit 85600ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/sherpa-onnx/csrc/offline-ctc-fst-decoder.cc b/sherpa-onnx/csrc/offline-ctc-fst-decoder.cc
@@ -11,15 +11,12 @@
 #include "kaldi-decoder/csrc/decodable-ctc.h"
 #include "kaldi-decoder/csrc/eigen.h"
 #include "kaldi-decoder/csrc/faster-decoder.h"
-<<<<<<< HEAD
-=======
+
 #include "sherpa-onnx/csrc/fst-utils.h"
->>>>>>> master-0109
 #include "sherpa-onnx/csrc/macros.h"
 
 namespace sherpa_onnx {
 
-<<<<<<< HEAD
 // This function is copied from kaldi.
 //
 // @param filename Path to a StdVectorFst or StdConstFst graph
@@ -62,8 +59,6 @@ fst::Fst<fst::StdArc> *ReadGraph(const std::string &filename) {
   }
 }
 
-=======
->>>>>>> master-0109
 /**
  * @param decoder
  * @param p Pointer to a 2-d array of shape (num_frames, vocab_size)

diff --git a/sherpa-onnx/csrc/offline-model-config.h b/sherpa-onnx/csrc/offline-model-config.h
@@ -6,10 +6,8 @@
 
 #include <string>
 
-<<<<<<< HEAD
-=======
+
 #include "sherpa-onnx/csrc/offline-moonshine-model-config.h"
->>>>>>> master-0109
 #include "sherpa-onnx/csrc/offline-nemo-enc-dec-ctc-model-config.h"
 #include "sherpa-onnx/csrc/offline-paraformer-model-config.h"
 #include "sherpa-onnx/csrc/offline-sense-voice-model-config.h"
@@ -30,10 +28,9 @@ struct OfflineModelConfig {
   OfflineZipformerCtcModelConfig zipformer_ctc;
   OfflineWenetCtcModelConfig wenet_ctc;
   OfflineSenseVoiceModelConfig sense_voice;
-<<<<<<< HEAD
-=======
+
   OfflineMoonshineModelConfig moonshine;
->>>>>>> master-0109
+
   std::string telespeech_ctc;
 
   std::string tokens;
@@ -64,10 +61,7 @@ struct OfflineModelConfig {
                      const OfflineZipformerCtcModelConfig &zipformer_ctc,
                      const OfflineWenetCtcModelConfig &wenet_ctc,
                      const OfflineSenseVoiceModelConfig &sense_voice,
-<<<<<<< HEAD
-=======
                      const OfflineMoonshineModelConfig &moonshine,
->>>>>>> master-0109
                      const std::string &telespeech_ctc,
                      const std::string &tokens, int32_t num_threads, bool debug,
                      const std::string &provider, const std::string &model_type,
@@ -81,10 +75,7 @@ struct OfflineModelConfig {
         zipformer_ctc(zipformer_ctc),
         wenet_ctc(wenet_ctc),
         sense_voice(sense_voice),
-<<<<<<< HEAD
-=======
         moonshine(moonshine),
->>>>>>> master-0109
         telespeech_ctc(telespeech_ctc),
         tokens(tokens),
         num_threads(num_threads),