update onnxruntime version to 1.141.1

xmba15 · Apr 11, 2023 · 567a7b9 · 567a7b9
1 parent 814e39b
commit 567a7b9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
   test-production:
     runs-on: ubuntu-20.04
     container:
-      image: xmba15/onnx_runtime_cpp:v1.10.0-ubuntu20.04
+      image: xmba15/onnx_runtime_cpp:v1.14.1-ubuntu20.04
 
     steps:
       - uses: actions/checkout@v3

diff --git a/scripts/install_latest_cmake.bash b/scripts/install_latest_cmake.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-readonly CMAKE_VERSION_TO_INSTALL="3.18.0"
+readonly CMAKE_VERSION_TO_INSTALL="3.24.0"
 
 function command_exists
 {

diff --git a/scripts/install_onnx_runtime.bash b/scripts/install_onnx_runtime.bash
@@ -9,7 +9,7 @@ sudo -l
 sudo apt-get update
 sudo apt install -y --no-install-recommends zlib1g-dev
 
-readonly ONNXRUNTIME_VERSION="v1.10.0"
+readonly ONNXRUNTIME_VERSION="v1.14.1"
 git clone --recursive -b ${ONNXRUNTIME_VERSION} https://github.com/Microsoft/onnxruntime
 cd onnxruntime
 

diff --git a/src/OrtSessionHandler.cpp b/src/OrtSessionHandler.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include <onnxruntime/core/session/onnxruntime_c_api.h>
 #include <onnxruntime/core/session/onnxruntime_cxx_api.h>
 
 #if ENABLE_TENSORRT
@@ -254,9 +255,13 @@ void OrtSessionHandler::OrtSessionHandlerIml::initModelInfo()
         m_inputTensorSizes.emplace_back(
             std::accumulate(std::begin(curInputShape), std::end(curInputShape), 1, std::multiplies<int64_t>()));
 
+#if ORT_API_VERSION > 12
+        m_inputNodeNames.emplace_back(strdup(m_session.GetInputNameAllocated(i, m_ortAllocator).get()));
+#else
         char* inputName = m_session.GetInputName(i, m_ortAllocator);
         m_inputNodeNames.emplace_back(strdup(inputName));
         m_ortAllocator.Free(inputName);
+#endif
     }
 
     {
@@ -276,9 +281,13 @@ void OrtSessionHandler::OrtSessionHandlerIml::initModelInfo()
 
         m_outputShapes.emplace_back(tensorInfo.GetShape());
 
+#if ORT_API_VERSION > 12
+        m_outputNodeNames.emplace_back(strdup(m_session.GetOutputNameAllocated(i, m_ortAllocator).get()));
+#else
         char* outputName = m_session.GetOutputName(i, m_ortAllocator);
         m_outputNodeNames.emplace_back(strdup(outputName));
         m_ortAllocator.Free(outputName);
+#endif
     }
 
     {