[onnxruntime] Update to v1.19.2 (#270)

* https://github.com/microsoft/onnxruntime/releases/tag/v1.19.2 * circleci: fix Android build of onnxruntime port
luncliff · Sep 27, 2024 · 72f8b2a · 72f8b2a
1 parent ea4c70f
commit 72f8b2a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -84,8 +84,9 @@ jobs:
           destination: "build-logs"
 
   arm64_android:
-    docker:
+    docker: # https://circleci.com/developer/images/image/cimg/android
       - image: cimg/android:2024.09.1-ndk # 27.0.12077973
+    resource_class: large
     environment:
       VCPKG_DOWNLOADS: /tmp/vcpkg-caches
       VCPKG_DEFAULT_BINARY_CACHE: /tmp/vcpkg-caches
@@ -103,22 +104,28 @@ jobs:
             git clone --branch=2024.08.23 --depth=1 https://github.com/microsoft/vcpkg
             pushd vcpkg
               ./bootstrap-vcpkg.sh
-              ./vcpkg --version
             popd
-            pwd
+            echo 'export PATH="$VCPKG_ROOT:$PATH"' >> "$BASH_ENV"
+          working_directory: /tmp
+          environment:
+            VCPKG_ROOT: /tmp/vcpkg
       - run:
           name: "Install: azure-port-android.txt"
           command: |
-            ./vcpkg install \
+            vcpkg --version
+            vcpkg install \
               --keep-going --recurse \
+              --x-buildtrees-root buildtrees \
               --clean-buildtrees-after-build \
               --clean-packages-after-build \
-              --overlay-ports "$(pwd)/../ports" \
-              --overlay-triplets "$(pwd)/../triplets" \
-              $(cat "$(pwd)/../test/azure-port-android.txt")
-          working_directory: vcpkg
+              --overlay-ports "$(pwd)/ports" \
+              --overlay-triplets "$(pwd)/triplets" \
+              $(cat "$(pwd)/test/azure-port-android.txt")
           environment:
+            VCPKG_ROOT: /tmp/vcpkg
             VCPKG_DEFAULT_TRIPLET: arm64-android
+            VCPKG_MAX_CONCURRENCY: 2
+          no_output_timeout: 1h
       - store_artifacts:
-          path: vcpkg/buildtrees/
+          path: buildtrees/ # follow --x-buildtrees-root
           destination: "build-logs"
diff --git a/ports/onnxruntime/portfile.cmake b/ports/onnxruntime/portfile.cmake
@@ -1,13 +1,13 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
-set(ORT_GIT_COMMIT "26250ae74d2c9a3c6860625ba4a147ddfb936907")
+set(ORT_GIT_COMMIT "ffceed9d44f2f3efb9dd69fa75fea51163c91d91")
 set(ORT_GIT_BRANCH "v${VERSION}")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/onnxruntime
     REF ${ORT_GIT_BRANCH}
-    SHA512 da0cd297ffc11e2f627a91e55476952b2511e36bf97fb0d9a0a8b1e2cbd12a451e1a8ead1581bfe03d08c97946f0938434edd4637cbeb28f7007533d4b37ee55
+    SHA512 3bf25e431d175c61953d28b1bf8f6871376684263992451a5b2a66e670768fc66e7027f141c6e3f4d1eddeebeda51f31ea0adf4749e50d99ee89d0a26bec77ce
     PATCHES
         fix-cmake.patch
         fix-cmake-cuda.patch

diff --git a/ports/onnxruntime/vcpkg.json b/ports/onnxruntime/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "onnxruntime",
-  "version-semver": "1.19.0",
-  "port-version": 2,
+  "version-semver": "1.19.2",
   "description": "ONNX Runtime: cross-platform, high performance ML inferencing and training accelerator",
   "homepage": "https://onnxruntime.ai/",
   "license": "MIT",
@@ -31,10 +30,6 @@
     },
     "ms-gsl",
     "nlohmann-json",
-    {
-      "name": "nsync",
-      "platform": "!windows"
-    },
     {
       "name": "nsync",
       "platform": "!windows",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -141,8 +141,8 @@
       "port-version": 1
     },
     "onnxruntime": {
-      "baseline": "1.19.0",
-      "port-version": 2
+      "baseline": "1.19.2",
+      "port-version": 0
     },
     "opencl": {
       "baseline": "v2024.05.08",

diff --git a/versions/o-/onnxruntime.json b/versions/o-/onnxruntime.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dd104074e4167d2bbb64723e7a001cfd7b05fdb9",
+      "version-semver": "1.19.2",
+      "port-version": 0
+    },
     {
       "git-tree": "4960a5f0a0187e736751f8bf6545cf9d7d2a3676",
       "version-semver": "1.19.0",