[onnx] Update onnx to 1.16.2 and fix downstream #40067

MonicaLiu0311 · 2024-07-24T07:51:35Z

onnx

Update to 1.16.2.

The usage test passed on x64-windows (header files found):

onnx provides CMake targets:

  # this is heuristically generated, and may not be correct
  find_package(ONNX CONFIG REQUIRED)
  target_link_libraries(main PRIVATE ONNX::onnx ONNX::onnx_proto)

onnx-optimizer

Update to 0.3.19. Fix dependency onnx and remove the outdated patch remove-outdate-headers.patch.

The usage test passed on x64-windows (header files found):

onnx provides CMake targets:

  # this is heuristically generated, and may not be correct
  find_package(ONNX CONFIG REQUIRED)
  target_link_libraries(main PRIVATE ONNX::onnx ONNX::onnx_proto)

openvino

Fix default-feature onnx:

FAILED: src/frontends/onnx/onnx_common/CMakeFiles/openvino_onnx_common.dir/src/parser.cpp.obj 
C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1441~1.341\bin\Hostx64\x64\cl.exe   /TP -DIN_OV_COMPONENT -DOV_BUILD_POSTFIX=\"d\" -DOV_NATIVE_PARENT_PROJECT_ROOT_DIR=\"2024.3.0-38b00ca3fb.clean\" -DOV_THREAD=OV_THREAD_TBB -DTBB_PREVIEW_WAITING_FOR_WORKERS=1 -ID:\b\openvino\src\2024.3.0-38b00ca3fb.clean\src\frontends\onnx\onnx_common\include -ID:\b\openvino\src\2024.3.0-38b00ca3fb.clean\src\frontends\onnx\onnx_common\src -ID:\b\openvino\src\2024.3.0-38b00ca3fb.clean\src\core\include -ID:\b\openvino\src\2024.3.0-38b00ca3fb.clean\src\frontends\common\include -ID:\b\openvino\src\2024.3.0-38b00ca3fb.clean\src\inference\include -ID:\b\openvino\src\2024.3.0-38b00ca3fb.clean\src\common\util\include -external:ID:\installed\x64-windows\include -external:W0 /nologo /DWIN32 /D_WINDOWS /utf-8 /GR /EHsc /MP  /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS /EHsc /Gy /W3 /bigobj /MP /wd4251 /wd4275 /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1  -std:c++14 -MDd /d1trimfile:D:\b\openvino\src\2024.3.0-38b00ca3fb.clean\ /d1trimfile:D:/b/openvino/src/2024.3.0-38b00ca3fb.clean/ /showIncludes /Fosrc\frontends\onnx\onnx_common\CMakeFiles\openvino_onnx_common.dir\src\parser.cpp.obj /FdD:\b\openvino\src\2024.3.0-38b00ca3fb.clean\bin\intel64\Debug\ /FS -c D:\b\openvino\src\2024.3.0-38b00ca3fb.clean\src\frontends\onnx\onnx_common\src\parser.cpp
D:\installed\x64-windows\include\onnx/onnx_pb.h(53): fatal error C1083: Cannot open include file: 'onnx/onnx.pb.h': No such file or directory

libtorch

Fix dependency onnx and clean up confusion regarding Dependencies.cmake patches.

FAILED: bin/torch_cpu.dll lib/torch_cpu.lib 
C:\Windows\system32\cmd.exe /C "cd . && D:\downloads\tools\cmake-3.29.2-windows\cmake-3.29.2-windows-i386\bin\cmake.exe -E vs_link_dll --intdir=caffe2\CMakeFiles\torch_cpu.dir --rc=C:\PROGRA~2\WI3CF2~1\10\bin\100226~1.0\x64\rc.exe --mt=C:\PROGRA~2\WI3CF2~1\10\bin\100226~1.0\x64\mt.exe --manifests  -- C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1441~1.341\bin\Hostx64\x64\link.exe  @CMakeFiles\torch_cpu.rsp  /out:bin\torch_cpu.dll /implib:lib\torch_cpu.lib /pdb:bin\torch_cpu.pdb /dll /version:0.0 /machine:x64 /ignore:4049 /ignore:4217 /ignore:4099 /nologo    /debug /INCREMENTAL:NO  -WHOLEARCHIVE:D:/b/libtorch/x64-windows-dbg/lib/caffe2_protos.lib -WHOLEARCHIVE:D:/b/libtorch/x64-windows-dbg/lib/Caffe2_perfkernels_avx.lib -WHOLEARCHIVE:D:/b/libtorch/x64-windows-dbg/lib/Caffe2_perfkernels_avx2.lib -WHOLEARCHIVE:D:/b/libtorch/x64-windows-dbg/lib/Caffe2_perfkernels_avx512.lib && cd ."
LINK: command "C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1441~1.341\bin\Hostx64\x64\link.exe @CMakeFiles\torch_cpu.rsp /out:bin\torch_cpu.dll /implib:lib\torch_cpu.lib /pdb:bin\torch_cpu.pdb /dll /version:0.0 /machine:x64 /ignore:4049 /ignore:4217 /ignore:4099 /nologo /debug /INCREMENTAL:NO -WHOLEARCHIVE:D:/b/libtorch/x64-windows-dbg/lib/caffe2_protos.lib -WHOLEARCHIVE:D:/b/libtorch/x64-windows-dbg/lib/Caffe2_perfkernels_avx.lib -WHOLEARCHIVE:D:/b/libtorch/x64-windows-dbg/lib/Caffe2_perfkernels_avx2.lib -WHOLEARCHIVE:D:/b/libtorch/x64-windows-dbg/lib/Caffe2_perfkernels_avx512.lib /MANIFEST:EMBED,ID=2" failed (exit code 1181) with the following output:
LINK : fatal error LNK1181: cannot open input file 'onnx_proto.lib

Changes comply with the maintainer guide.
SHA512s are updated for each updated download.
~~The "supports" clause reflects platforms that may be fixed by this new version.~~
~~Any fixed CI baseline entries are removed from that file.~~
Any patches that are no longer applied are deleted from the port's directory.
The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
Only one version is added to each modified port's versions file.

…Monica/update_onnx

ports/libtorch/cmake-fixes.patch

versions/o-/onnx.json

JavierMatosD

Hey @MonicaLiu0311, Sorry, I didn't realize you were also editing openvino here when I merged #41077

Please resolve the merge conflicts and mark "ready for review"

JavierMatosD · 2024-10-09T18:15:36Z

ports/libtorch/cmake-fixes.patch

 +  find_package(CUDNN REQUIRED)
+   set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include)


vendored dependency?

This patch line actually comes from: 36246/files , let's ask @Neumann-A to get the answer. I just organized the patches for Dependencies.cmake here because they are too scattered and a bit confusing.

I agree this looks broken, but it isn't a change from the status quo, since it just applies more-fixes.patch on top of this one.

ports/libtorch/cmake-fixes.patch

ports/onnx/fix-pybind11.patch

…0311/vcpkg into Dev/Monica/update_onnx

BillyONeal · 2024-10-18T04:22:35Z

ports/onnx-optimizer/fix-cmakelists.patch

+ # as well as ONNX Optimizer targets for other cmake libraries to use.
+
+include(CMakeFindDependencyMacro)
+find_dependency(onnx CONFIG)


Also needs find_dependency(protobuf CONFIG), and probably others. It's technically benign here because onnx itself drags in protobuf.

BillyONeal

I don't like everything here but everything I don't like was already here, so I think we should take this update. @JavierMatosD are there any remaining over-your-dead-body issues?

BillyONeal · 2024-10-18T04:23:54Z

Ah, I see above he just wanted a merge, so I'm going to merge. Thanks @MonicaLiu0311 !

ilya-lavrenov · 2024-10-18T07:28:35Z

Could you please also add ONNX 1.17.0 ?
https://github.com/onnx/onnx/releases/tag/v1.17.0

MonicaLiu0311 · 2024-12-31T07:59:27Z

Could you please also add ONNX 1.17.0 ? https://github.com/onnx/onnx/releases/tag/v1.17.0

Fixing by #42942.

Monica added 2 commits July 22, 2024 20:48

update to 1.4.2

a8a7bdd

update version

d0c603d

MonicaLiu0311 added info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Jul 24, 2024

MonicaLiu0311 assigned LilyWangLL Jul 24, 2024

MonicaLiu0311 added the category:port-bug The issue is with a library, which is something the port should already support label Jul 26, 2024

ras0219-msft and others added 11 commits September 12, 2024 14:10

Merge remote-tracking branch 'upstream/master' into HEAD

2b8ec26

Merge remote-tracking branch 'origin/master' into HEAD

1f25f7e

Merge branch 'master' of https://github.com/microsoft/vcpkg into Dev/…

5aa230f

…Monica/update_onnx

update onnx-optimizer to 0.3.19

f19e8cb

update version

6998e04

fix-cmakelists.patch

0691914

update git-tree

fe2390a

fix dependency onnx

72d38f6

update version

466c38c

update to 1.16.2

a33c993

update version

47138f7

MonicaLiu0311 changed the title ~~[onnx] Update to 1.16.1~~ [onnx] Update to 1.16.2 Sep 25, 2024

Monica added 6 commits September 26, 2024 02:37

fix dependency onnx

2b8b422

update version

2143cc6

fix feature pybind11

6c35e65

update git-tree

47fd86f

fix onnx-optimizer

47ae84d

update git-tree

6a85014

MonicaLiu0311 changed the title ~~[onnx] Update to 1.16.2~~ [onnx] Update onnx to 1.16.2 and fix downstream Sep 27, 2024

MonicaLiu0311 marked this pull request as ready for review September 27, 2024 10:00

LilyWangLL requested changes Sep 29, 2024

View reviewed changes

ports/libtorch/cmake-fixes.patch Outdated Show resolved Hide resolved

versions/o-/onnx.json Outdated Show resolved Hide resolved

format

f9802fc

LilyWangLL previously approved these changes Sep 29, 2024

View reviewed changes

LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Sep 29, 2024

JavierMatosD requested changes Sep 30, 2024

View reviewed changes

JavierMatosD marked this pull request as draft September 30, 2024 22:11

Monica added 2 commits October 8, 2024 03:25

resolve conflict

0e3d1dc

update version

8c970b5

MonicaLiu0311 dismissed LilyWangLL’s stale review via 8c970b5 October 8, 2024 10:26

Merge branch 'master' into Dev/Monica/update_onnx

24b811c

MonicaLiu0311 marked this pull request as ready for review October 9, 2024 02:14

JavierMatosD reviewed Oct 9, 2024

View reviewed changes

JavierMatosD marked this pull request as draft October 9, 2024 18:18

Monica added 3 commits October 9, 2024 20:05

fix cmake-fixes.patch

e9794c2

update git-tree

83f8e8d

Merge branch 'Dev/Monica/update_onnx' of https://github.com/MonicaLiu…

df7e84e

…0311/vcpkg into Dev/Monica/update_onnx

MonicaLiu0311 marked this pull request as ready for review October 16, 2024 06:34

BillyONeal reviewed Oct 18, 2024

View reviewed changes

BillyONeal approved these changes Oct 18, 2024

View reviewed changes

BillyONeal merged commit 88a0bf8 into microsoft:master Oct 18, 2024
16 checks passed

MonicaLiu0311 deleted the Dev/Monica/update_onnx branch October 18, 2024 06:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[onnx] Update onnx to 1.16.2 and fix downstream #40067

[onnx] Update onnx to 1.16.2 and fix downstream #40067

MonicaLiu0311 commented Jul 24, 2024 •

edited

Loading

JavierMatosD left a comment

JavierMatosD Oct 9, 2024

MonicaLiu0311 Oct 10, 2024

BillyONeal Oct 18, 2024

BillyONeal Oct 18, 2024

BillyONeal left a comment

BillyONeal commented Oct 18, 2024

ilya-lavrenov commented Oct 18, 2024

MonicaLiu0311 commented Dec 31, 2024

		+ find_package(CUDNN REQUIRED)
		set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include)

[onnx] Update onnx to 1.16.2 and fix downstream #40067

[onnx] Update onnx to 1.16.2 and fix downstream #40067

Conversation

MonicaLiu0311 commented Jul 24, 2024 • edited Loading

onnx

onnx-optimizer

openvino

libtorch

JavierMatosD left a comment

Choose a reason for hiding this comment

JavierMatosD Oct 9, 2024

Choose a reason for hiding this comment

MonicaLiu0311 Oct 10, 2024

Choose a reason for hiding this comment

BillyONeal Oct 18, 2024

Choose a reason for hiding this comment

BillyONeal Oct 18, 2024

Choose a reason for hiding this comment

BillyONeal left a comment

Choose a reason for hiding this comment

BillyONeal commented Oct 18, 2024

ilya-lavrenov commented Oct 18, 2024

MonicaLiu0311 commented Dec 31, 2024

MonicaLiu0311 commented Jul 24, 2024 •

edited

Loading