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

[onnx] Update to 1.17.0 and fix openvino dependency error #42942

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/onnx/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO onnx/onnx
REF "v${VERSION}"
SHA512 7a9a8493b9c007429629484156487395044506f34e72253640e626351cb623b390750b36af78a290786131e3dcac35f4eb269e8693b594b7ce7cb105bcf9318d
SHA512 5a18e2b19ec9c18c8b115fb7e12ed98eddaa581c95f15c4dd420cd6c86e7caa04f9a393da589e76b89cf9b3544abd3749a8c77c2446782f37502eb74e9b1f661
PATCHES
fix-cmakelists.patch
fix-dependency-protobuf.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/onnx/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "onnx",
"version-semver": "1.16.2",
"version-semver": "1.17.0",
"description": "Open standard for machine learning interoperability",
"homepage": "https://onnx.ai",
"license": "Apache-2.0",
Expand Down
1 change: 1 addition & 0 deletions ports/openvino/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ vcpkg_cmake_configure(
"-DENABLE_TBBBIND_2_5=OFF"
"-DENABLE_TEMPLATE=OFF"
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
"-DCMAKE_CXX_STANDARD=17"
)

vcpkg_cmake_install()
Expand Down
2 changes: 1 addition & 1 deletion ports/openvino/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "openvino",
"version": "2024.4.0",
"port-version": 5,
"port-version": 6,
"maintainers": "OpenVINO Developers <[email protected]>",
"summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
"description": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6605,7 +6605,7 @@
"port-version": 0
},
"onnx": {
"baseline": "1.16.2",
"baseline": "1.17.0",
"port-version": 0
},
"onnx-optimizer": {
Expand Down Expand Up @@ -6790,7 +6790,7 @@
},
"openvino": {
"baseline": "2024.4.0",
"port-version": 5
"port-version": 6
},
"openvpn3": {
"baseline": "3.10",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/onnx.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e0e2e9cfd6cf5a89abe65fbbdb930cd35560bf4",
"version-semver": "1.17.0",
"port-version": 0
},
{
"git-tree": "57d8f77c2964232239ba10b3f2ebf16698486d9a",
"version-semver": "1.16.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openvino.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "54ca4f9b2e864fc832c499ca51b60d95c1f235bf",
"version": "2024.4.0",
"port-version": 6
},
{
"git-tree": "d3497e79615424c72514c072b5f7deb876f35718",
"version": "2024.4.0",
Expand Down