From bd1a6a0570e45d4b42325572607af811cb7c8997 Mon Sep 17 00:00:00 2001 From: Florian Bruggisser Date: Sun, 8 Oct 2023 19:01:21 +0200 Subject: [PATCH] updated to onnxruntime v1.16.0 --- .github/workflows/main.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- build-macos.sh | 5 ++--- patches/flatbuffers.patch | 20 -------------------- 4 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 patches/flatbuffers.patch diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 75148e6..51d1bcc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ on: tag: description: 'Version Tag' required: false - default: 'v1.13.1' + default: 'v1.16.0' label: description: 'Additional label for release' required: false @@ -20,7 +20,7 @@ jobs: build: strategy: matrix: - os: [ 'macos-11' ] + os: [ 'macos-13-large' ] python-version: [ '3.8', '3.9', '3.10' ] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ea8202c..f5c38ae 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,7 +6,7 @@ on: tag: description: 'Version Tag' required: false - default: 'v1.15.0' + default: 'v1.16.0' jobs: @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.9' - name: "Download binaries from ${{ github.event.inputs.tag }}" uses: robinraju/release-downloader@v1.3 diff --git a/build-macos.sh b/build-macos.sh index f7bf4a4..7dc63be 100755 --- a/build-macos.sh +++ b/build-macos.sh @@ -2,7 +2,7 @@ echo "building for $(python --version)" -version_tag="v1.15.1" +version_tag="v1.16.0" onnxruntime_dir="onnxruntime" # cleanup @@ -29,7 +29,6 @@ pip install -r requirements-dev.txt # apply patches echo "applying patches..." -patch -i "$patch_dir/flatbuffers.patch" "./build/MacOS/Release/_deps/flatbuffers-src/src/idl_gen_rust.cpp" # build ./build.sh --config Release \ @@ -50,7 +49,7 @@ if [ $RESULT -ne 0 ]; then fi # wait for file to be copied -sleep 1 +sleep 5 # copy to dist mkdir -p "$dist_dir" diff --git a/patches/flatbuffers.patch b/patches/flatbuffers.patch deleted file mode 100644 index fde1a00..0000000 --- a/patches/flatbuffers.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- idl_gen_rust_orig.cpp 2023-08-08 20:18:59 -+++ idl_gen_rust.cpp 2023-08-08 20:21:13 -@@ -406,7 +406,7 @@ - // example: f(A, D::E) -> super::D::E - // does not include leaf object (typically a struct type). - -- size_t i = 0; -+ // size_t i = 0; - std::stringstream stream; - - auto s = src->components.begin(); -@@ -417,7 +417,7 @@ - if (*s != *d) { break; } - ++s; - ++d; -- ++i; -+ // ++i; - } - - for (; s != src->components.end(); ++s) { stream << "super::"; }