Update ONNX Runtime version To 1.13.1 (#160)

microsoft · Oct 25, 2022 · c66d7e0 · c66d7e0
1 parent 67ba67a
commit c66d7e0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 104 deletions.
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
diff --git a/.github/workflows/win-ci.yml b/.github/workflows/win-ci.yml
diff --git a/.pipelines/OneBranch.Official.yml b/.pipelines/OneBranch.Official.yml
@@ -15,6 +15,11 @@ parameters: # parameters are shown up in ADO UI in a build queue time
   displayName: 'Enable debug output'
   type: boolean
   default: false
+
+- name: 'ortversion'
+  displayName: 'ONNX Runtime Version'
+  type: string
+  default: '1.13.1'
 
 variables:
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] 
@@ -82,10 +87,10 @@ extends:
                 set -e -x
                 apt-get update
                 apt-get install -y cmake gcc g++ libpng-dev libjpeg-turbo8-dev
-                curl -O -L https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz
+                curl -O -L https://github.com/microsoft/onnxruntime/releases/download/v{{ parameters.ortversion }}/onnxruntime-linux-x64-{{ parameters.ortversion }}.tgz
                 mkdir onnxruntimebin
                 cd onnxruntimebin
-                tar --strip=1 -zxvf ../onnxruntime-linux-x64-1.10.0.tgz
+                tar --strip=1 -zxvf ../onnxruntime-linux-x64-{{ parameters.ortversion }}.tgz
             displayName: Download onnxruntime
             workingDirectory: '$(Build.BinariesDirectory)'            
 
@@ -126,9 +131,9 @@ extends:
             @echo ##vso[task.setvariable variable=vsdevcmd]%vsdevcmd%
           displayName: 'locate vsdevcmd via vswhere'
         - script: |
-            curl -L -o onnxruntime.zip https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-win-x64-1.10.0.zip
+            curl -L -o onnxruntime.zip https://github.com/microsoft/onnxruntime/releases/download/v{{ parameters.ortversion }}/onnxruntime-win-x64-{{ parameters.ortversion }}.zip
             7z x onnxruntime.zip
-            move onnxruntime-win-x64-1.10.0 onnxruntimebin
+            move onnxruntime-win-x64-{{ parameters.ortversion }} onnxruntimebin
           workingDirectory: '$(Build.BinariesDirectory)'
           displayName: 'Install python modules' 
         #TODO: use the vsdevcmd variable

diff --git a/.pipelines/OneBranch.PullRequest.yml b/.pipelines/OneBranch.PullRequest.yml
@@ -16,6 +16,11 @@ parameters: # parameters are shown up in ADO UI in a build queue time
   type: boolean
   default: false
 
+- name: 'ortversion'
+  displayName: 'ONNX Runtime Version'
+  type: string
+  default: '1.13.1'
+
 variables:
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] 
   system.debug: ${{ parameters.debug }}
@@ -82,10 +87,10 @@ extends:
                 set -e -x
                 apt-get update
                 apt-get install -y cmake gcc g++ libpng-dev libjpeg-turbo8-dev
-                curl -O -L https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz
+                curl -O -L https://github.com/microsoft/onnxruntime/releases/download/v{{ parameters.ortversion }}/onnxruntime-linux-x64-{{ parameters.ortversion }}.tgz
                 mkdir onnxruntimebin
                 cd onnxruntimebin
-                tar --strip=1 -zxvf ../onnxruntime-linux-x64-1.10.0.tgz
+                tar --strip=1 -zxvf ../onnxruntime-linux-x64-{{ parameters.ortversion }}.tgz
             displayName: Download onnxruntime
             workingDirectory: '$(Build.BinariesDirectory)'            
 
@@ -126,9 +131,9 @@ extends:
             @echo ##vso[task.setvariable variable=vsdevcmd]%vsdevcmd%
           displayName: 'locate vsdevcmd via vswhere'
         - script: |
-            curl -L -o onnxruntime.zip https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-win-x64-1.10.0.zip
+            curl -L -o onnxruntime.zip https://github.com/microsoft/onnxruntime/releases/download/v{{ parameters.ortversion }}/onnxruntime-win-x64-{{ parameters.ortversion }}.zip
             7z x onnxruntime.zip
-            move onnxruntime-win-x64-1.10.0 onnxruntimebin
+            move onnxruntime-win-x64-{{ parameters.ortversion }} onnxruntimebin
           workingDirectory: '$(Build.BinariesDirectory)'
           displayName: 'Download onnxruntime binary' 
         #TODO: use the vsdevcmd variable

diff --git a/c_cxx/CMakeLists.txt b/c_cxx/CMakeLists.txt
@@ -22,6 +22,8 @@ option(onnxruntime_USE_TENSORRT "Build with TensorRT support" OFF)
 option(LIBPNG_ROOTDIR "libpng root dir")
 option(ONNXRUNTIME_ROOTDIR "onnxruntime root dir")
 
+set(CMAKE_CXX_STANDARD 17)
+
 if(NOT ONNXRUNTIME_ROOTDIR)
   if(WIN32)
     set(ONNXRUNTIME_ROOTDIR "C:/Program Files (x86)/onnxruntime")

diff --git a/c_cxx/squeezenet/README.md b/c_cxx/squeezenet/README.md
@@ -1,10 +1,10 @@
 ## How to run the application
 1.  (Linux) Run ```run_capi_application.sh```, indicate onnxruntime library tarball with -p argument and indicate current onnxruntime-inference-examples/c_cxx/squeezenet directory with -w argument.
 ```
-./run_capi_application.sh -p /home/azureuser/onnxruntime-linux-x64-gpu-1.10.0.tgz -w /home/azureuser/repos/onnxruntime-inference-examples/c_cxx/squeezenet
+./run_capi_application.sh -p /home/azureuser/onnxruntime-linux-x64-gpu-1.13.1.tgz -w /home/azureuser/repos/onnxruntime-inference-examples/c_cxx/squeezenet
 ``` 
 2. (Windows) Run ```run_capi_application.bat``` with onnxruntime library zip file and current onnxruntime-inference-examples\c_cxx\squeezenet directory
 ```
-.\run_capi_application.bat D:\onnxruntime-win-x64-gpu-1.11.0.zip D:\repos\onnxruntime-inference-examples\c_cxx\squeezenet
+.\run_capi_application.bat D:\onnxruntime-win-x64-gpu-1.13.1.zip D:\repos\onnxruntime-inference-examples\c_cxx\squeezenet
 ```
 3. Or you can manully run cmake and remember to download squeezenet onnx model.