From f25f3868a75d4422cde0090abc2781a5277e8eee Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Fri, 4 Oct 2024 10:01:19 -0700 Subject: [PATCH] Auto regenerate LORA's fbs files (#22313) ### Description A left-over of PR #22046 ### Motivation and Context Right now our VCPKG pipelines are broken. --- .github/workflows/mac.yml | 2 ++ .github/workflows/windows.yml | 2 +- cmake/vcpkg-configuration.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 63b3e0e6e6..d1a4366da4 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -131,11 +131,13 @@ jobs: - name: "Run compile_schema.py" run: | + set -e -x # Runner's host triplet should be x64-osx or arm64-osx export FLATC_DIR="${{ github.workspace }}/.build/${{ runner.arch }}-osx/tools/flatbuffers" export PATH="$FLATC_DIR:$PATH" flatc --version python onnxruntime/core/flatbuffers/schema/compile_schema.py --flatc "$(which flatc)" + python onnxruntime/lora/adapter_format/compile_schema.py --flatc "$(which flatc)" - name: "Detect protoc" id: protoc-detect diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d276877b7a..8a95e8a7b7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -56,7 +56,6 @@ jobs: uses: lukka/run-vcpkg@v11 with: vcpkgDirectory: "C:/vcpkg" # use VCPKG_INSTALLATION_ROOT of the image - doNotUpdateVcpkg: true runVcpkgInstall: true vcpkgJsonGlob: "cmake/vcpkg.json" vcpkgConfigurationJsonGlob: "cmake/vcpkg-configuration.json" @@ -73,6 +72,7 @@ jobs: flatc --version $FLATC_PATH = Join-Path "$FLATC_DIR" "flatc.exe" python onnxruntime/core/flatbuffers/schema/compile_schema.py --flatc "$FLATC_PATH" + python onnxruntime/lora/adapter_format/compile_schema.py --flatc "$FLATC_PATH" shell: pwsh - name: "Detect protoc" diff --git a/cmake/vcpkg-configuration.json b/cmake/vcpkg-configuration.json index f3525977c7..4afc30a3b9 100644 --- a/cmake/vcpkg-configuration.json +++ b/cmake/vcpkg-configuration.json @@ -2,7 +2,7 @@ "default-registry": { "kind": "git", "repository": "https://github.com/Microsoft/vcpkg", - "baseline": "3508985146f1b1d248c67ead13f8f54be5b4f5da" + "baseline": "c82f74667287d3dc386bce81e44964370c91a289" }, "registries": [] }