Replace Clone() with View()

k2-fsa · Nov 19, 2023 · 83d0bc0 · 83d0bc0
1 parent ac00eda
commit 83d0bc0
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 19 deletions.
diff --git a/sherpa-onnx/csrc/offline-transducer-modified-beam-search-decoder.cc b/sherpa-onnx/csrc/offline-transducer-modified-beam-search-decoder.cc
@@ -94,7 +94,7 @@ OfflineTransducerModifiedBeamSearchDecoder::Decode(
     // now cur_encoder_out is of shape (num_hyps, joiner_dim)
 
     Ort::Value logit = model_->RunJoiner(
-        std::move(cur_encoder_out), Clone(model_->Allocator(), &decoder_out));
+        std::move(cur_encoder_out), View(&decoder_out));
 
     float *p_logit = logit.GetTensorMutableData<float>();
     LogSoftmax(p_logit, vocab_size, num_hyps);

diff --git a/sherpa-onnx/csrc/online-conformer-transducer-model.cc b/sherpa-onnx/csrc/online-conformer-transducer-model.cc
@@ -259,7 +259,7 @@ Ort::Value OnlineConformerTransducerModel::RunDecoder(
 Ort::Value OnlineConformerTransducerModel::RunJoiner(Ort::Value encoder_out,
                                                      Ort::Value decoder_out) {
   std::array<Ort::Value, 2> joiner_input = {std::move(encoder_out),
-                                            std::move(decoder_out)};
+                                            View(&decoder_out)};
   auto logit =
       joiner_sess_->Run({}, joiner_input_names_ptr_.data(), joiner_input.data(),
                         joiner_input.size(), joiner_output_names_ptr_.data(),

diff --git a/sherpa-onnx/csrc/online-lstm-transducer-model.cc b/sherpa-onnx/csrc/online-lstm-transducer-model.cc
@@ -250,7 +250,7 @@ Ort::Value OnlineLstmTransducerModel::RunDecoder(Ort::Value decoder_input) {
 Ort::Value OnlineLstmTransducerModel::RunJoiner(Ort::Value encoder_out,
                                                 Ort::Value decoder_out) {
   std::array<Ort::Value, 2> joiner_input = {std::move(encoder_out),
-                                            std::move(decoder_out)};
+                                            View(&decoder_out)};
   auto logit =
       joiner_sess_->Run({}, joiner_input_names_ptr_.data(), joiner_input.data(),
                         joiner_input.size(), joiner_output_names_ptr_.data(),

diff --git a/sherpa-onnx/csrc/online-rnn-lm.cc b/sherpa-onnx/csrc/online-rnn-lm.cc
@@ -67,13 +67,13 @@ class OnlineRnnLM::Impl {
     return {std::move(out[0]), std::move(next_states)};
   }
 
-  std::pair<Ort::Value, std::vector<Ort::Value>> GetInitStates() const {
+  std::pair<Ort::Value, std::vector<Ort::Value>> GetInitStates() {
     std::vector<Ort::Value> ans;
     ans.reserve(init_states_.size());
-    for (const auto &s : init_states_) {
-      ans.emplace_back(Clone(allocator_, &s));
+    for (auto &s : init_states_) {
+      ans.emplace_back(View(&s));
     }
-    return {std::move(Clone(allocator_, &init_scores_.value)), std::move(ans)};
+    return {std::move(View(&init_scores_.value)), std::move(ans)};
   }
 
  private:

diff --git a/sherpa-onnx/csrc/online-transducer-greedy-search-decoder.cc b/sherpa-onnx/csrc/online-transducer-greedy-search-decoder.cc
@@ -99,9 +99,11 @@ void OnlineTransducerGreedySearchDecoder::Decode(
   }
   if (is_batch_decoder_out_cached) {
     auto &r = result->front();
-    std::vector<int64_t> decoder_out_shape = r.decoder_out.GetTensorTypeAndShapeInfo().GetShape();
+    std::vector<int64_t> decoder_out_shape =
+        r.decoder_out.GetTensorTypeAndShapeInfo().GetShape();
     decoder_out_shape[0] = batch_size;
-    decoder_out = Ort::Value::CreateTensor<float>(model_->Allocator(), decoder_out_shape.data(), decoder_out_shape.size());
+    decoder_out = Ort::Value::CreateTensor<float>(model_->Allocator(),
+        decoder_out_shape.data(), decoder_out_shape.size());
     UseCachedDecoderOut(*result, &decoder_out);
   } else {
     Ort::Value decoder_input = model_->BuildDecoderInput(*result);
@@ -112,7 +114,7 @@ void OnlineTransducerGreedySearchDecoder::Decode(
     Ort::Value cur_encoder_out =
         GetEncoderOutFrame(model_->Allocator(), &encoder_out, t);
     Ort::Value logit = model_->RunJoiner(
-        std::move(cur_encoder_out), Clone(model_->Allocator(), &decoder_out));
+        std::move(cur_encoder_out), View(&decoder_out));
 
     const float *p_logit = logit.GetTensorData<float>();
 

diff --git a/sherpa-onnx/csrc/online-transducer-modified-beam-search-decoder.cc b/sherpa-onnx/csrc/online-transducer-modified-beam-search-decoder.cc
@@ -120,7 +120,7 @@ void OnlineTransducerModifiedBeamSearchDecoder::Decode(
     cur_encoder_out =
         Repeat(model_->Allocator(), &cur_encoder_out, hyps_row_splits);
     Ort::Value logit = model_->RunJoiner(
-        std::move(cur_encoder_out), Clone(model_->Allocator(), &decoder_out));
+        std::move(cur_encoder_out), View(&decoder_out));
 
     float *p_logit = logit.GetTensorMutableData<float>();
     LogSoftmax(p_logit, vocab_size, num_hyps);

diff --git a/sherpa-onnx/csrc/online-wenet-ctc-model.cc b/sherpa-onnx/csrc/online-wenet-ctc-model.cc
@@ -73,9 +73,9 @@ class OnlineWenetCtcModel::Impl {
     std::array<Ort::Value, 6> inputs = {std::move(x),
                                         View(&offset),
                                         View(&required_cache_size_tensor_),
-                                        std::move(attn_cache),
-                                        std::move(conv_cache),
-                                        std::move(attn_mask)};
+                                        View(&attn_cache),
+                                        View(&conv_cache),
+                                        View(&attn_mask)};
 
     auto out =
         sess_->Run({}, input_names_ptr_.data(), inputs.data(), inputs.size(),
@@ -105,11 +105,11 @@ class OnlineWenetCtcModel::Impl {
   // - attn_cache
   // - conv_cache
   // - offset
-  std::vector<Ort::Value> GetInitStates() const {
+  std::vector<Ort::Value> GetInitStates() {
     std::vector<Ort::Value> ans;
     ans.reserve(3);
-    ans.push_back(Clone(Allocator(), &attn_cache_));
-    ans.push_back(Clone(Allocator(), &conv_cache_));
+    ans.push_back(View(&attn_cache_));
+    ans.push_back(View(&conv_cache_));
 
     int64_t offset_shape = 1;
 

diff --git a/sherpa-onnx/csrc/online-zipformer-transducer-model.cc b/sherpa-onnx/csrc/online-zipformer-transducer-model.cc
@@ -465,7 +465,7 @@ Ort::Value OnlineZipformerTransducerModel::RunDecoder(
 Ort::Value OnlineZipformerTransducerModel::RunJoiner(Ort::Value encoder_out,
                                                      Ort::Value decoder_out) {
   std::array<Ort::Value, 2> joiner_input = {std::move(encoder_out),
-                                            std::move(decoder_out)};
+                                            View(&decoder_out)};
   auto logit =
       joiner_sess_->Run({}, joiner_input_names_ptr_.data(), joiner_input.data(),
                         joiner_input.size(), joiner_output_names_ptr_.data(),

diff --git a/sherpa-onnx/csrc/online-zipformer2-transducer-model.cc b/sherpa-onnx/csrc/online-zipformer2-transducer-model.cc
@@ -454,7 +454,7 @@ Ort::Value OnlineZipformer2TransducerModel::RunDecoder(
 Ort::Value OnlineZipformer2TransducerModel::RunJoiner(Ort::Value encoder_out,
                                                       Ort::Value decoder_out) {
   std::array<Ort::Value, 2> joiner_input = {std::move(encoder_out),
-                                            std::move(decoder_out)};
+                                            View(&decoder_out)};
   auto logit =
       joiner_sess_->Run({}, joiner_input_names_ptr_.data(), joiner_input.data(),
                         joiner_input.size(), joiner_output_names_ptr_.data(),