whispercpp 1.3.7 → 1.3.8

data/ext/sources/ggml/src/ggml-openvino/openvino/utils.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include "node_context.h"
+
 #include <memory>
 #include <openvino/core/node.hpp>
 #include <openvino/op/shape_of.hpp>
 #include <openvino/op/slice.hpp>
 #include <utility>
 
-#include "node_context.h"
-
 namespace ov {
 namespace frontend {
 namespace ggml {
@@ -16,30 +16,23 @@ std::string getCurrentTime();
 
 void dump_ov_model(std::shared_ptr<ov::Model> model);
 
-void num_inputs_check(const NodeContext& context, size_t min_inputs, size_t max_inputs);
+void num_inputs_check(const NodeContext & context, size_t min_inputs, size_t max_inputs);
 
 int non_cont_dim(std::vector<size_t> ne, std::vector<size_t> nb);
 
-template <typename T>
-std::vector<int> argsort_descend(const std::vector<T>& v) {
+template <typename T> std::vector<int> argsort_descend(const std::vector<T> & v) {
     std::vector<int> idx(v.size());
     std::iota(idx.begin(), idx.end(), 0);
-    std::sort(idx.begin(), idx.end(), [&v](int i1, int i2) {
-        return v[i1] > v[i2];
-    });
+    std::sort(idx.begin(), idx.end(), [&v](int i1, int i2) { return v[i1] > v[i2]; });
     return idx;
 }
 
-template <typename T>
-std::vector<T> sorted_descend(std::vector<T> v) {
-    std::sort(v.begin(), v.end(), [](T a, T b) {
-        return a > b;
-    });
+template <typename T> std::vector<T> sorted_descend(std::vector<T> v) {
+    std::sort(v.begin(), v.end(), [](T a, T b) { return a > b; });
     return v;
 }
 
-template <typename T>
-bool is_permuted(const std::vector<T>& strides) {
+template <typename T> bool is_permuted(const std::vector<T> & strides) {
     for (size_t i = 0; i < strides.size() - 1; ++i) {
         if (strides[i] < strides[i + 1]) {
             return true;
@@ -48,8 +41,7 @@ bool is_permuted(const std::vector<T>& strides) {
     return false;
 }
 
-template <typename T>
-std::vector<T> permute(const std::vector<T>& x, const std::vector<int>& perm) {
+template <typename T> std::vector<T> permute(const std::vector<T> & x, const std::vector<int> & perm) {
     std::vector<T> result;
     result.reserve(perm.size());
     for (int i : perm) {
@@ -58,25 +50,35 @@ std::vector<T> permute(const std::vector<T>& x, const std::vector<int>& perm) {
     return result;
 }
 
-std::shared_ptr<ov::Node> get_dimensions(const std::shared_ptr<ov::op::v3::ShapeOf>& shape,
-                                         const std::vector<int>& dims);
-std::shared_ptr<ov::Node> get_dimensions(const std::shared_ptr<ov::Node>& node, const std::vector<int>& dims);
+std::shared_ptr<ov::Node> get_dimensions(const std::shared_ptr<ov::op::v3::ShapeOf> & shape,
+                                         const std::vector<int> & dims);
+std::shared_ptr<ov::Node> get_dimensions(const std::shared_ptr<ov::Node> & node, const std::vector<int> & dims);
 
-OutputVector rename_outputs_with_suffix(const OutputVector& outputs, const std::string& suffix);
+OutputVector rename_outputs_with_suffix(const OutputVector & outputs, const std::string & suffix);
 
-std::pair<ov::Output<Node>, ov::Output<Node>> make_sin_cos(int32_t* rope_params,
+std::pair<ov::Output<Node>, ov::Output<Node>> make_sin_cos(int32_t * rope_params,
                                                            std::shared_ptr<ov::Node> inp_pos,
                                                            std::shared_ptr<ov::Node> rope_freqs_weight = nullptr,
                                                            bool imrope = false,
                                                            bool stateful = false);
 
-ov::Output<ov::Node> process_view_input(const NodeContext& context, int input_index, int slice_len = 0);
+ov::Output<ov::Node> process_view_input(const NodeContext & context, int input_index, int slice_len = 0);
+
+ov::Output<ov::Node> process_view_input_new(const NodeContext & context, int input_index);
 
 namespace op {
-template <typename T>
-OutputVector translate_1to1_match_2_inputs(const NodeContext& context) {
+template <typename T> OutputVector translate_1to1_match_2_inputs(const NodeContext & context) {
     num_inputs_check(context, 2, 2);
-    auto res = std::make_shared<T>(context.get_input(0), context.get_input(1));
+    auto input_0 = process_view_input_new(context, 0);
+    auto input_1 = process_view_input_new(context, 1);
+    auto res = std::make_shared<T>(input_0, input_1);
+    return rename_outputs_with_suffix({res}, context.get_name());
+}
+
+template <typename T> OutputVector translate_1to1_match_1_input(const NodeContext & context) {
+    num_inputs_check(context, 1, 1);
+    auto input = process_view_input_new(context, 0);
+    auto res = std::make_shared<T>(input);
     return rename_outputs_with_suffix({res}, context.get_name());
 }
 }  // namespace op