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

update onnx.patch to apply wasm build break fix #17104

Merged
merged 1 commit into from
Aug 11, 2023

Conversation

fs-eire
Copy link
Contributor

@fs-eire fs-eire commented Aug 11, 2023

Description

This PR fixes build break for WebAssembly introduced in 6986981 (onnx/onnx@435ad2b).

This change updates onnx.patch in onnxruntime repo. the corresponding PR in onnx repo is: onnx/onnx#5495.

It may takes a while for the next onnx version bump.

Copy link
Contributor

@jcwchen jcwchen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the quick update (both in ORT and ONNX)! onnx/onnx#5496 the cherry-pick for ONNX 1.14.1 is ready and probably we can forward it tomorrow. After that, ORT can directly consume that ONNX commit as well.

Also I am curious why the previous PR #16325 does not catch the build issue here. Is it because there are some other additional CIs not running in the PR?

fs-eire added a commit that referenced this pull request Aug 11, 2023
### Description
updates the build.bat file in root folder to try best efforts to locate
patch.exe.

patch.exe is needed to apply patches to some of the dependencies. for
example, #17104. However, patch.exe is not available on every windows
developer's search path, and if cannot find patch.exe, the build will
continue silently. ( as a result, patch is not applied and for patches
like #17104, this will cause a build break )

This change adds folder `C:\Program Files\Git\usr\bin` to the PATH,
which is the default git installation directory. This may resolve the
patch not found issue for most (hopefully) users.
@fs-eire
Copy link
Contributor Author

fs-eire commented Aug 11, 2023

Thanks for the quick update (both in ORT and ONNX)! onnx/onnx#5496 the cherry-pick for ONNX 1.14.1 is ready and probably we can forward it tomorrow. After that, ORT can directly consume that ONNX commit as well.

Also I am curious why the previous PR #16325 does not catch the build issue here. Is it because there are some other additional CIs not running in the PR?

It's a coincident that we temporarily disabled the CI when we are fixing a web CI failure.

Copy link
Contributor

@jcwchen jcwchen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI the latest ONNX 1.14.1 branch now includes your ONNX fix: onnx/onnx#5495

@snnn snnn mentioned this pull request Aug 11, 2023
@fs-eire
Copy link
Contributor Author

fs-eire commented Aug 11, 2023

I will wait for #17121. If it get merged this PR can close.

@fs-eire fs-eire merged commit 5704e71 into main Aug 11, 2023
@fs-eire fs-eire deleted the fs-eire/fix-onnx-wasm-build-break-patch branch August 11, 2023 22:00
@fs-eire
Copy link
Contributor Author

fs-eire commented Aug 11, 2023

I will wait for #17121. If it get merged this PR can close.

it takes longer as expected to update submodule onnx. let's merge this first.

jchen351 pushed a commit that referenced this pull request Aug 12, 2023
### Description
updates the build.bat file in root folder to try best efforts to locate
patch.exe.

patch.exe is needed to apply patches to some of the dependencies. for
example, #17104. However, patch.exe is not available on every windows
developer's search path, and if cannot find patch.exe, the build will
continue silently. ( as a result, patch is not applied and for patches
like #17104, this will cause a build break )

This change adds folder `C:\Program Files\Git\usr\bin` to the PATH,
which is the default git installation directory. This may resolve the
patch not found issue for most (hopefully) users.
jchen351 pushed a commit that referenced this pull request Aug 12, 2023
### Description
This PR fixes build break for WebAssembly introduced in
6986981
(onnx/onnx@435ad2b).

This change updates onnx.patch in onnxruntime repo. the corresponding PR
in onnx repo is: onnx/onnx#5495.

It may takes a while for the next onnx version bump.
kleiti pushed a commit to kleiti/onnxruntime that referenced this pull request Mar 22, 2024
…7106)

### Description
updates the build.bat file in root folder to try best efforts to locate
patch.exe.

patch.exe is needed to apply patches to some of the dependencies. for
example, microsoft#17104. However, patch.exe is not available on every windows
developer's search path, and if cannot find patch.exe, the build will
continue silently. ( as a result, patch is not applied and for patches
like microsoft#17104, this will cause a build break )

This change adds folder `C:\Program Files\Git\usr\bin` to the PATH,
which is the default git installation directory. This may resolve the
patch not found issue for most (hopefully) users.
kleiti pushed a commit to kleiti/onnxruntime that referenced this pull request Mar 22, 2024
### Description
This PR fixes build break for WebAssembly introduced in
6986981
(onnx/onnx@435ad2b).

This change updates onnx.patch in onnxruntime repo. the corresponding PR
in onnx repo is: onnx/onnx#5495.

It may takes a while for the next onnx version bump.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants