From 1d02146810f1587cf19831f309e64fc28b4ce3aa Mon Sep 17 00:00:00 2001
From: Dmitry Matveev <dmitry@g-api.org>
Date: Sat, 22 Apr 2023 20:15:40 +0000
Subject: [PATCH] Bump supported ONNX RT version to 1.14.1

- Existing tests pass with the ONNX models mentioned in tests.
---
 modules/gapi/src/backends/onnx/gonnxbackend.cpp  | 12 ++++++------
 modules/gapi/test/infer/gapi_infer_onnx_test.cpp | 10 ++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/gapi/src/backends/onnx/gonnxbackend.cpp b/modules/gapi/src/backends/onnx/gonnxbackend.cpp
index b78ba6d05e..85e427792b 100644
--- a/modules/gapi/src/backends/onnx/gonnxbackend.cpp
+++ b/modules/gapi/src/backends/onnx/gonnxbackend.cpp
@@ -44,7 +44,8 @@ static std::string pdims(const std::vector<int64_t> &dims) {
 
 struct TensorInfo {
     TensorInfo() = default;
-    explicit TensorInfo(const Ort::TensorTypeAndShapeInfo& info)
+
+    explicit TensorInfo(const Ort::ConstTensorTypeAndShapeInfo &info)
         : dims(info.GetShape())
         , type(info.GetElementType())
         , is_dynamic(ade::util::find(dims, -1) != dims.end()) {
@@ -688,11 +689,10 @@ std::vector<TensorInfo> ONNXCompiled::getTensorInfo(TensorPosition pos) {
             : this_session.GetOutputTypeInfo(i);
         tensor_info.emplace_back(info.GetTensorTypeAndShapeInfo());
 
-        char *name_p = pos == INPUT
-            ? this_session.GetInputName(i, allocator)
-            : this_session.GetOutputName(i, allocator);
-        tensor_info.back().name = name_p;
-        allocator.Free(name_p);
+        Ort::AllocatedStringPtr name_p = pos == INPUT
+            ? this_session.GetInputNameAllocated(i, allocator)
+            : this_session.GetOutputNameAllocated(i, allocator);
+        tensor_info.back().name = std::string(name_p.get());
     }
 
     return tensor_info;
diff --git a/modules/gapi/test/infer/gapi_infer_onnx_test.cpp b/modules/gapi/test/infer/gapi_infer_onnx_test.cpp
index 110ae7d964..c38aa9df1d 100644
--- a/modules/gapi/test/infer/gapi_infer_onnx_test.cpp
+++ b/modules/gapi/test/infer/gapi_infer_onnx_test.cpp
@@ -332,9 +332,8 @@ public:
         // Inputs Run params
         std::vector<Ort::Value> in_tensors;
         for(size_t i = 0; i < num_in; ++i) {
-            char* in_node_name_p = session.GetInputName(i, allocator);
-            in_node_names.emplace_back(in_node_name_p);
-            allocator.Free(in_node_name_p);
+            auto in_node_name_p = session.GetInputNameAllocated(i, allocator);
+            in_node_names.emplace_back(in_node_name_p.get());
             in_node_dims = toORT(ins[i].size);
             in_tensors.emplace_back(Ort::Value::CreateTensor<T>(memory_info,
                                                                 const_cast<T*>(ins[i].ptr<T>()),
@@ -345,9 +344,8 @@ public:
         // Outputs Run params
         if (custom_out_names.empty()) {
             for(size_t i = 0; i < num_out; ++i) {
-                char* out_node_name_p = session.GetOutputName(i, allocator);
-                out_node_names.emplace_back(out_node_name_p);
-                allocator.Free(out_node_name_p);
+                auto out_node_name_p = session.GetOutputNameAllocated(i, allocator);
+                out_node_names.emplace_back(out_node_name_p.get());
             }
         } else {
             out_node_names = std::move(custom_out_names);