Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[onnxruntime] Update to v1.19.2 #270

Merged
merged 7 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
4 changes: 2 additions & 2 deletions ports/onnxruntime/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 1 addition & 6 deletions ports/onnxruntime/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -31,10 +30,6 @@
},
"ms-gsl",
"nlohmann-json",
{
"name": "nsync",
"platform": "!windows"
},
{
"name": "nsync",
"platform": "!windows",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/onnxruntime.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dd104074e4167d2bbb64723e7a001cfd7b05fdb9",
"version-semver": "1.19.2",
"port-version": 0
},
{
"git-tree": "4960a5f0a0187e736751f8bf6545cf9d7d2a3676",
"version-semver": "1.19.0",
Expand Down
Loading