From 82184bb5a2f47a78225f211aff566d2fc667648f Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 3 Oct 2024 22:31:11 -0700 Subject: [PATCH 1/8] Auto regenerate LORA's fbs files --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d276877b7ad47..92785be3f9018 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -73,6 +73,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" From c6421e7793119c3b85bf2044ca07def48dce264d Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 3 Oct 2024 22:38:39 -0700 Subject: [PATCH 2/8] update --- .github/workflows/mac.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 63b3e0e6e6e36..89ce9a984aca1 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 "$FLATC_PATH" - name: "Detect protoc" id: protoc-detect From 51d68c539edb9d2ba5c8016a5c25f702ff668b0d Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 3 Oct 2024 23:00:17 -0700 Subject: [PATCH 3/8] update --- .github/workflows/mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 89ce9a984aca1..d1a4366da45e2 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -137,7 +137,7 @@ jobs: 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 "$FLATC_PATH" + python onnxruntime/lora/adapter_format/compile_schema.py --flatc "$(which flatc)" - name: "Detect protoc" id: protoc-detect From dcf3ac6d9a0db8b4da3c8c1890e4c9fcebdc1d6d Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 3 Oct 2024 23:44:05 -0700 Subject: [PATCH 4/8] Change baseline --- .github/workflows/windows.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 92785be3f9018..313ade129c678 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -88,19 +88,7 @@ jobs: - name: "Run build.py(x64-windows)" run: | - python tools\ci_build\build.py ` - --build_dir "cmake_build/x64-windows" ` - --skip_submodule_sync ` - --skip_tests ` - --compile_no_warning_as_error ` - --parallel ` - --path_to_protoc_exe "${{ steps.protoc-detect.outputs.protoc_path }}" ` - --use_vcpkg ` - --cmake_extra_defines "CMAKE_TOOLCHAIN_FILE:FILEPATH=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" ` - --cmake_extra_defines "VCPKG_TARGET_TRIPLET=x64-windows" ` - --cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" ` - --cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests" - shell: pwsh + python tools\ci_build\build.py --build_dir "cmake_build/x64-windows" --skip_submodule_sync --skip_tests --compile_no_warning_as_error --parallel --path_to_protoc_exe "${{ steps.protoc-detect.outputs.protoc_path }}" --use_vcpkg --cmake_extra_defines "CMAKE_TOOLCHAIN_FILE:FILEPATH=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" --cmake_extra_defines "VCPKG_TARGET_TRIPLET=x64-windows" --cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" --cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests" - name: "Run vcpkg(arm64-windows)" uses: lukka/run-vcpkg@v11 From bce7c979db60b34963053ce236abd4e862e70676 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 3 Oct 2024 23:49:48 -0700 Subject: [PATCH 5/8] Change baseline --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 313ade129c678..5a425e9b3ad19 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -89,6 +89,7 @@ jobs: - name: "Run build.py(x64-windows)" run: | python tools\ci_build\build.py --build_dir "cmake_build/x64-windows" --skip_submodule_sync --skip_tests --compile_no_warning_as_error --parallel --path_to_protoc_exe "${{ steps.protoc-detect.outputs.protoc_path }}" --use_vcpkg --cmake_extra_defines "CMAKE_TOOLCHAIN_FILE:FILEPATH=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" --cmake_extra_defines "VCPKG_TARGET_TRIPLET=x64-windows" --cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" --cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests" + shell: cmd - name: "Run vcpkg(arm64-windows)" uses: lukka/run-vcpkg@v11 From 71f67a113987f665c012d3476e64dcf4a071b7d5 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 3 Oct 2024 23:53:10 -0700 Subject: [PATCH 6/8] Change baseline --- .github/workflows/windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5a425e9b3ad19..bb77e6763272f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -88,6 +88,9 @@ jobs: - name: "Run build.py(x64-windows)" run: | + set SystemDrive=%SYSTEMDRIVE% + set SystemRoot=%SYSTEMROOT% + set windir=%WINDIR% python tools\ci_build\build.py --build_dir "cmake_build/x64-windows" --skip_submodule_sync --skip_tests --compile_no_warning_as_error --parallel --path_to_protoc_exe "${{ steps.protoc-detect.outputs.protoc_path }}" --use_vcpkg --cmake_extra_defines "CMAKE_TOOLCHAIN_FILE:FILEPATH=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" --cmake_extra_defines "VCPKG_TARGET_TRIPLET=x64-windows" --cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" --cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests" shell: cmd From d397dd9da7641fa95a5c50350e685771c4888361 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 3 Oct 2024 23:58:05 -0700 Subject: [PATCH 7/8] Change baseline --- .github/workflows/windows.yml | 18 +++++++++++++----- cmake/vcpkg-configuration.json | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bb77e6763272f..92785be3f9018 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -88,11 +88,19 @@ jobs: - name: "Run build.py(x64-windows)" run: | - set SystemDrive=%SYSTEMDRIVE% - set SystemRoot=%SYSTEMROOT% - set windir=%WINDIR% - python tools\ci_build\build.py --build_dir "cmake_build/x64-windows" --skip_submodule_sync --skip_tests --compile_no_warning_as_error --parallel --path_to_protoc_exe "${{ steps.protoc-detect.outputs.protoc_path }}" --use_vcpkg --cmake_extra_defines "CMAKE_TOOLCHAIN_FILE:FILEPATH=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" --cmake_extra_defines "VCPKG_TARGET_TRIPLET=x64-windows" --cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" --cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests" - shell: cmd + python tools\ci_build\build.py ` + --build_dir "cmake_build/x64-windows" ` + --skip_submodule_sync ` + --skip_tests ` + --compile_no_warning_as_error ` + --parallel ` + --path_to_protoc_exe "${{ steps.protoc-detect.outputs.protoc_path }}" ` + --use_vcpkg ` + --cmake_extra_defines "CMAKE_TOOLCHAIN_FILE:FILEPATH=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" ` + --cmake_extra_defines "VCPKG_TARGET_TRIPLET=x64-windows" ` + --cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" ` + --cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests" + shell: pwsh - name: "Run vcpkg(arm64-windows)" uses: lukka/run-vcpkg@v11 diff --git a/cmake/vcpkg-configuration.json b/cmake/vcpkg-configuration.json index f3525977c7bb9..4afc30a3b969d 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": [] } From dd0382f8c2765c200edc34348706dac732a6d9b7 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Fri, 4 Oct 2024 00:21:51 -0700 Subject: [PATCH 8/8] Change baseline --- .github/workflows/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 92785be3f9018..8a95e8a7b7b89 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"