From a8a7bdda5b70e81d6faac75dda7a5ec38611a68b Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Mon, 22 Jul 2024 20:48:31 -0700
Subject: [PATCH 01/21] update to 1.4.2

---
 ports/onnx/fix-dependency-protobuf.patch | 6 +++---
 ports/onnx/portfile.cmake                | 2 +-
 ports/onnx/vcpkg.json                    | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ports/onnx/fix-dependency-protobuf.patch b/ports/onnx/fix-dependency-protobuf.patch
index 6ccdac66502656..603f58770ffcf5 100644
--- a/ports/onnx/fix-dependency-protobuf.patch
+++ b/ports/onnx/fix-dependency-protobuf.patch
@@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1295eab..0fb9f17 100644
+index d81ac1d..9f97998 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -126,6 +126,7 @@ if(ONNX_BUILD_TESTS)
-   include(googletest)
+@@ -149,6 +149,7 @@ if(ONNX_BUILD_TESTS)
+   set(googletest_STATIC_LIBRARIES GTest::gtest)
  endif()
  
 +find_package(protobuf CONFIG REQUIRED)
diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake
index 9d86f8e50793b6..41fe90ec4efe77 100644
--- a/ports/onnx/portfile.cmake
+++ b/ports/onnx/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onnx/onnx
     REF "v${VERSION}"
-    SHA512 b46a4ab70af88053318eba45251c1f71528f15e45a33042877570e8d857febd3ec66e2e811fcda2105a4f17b84c9a1c6a0aaa22756c3287321b3ea29e83127fd
+    SHA512 0ae1b36563ddeaa9947bf452eb20b83174e4c2bc4696b61768f096c401666323343fac0f699f756da99d3c29df15a0bd78fe3fa51da15f133617d7310c5b28d4
     PATCHES
         fix-cmakelists.patch
         fix-dependency-protobuf.patch
diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json
index 4bff31b70a4210..f27c32bc2b0175 100644
--- a/ports/onnx/vcpkg.json
+++ b/ports/onnx/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "onnx",
-  "version-semver": "1.15.0",
-  "port-version": 1,
+  "version-semver": "1.16.1",
   "description": "Open standard for machine learning interoperability",
   "homepage": "https://onnx.ai",
   "license": "Apache-2.0",

From d0c603d1e5c54a702fbcb5253f15eb418f9ed901 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Wed, 24 Jul 2024 00:48:41 -0700
Subject: [PATCH 02/21] update version

---
 versions/baseline.json | 4 ++--
 versions/o-/onnx.json  | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index ac43c1cfaddc13..94b68d89e36e3a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6425,8 +6425,8 @@
       "port-version": 1
     },
     "onnx": {
-      "baseline": "1.15.0",
-      "port-version": 1
+      "baseline": "1.16.1",
+      "port-version": 0
     },
     "onnx-optimizer": {
       "baseline": "0.3.18",
diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json
index 014174c60c042d..58a419262562f6 100644
--- a/versions/o-/onnx.json
+++ b/versions/o-/onnx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e65e33affe141144d0ef0e1336841e268af0e72c",
+      "version-semver": "1.16.1",
+      "port-version": 0
+    },
     {
       "git-tree": "69ad297b15bb801f74d50be6e5d290eab7573be4",
       "version-semver": "1.15.0",

From f19e8cb7dbe0e418e1c0056dceabc1e7aa95dd17 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Fri, 20 Sep 2024 03:53:13 -0700
Subject: [PATCH 03/21] update onnx-optimizer to 0.3.19

---
 ports/onnx-optimizer/fix-cmakelists.patch     | 21 ++++++++--------
 ports/onnx-optimizer/portfile.cmake           |  3 +--
 .../remove-outdate-headers.patch              | 24 -------------------
 ports/onnx-optimizer/vcpkg.json               |  2 +-
 4 files changed, 12 insertions(+), 38 deletions(-)
 delete mode 100644 ports/onnx-optimizer/remove-outdate-headers.patch

diff --git a/ports/onnx-optimizer/fix-cmakelists.patch b/ports/onnx-optimizer/fix-cmakelists.patch
index 1dbc271341bf7e..d4826f0803016e 100644
--- a/ports/onnx-optimizer/fix-cmakelists.patch
+++ b/ports/onnx-optimizer/fix-cmakelists.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0063385..64458ef 100644
+index 0063385..f1522bc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -10,6 +10,15 @@ project(onnx_optimizer C CXX)
@@ -33,6 +33,15 @@ index 0063385..64458ef 100644
  
  file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION)
  string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION)
+@@ -41,7 +48,7 @@ file(GLOB onnx_opt_srcs "onnxoptimizer/*.cc"
+ list(REMOVE_ITEM onnx_opt_srcs "${PROJECT_SOURCE_DIR}/onnxoptimizer/cpp2py_export.cc")
+ 
+ onnxopt_add_library(onnx_optimizer ${onnx_opt_srcs})
+-target_link_libraries(onnx_optimizer PUBLIC ${ONNX_TARGET_NAME})
++target_link_libraries(onnx_optimizer PUBLIC ONNX::onnx ONNX::onnx_proto)
+ target_include_directories(onnx_optimizer PUBLIC
+     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+     $<INSTALL_INTERFACE:include>
 @@ -70,7 +77,7 @@ if(BUILD_ONNX_PYTHON)
        set(PY_EXT_SUFFIX ".so")
      endif()
@@ -63,13 +72,3 @@ index 0063385..64458ef 100644
      target_compile_options(onnx_opt_cpp2py_export
                             PRIVATE /MP
                                     /WX
-diff --git a/cmake/utils.cmake b/cmake/utils.cmake
-index 6cca9f3..9d79f1a 100644
---- a/cmake/utils.cmake
-+++ b/cmake/utils.cmake
-@@ -1,5 +1,3 @@
--include(${PROJECT_SOURCE_DIR}/third_party/onnx/cmake/Utils.cmake)
--
- # Poor man's FetchContent
- function(add_subdirectory_if_no_target dir target)
-   if (NOT TARGET ${target})
diff --git a/ports/onnx-optimizer/portfile.cmake b/ports/onnx-optimizer/portfile.cmake
index 8f8fc1f8505c98..10e8d7fe78ea60 100644
--- a/ports/onnx-optimizer/portfile.cmake
+++ b/ports/onnx-optimizer/portfile.cmake
@@ -4,11 +4,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onnx/optimizer
     REF "v${VERSION}"
-    SHA512 419aeaac60fa27f54708c864a2f907777aaa4de882725c83cade33053dec546ede6f95f7f133b50991e3b9b17e300c1a108729cad00ac99dc5ba5d2982b09737
+    SHA512 552d6fa261c3ce2db2e0938a5b5261676335bce9bd828b46a1e2631f3b362c748ae9a6cfe7d62072fc3774b3f506bc54aa5827b52241e6f48d78a08dea1d9316
     HEAD_REF master
     PATCHES
         fix-cmakelists.patch
-        remove-outdate-headers.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME)
diff --git a/ports/onnx-optimizer/remove-outdate-headers.patch b/ports/onnx-optimizer/remove-outdate-headers.patch
deleted file mode 100644
index ea1d3f6bf4e617..00000000000000
--- a/ports/onnx-optimizer/remove-outdate-headers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/onnxoptimizer/optimize.h b/onnxoptimizer/optimize.h
-index f25e6c3f..506e2554 100644
---- a/onnxoptimizer/optimize.h
-+++ b/onnxoptimizer/optimize.h
-@@ -9,7 +9,6 @@
- 
- #include "onnx/common/ir.h"
- #include "onnx/common/ir_pb_converter.h"
--#include "onnx/common/stl_backports.h"
- #include "onnx/proto_utils.h"
- 
- #include "onnxoptimizer/pass_manager.h"
-diff --git a/onnxoptimizer/pass_registry.h b/onnxoptimizer/pass_registry.h
-index 51a2c161..b8dc26f9 100644
---- a/onnxoptimizer/pass_registry.h
-+++ b/onnxoptimizer/pass_registry.h
-@@ -12,7 +12,6 @@
- 
- #include "onnx/common/ir.h"
- #include "onnx/common/ir_pb_converter.h"
--#include "onnx/common/stl_backports.h"
- #include "onnx/proto_utils.h"
- #include "onnxoptimizer/passes/adjust_add.h"
- #include "onnxoptimizer/passes/adjust_slice_and_matmul.h"
diff --git a/ports/onnx-optimizer/vcpkg.json b/ports/onnx-optimizer/vcpkg.json
index 3dfc675137b75e..9ca4a5e77a2a0f 100644
--- a/ports/onnx-optimizer/vcpkg.json
+++ b/ports/onnx-optimizer/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "onnx-optimizer",
-  "version-semver": "0.3.18",
+  "version-semver": "0.3.19",
   "description": "Actively maintained ONNX Optimizer",
   "homepage": "https://github.com/onnx/optimizer",
   "license": "Apache-2.0",

From 6998e04b4b50acf445d0ec5bfdf701cd1fe0e10d Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Fri, 20 Sep 2024 03:54:16 -0700
Subject: [PATCH 04/21] update version

---
 versions/baseline.json          | 2 +-
 versions/o-/onnx-optimizer.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index e7152f062b9b5b..358391cf08b0ee 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6525,7 +6525,7 @@
       "port-version": 0
     },
     "onnx-optimizer": {
-      "baseline": "0.3.18",
+      "baseline": "0.3.19",
       "port-version": 0
     },
     "onnxruntime-gpu": {
diff --git a/versions/o-/onnx-optimizer.json b/versions/o-/onnx-optimizer.json
index 8833f7dc14c161..6d7470399d5004 100644
--- a/versions/o-/onnx-optimizer.json
+++ b/versions/o-/onnx-optimizer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a386f3d68e29c50a6e31bc521f6b9b0b4ec63c75",
+      "version-semver": "0.3.19",
+      "port-version": 0
+    },
     {
       "git-tree": "e574f424edd5d2fd9ca36c5058f96163d9018725",
       "version-semver": "0.3.18",

From 06919140f1fc7203bb75fc0d05cc44f21e616143 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Fri, 20 Sep 2024 03:56:09 -0700
Subject: [PATCH 05/21] fix-cmakelists.patch

---
 ports/onnx-optimizer/fix-cmakelists.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/onnx-optimizer/fix-cmakelists.patch b/ports/onnx-optimizer/fix-cmakelists.patch
index d4826f0803016e..bcfd18a739d92e 100644
--- a/ports/onnx-optimizer/fix-cmakelists.patch
+++ b/ports/onnx-optimizer/fix-cmakelists.patch
@@ -72,3 +72,13 @@ index 0063385..f1522bc 100644
      target_compile_options(onnx_opt_cpp2py_export
                             PRIVATE /MP
                                     /WX
+diff --git a/cmake/utils.cmake b/cmake/utils.cmake
+index 6cca9f3..9d79f1a 100644
+--- a/cmake/utils.cmake
++++ b/cmake/utils.cmake
+@@ -1,5 +1,3 @@
+-include(${PROJECT_SOURCE_DIR}/third_party/onnx/cmake/Utils.cmake)
+-
+ # Poor man's FetchContent
+ function(add_subdirectory_if_no_target dir target)
+   if (NOT TARGET ${target})

From fe2390a3f362a381fab166e71ef5c1e1853ca865 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Fri, 20 Sep 2024 03:56:37 -0700
Subject: [PATCH 06/21] update git-tree

---
 versions/o-/onnx-optimizer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/onnx-optimizer.json b/versions/o-/onnx-optimizer.json
index 6d7470399d5004..770ed513fca771 100644
--- a/versions/o-/onnx-optimizer.json
+++ b/versions/o-/onnx-optimizer.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a386f3d68e29c50a6e31bc521f6b9b0b4ec63c75",
+      "git-tree": "767477d6bc309f0bc0a0d816baf69485ce285862",
       "version-semver": "0.3.19",
       "port-version": 0
     },

From 72d38f63909756ce37b94481161fac9d63899f4d Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Tue, 24 Sep 2024 23:01:18 -0700
Subject: [PATCH 07/21] fix dependency onnx

---
 ports/openvino/002-fix-onnx-codegen.patch | 26 +++++++++++++++++++++++
 ports/openvino/vcpkg.json                 |  1 +
 2 files changed, 27 insertions(+)

diff --git a/ports/openvino/002-fix-onnx-codegen.patch b/ports/openvino/002-fix-onnx-codegen.patch
index 361f7195d4028e..e92b177ed2ad2e 100644
--- a/ports/openvino/002-fix-onnx-codegen.patch
+++ b/ports/openvino/002-fix-onnx-codegen.patch
@@ -11,3 +11,29 @@ index 0ceeec8f7606a3..80fd16e2ed6483 100644
      file(WRITE ${static_reg_file} "// Copyright (C) 2018-2024 Intel Corporation\n// SPDX-License-Identifier: Apache-2.0\n// Auto generated file, DO NOT EDIT INLINE\n\n")
      file(APPEND ${static_reg_file} "#include \"core/operator_set.hpp\"\n\n")
      file(APPEND ${static_reg_file} "#define ONNX_DECL_OP(op) extern ov::OutputVector op(const Node&)\n\n")
+diff --git a/src/frontends/onnx/onnx_common/CMakeLists.txt b/src/frontends/onnx/onnx_common/CMakeLists.txt
+index d63bce4..116a6e3 100644
+--- a/src/frontends/onnx/onnx_common/CMakeLists.txt
++++ b/src/frontends/onnx/onnx_common/CMakeLists.txt
+@@ -30,7 +30,7 @@ target_include_directories(${TARGET_NAME}
+ 
+ target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime openvino::util)
+ 
+-ov_link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx)
++ov_link_system_libraries(${TARGET_NAME} PUBLIC ONNX::onnx ONNX::onnx_proto)
+ 
+ ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
+ 
+diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake
+index 24c4940..8ea7d12 100644
+--- a/thirdparty/dependencies.cmake
++++ b/thirdparty/dependencies.cmake
+@@ -479,7 +479,7 @@ endif()
+ #
+ 
+ if(ENABLE_OV_ONNX_FRONTEND)
+-    find_package(ONNX 1.15.0 QUIET COMPONENTS onnx onnx_proto NO_MODULE)
++    find_package(ONNX CONFIG REQUIRED)
+ 
+     if(ONNX_FOUND)
+         # conan and vcpkg create imported targets 'onnx' and 'onnx_proto'
diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json
index 2bac2cacb58d85..827969d2e1af41 100644
--- a/ports/openvino/vcpkg.json
+++ b/ports/openvino/vcpkg.json
@@ -2,6 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "openvino",
   "version": "2024.3.0",
+  "port-version": 1,
   "maintainers": "OpenVINO Developers <openvino@intel.com>",
   "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
   "description": [

From 466c38cd3165f2e14ae1a4e692ed5e01a0e32d35 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Tue, 24 Sep 2024 23:03:16 -0700
Subject: [PATCH 08/21] update version

---
 versions/baseline.json    | 2 +-
 versions/o-/openvino.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 358391cf08b0ee..df8ed714f40b48 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6718,7 +6718,7 @@
     },
     "openvino": {
       "baseline": "2024.3.0",
-      "port-version": 0
+      "port-version": 1
     },
     "openvpn3": {
       "baseline": "3.10",
diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json
index 980a036bb460d5..76918a46d3c8d4 100644
--- a/versions/o-/openvino.json
+++ b/versions/o-/openvino.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "492a8220c231fc4e4a6ca47801d8e02b81192dbe",
+      "version": "2024.3.0",
+      "port-version": 1
+    },
     {
       "git-tree": "6cef527510309fcb267a5c81c12e106fa4ae5064",
       "version": "2024.3.0",

From a33c9936ca2ea998877b1497efb6260c9bb6dc36 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Tue, 24 Sep 2024 23:04:04 -0700
Subject: [PATCH 09/21] update to 1.16.2

---
 ports/onnx/portfile.cmake | 2 +-
 ports/onnx/vcpkg.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake
index 41fe90ec4efe77..9cab0c6f3d6bc9 100644
--- a/ports/onnx/portfile.cmake
+++ b/ports/onnx/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onnx/onnx
     REF "v${VERSION}"
-    SHA512 0ae1b36563ddeaa9947bf452eb20b83174e4c2bc4696b61768f096c401666323343fac0f699f756da99d3c29df15a0bd78fe3fa51da15f133617d7310c5b28d4
+    SHA512 7a9a8493b9c007429629484156487395044506f34e72253640e626351cb623b390750b36af78a290786131e3dcac35f4eb269e8693b594b7ce7cb105bcf9318d
     PATCHES
         fix-cmakelists.patch
         fix-dependency-protobuf.patch
diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json
index f27c32bc2b0175..f2386a485f4918 100644
--- a/ports/onnx/vcpkg.json
+++ b/ports/onnx/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "onnx",
-  "version-semver": "1.16.1",
+  "version-semver": "1.16.2",
   "description": "Open standard for machine learning interoperability",
   "homepage": "https://onnx.ai",
   "license": "Apache-2.0",

From 47138f72d6645bb4f76659e1411be5f2c01c8ef6 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Tue, 24 Sep 2024 23:04:49 -0700
Subject: [PATCH 10/21] update version

---
 versions/baseline.json | 2 +-
 versions/o-/onnx.json  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index df8ed714f40b48..ad483b4165094b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6521,7 +6521,7 @@
       "port-version": 1
     },
     "onnx": {
-      "baseline": "1.16.1",
+      "baseline": "1.16.2",
       "port-version": 0
     },
     "onnx-optimizer": {
diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json
index 58a419262562f6..0abcbd8412c68f 100644
--- a/versions/o-/onnx.json
+++ b/versions/o-/onnx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "57d8f77c2964232239ba10b3f2ebf16698486d9a",
+      "version-semver": "1.16.2",
+      "port-version": 0
+    },
     {
       "git-tree": "e65e33affe141144d0ef0e1336841e268af0e72c",
       "version-semver": "1.16.1",

From 2b8b422cefbd7eb1d55d42510b83086de9eedea6 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Thu, 26 Sep 2024 02:36:43 -0700
Subject: [PATCH 11/21] fix dependency onnx

---
 ports/libtorch/cmake-fixes.patch | 78 ++++++++++++++++++++------------
 ports/libtorch/fix-build.patch   | 28 ------------
 ports/libtorch/more-fixes.patch  | 31 -------------
 ports/libtorch/vcpkg.json        |  2 +-
 4 files changed, 50 insertions(+), 89 deletions(-)

diff --git a/ports/libtorch/cmake-fixes.patch b/ports/libtorch/cmake-fixes.patch
index 69fa3b986f919d..10a0e87bdb44c5 100644
--- a/ports/libtorch/cmake-fixes.patch
+++ b/ports/libtorch/cmake-fixes.patch
@@ -40,7 +40,7 @@ index feebad7..ad407e1 100644
  
  if(ANDROID)
 diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index c3abce5..cfaf83e 100644
+index c3abce5..971c651 100644
 --- a/cmake/Dependencies.cmake
 +++ b/cmake/Dependencies.cmake
 @@ -285,7 +285,7 @@ endif()
@@ -53,7 +53,7 @@ index c3abce5..cfaf83e 100644
      find_path(FFTW3_INCLUDE_DIR NAMES fftw3.h ONLY_CMAKE_FIND_ROOT_PATH)
      if(FFTW3_INCLUDE_DIR)
 @@ -415,8 +415,8 @@ if(INTERN_BUILD_MOBILE OR NOT DISABLE_NNPACK_AND_FAMILY)
- 
+
    if(NOT TARGET pthreadpool)
      if(USE_SYSTEM_PTHREADPOOL)
 -      add_library(pthreadpool SHARED IMPORTED)
@@ -64,7 +64,7 @@ index c3abce5..cfaf83e 100644
        if(NOT PTHREADPOOL_LIBRARY)
          message(FATAL_ERROR "Cannot find pthreadpool")
 @@ -450,13 +450,15 @@ endif()
- 
+
  # ---[ Caffe2 uses cpuinfo library in the thread pool
  if(NOT TARGET cpuinfo AND USE_SYSTEM_CPUINFO)
 -  add_library(cpuinfo SHARED IMPORTED)
@@ -93,7 +93,7 @@ index c3abce5..cfaf83e 100644
    if(NOT XNNPACK_LIBRARY)
      message(FATAL_ERROR "Cannot find XNNPACK")
 @@ -858,7 +860,7 @@ endif()
- 
+
  # ---[ LMDB
  if(USE_LMDB)
 -  find_package(LMDB)
@@ -112,19 +112,37 @@ index c3abce5..cfaf83e 100644
 +  target_include_directories(fp16 INTERFACE "${FP16_INCLUDE_DIR}")
  endif()
  list(APPEND Caffe2_DEPENDENCY_LIBS fp16)
- 
-@@ -1244,8 +1247,8 @@ endif(USE_LLVM)
- 
+
+@@ -1127,7 +1130,7 @@ if(BUILD_PYTHON)
+     # Observers are required in the python build
+     caffe2_update_option(USE_OBSERVERS ON)
+   else()
+-    message(WARNING "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF")
++    message(FATAL_ERROR "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF")
+     caffe2_update_option(BUILD_PYTHON OFF)
+   endif()
+ endif()
+@@ -1231,7 +1234,7 @@ endif()
+ # ---[ LLVM
+ if(USE_LLVM)
+   message(STATUS "Looking for LLVM in ${USE_LLVM}")
+-  find_package(LLVM PATHS ${USE_LLVM} NO_DEFAULT_PATH)
++  find_package(LLVM)
+
+   if(LLVM_FOUND)
+     message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+@@ -1244,8 +1247,10 @@ endif(USE_LLVM)
+
  # ---[ cuDNN
  if(USE_CUDNN)
--  set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include)
--  target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR})
 +  find_package(CUDNN REQUIRED)
+   set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include)
+   target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR})
 +  target_include_directories(torch::cudnn INTERFACE "${CUDNN_INCLUDE_DIR}")
  endif()
- 
+
  # ---[ HIP
-@@ -1555,7 +1558,10 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+@@ -1555,7 +1560,10 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
        set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17)
      endif()
    endif()
@@ -133,30 +151,32 @@ index c3abce5..cfaf83e 100644
 +  # setup foxi
 +  find_library(FOXI_LOADER_LIBPATH NAMES foxi_loader REQUIRED)
 +  list(APPEND Caffe2_DEPENDENCY_LIBS "${FOXI_LOADER_LIBPATH}")
- 
+
    add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE})
    if(NOT USE_SYSTEM_ONNX)
-@@ -1573,14 +1579,14 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+@@ -1573,23 +1581,14 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
        target_compile_options(onnx PRIVATE -Wno-deprecated-declarations)
      endif()
    else()
 -    add_library(onnx SHARED IMPORTED)
 -    find_library(ONNX_LIBRARY onnx)
-+    add_library(onnx UNKNOWN IMPORTED)
-+    find_library(ONNX_LIBRARY NAMES onnx REQUIRED)
-     if(NOT ONNX_LIBRARY)
-       message(FATAL_ERROR "Cannot find onnx")
-     endif()
-     set_property(TARGET onnx PROPERTY IMPORTED_LOCATION ${ONNX_LIBRARY})
+-    if(NOT ONNX_LIBRARY)
+-      message(FATAL_ERROR "Cannot find onnx")
+-    endif()
+-    set_property(TARGET onnx PROPERTY IMPORTED_LOCATION ${ONNX_LIBRARY})
 -    add_library(onnx_proto SHARED IMPORTED)
 -    find_library(ONNX_PROTO_LIBRARY onnx_proto)
-+    add_library(onnx_proto UNKNOWN IMPORTED)
-+    find_library(ONNX_PROTO_LIBRARY NAMES onnx_proto REQUIRED)
-     if(NOT ONNX_PROTO_LIBRARY)
-       message(FATAL_ERROR "Cannot find onnx")
-     endif()
-@@ -1589,7 +1595,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
-     list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx)
+-    if(NOT ONNX_PROTO_LIBRARY)
+-      message(FATAL_ERROR "Cannot find onnx")
+-    endif()
+-    set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY})
+-    message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}")
+-    list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx)
++    find_package(ONNX CONFIG REQUIRED)
++    set(ONNX_LIBRARY ONNX::onnx)
++    set(ONNX_PROTO_LIBRARY ONNX::onnx_proto)
++    message("-- Found onnx")
++    list(APPEND Caffe2_DEPENDENCY_LIBS ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY})
    endif()
    include_directories(${FOXI_INCLUDE_DIRS})
 -  list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader)
@@ -164,7 +184,7 @@ index c3abce5..cfaf83e 100644
    # Recover the build shared libs option.
    set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS})
  endif()
-@@ -1834,8 +1840,8 @@ endif()
+@@ -1834,8 +1833,8 @@ endif()
  #
  set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
  set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
@@ -175,12 +195,12 @@ index c3abce5..cfaf83e 100644
  # Disable compiler feature checks for `fmt`.
  #
  # CMake compiles a little program to check compiler features. Some of our build
-@@ -1843,7 +1849,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
+@@ -1843,7 +1842,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
  # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
  # `fmt` is compatible with a superset of the compilers that PyTorch is, it
  # shouldn't be too bad to just disable the checks.
 -set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "")
- 
+
  list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
  set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
 diff --git a/cmake/Modules/FindLMDB.cmake b/cmake/Modules/FindLMDB.cmake
diff --git a/ports/libtorch/fix-build.patch b/ports/libtorch/fix-build.patch
index c29ccb8e9f3994..d2bf943e79fe70 100644
--- a/ports/libtorch/fix-build.patch
+++ b/ports/libtorch/fix-build.patch
@@ -29,34 +29,6 @@ index ecbc7c1..2dd1001 100644
  namespace c10 {
  
  /// The primary ATen error class.
-diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index b46a444..255d7f4 100644
---- a/cmake/Dependencies.cmake
-+++ b/cmake/Dependencies.cmake
-@@ -1581,19 +1581,10 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
-       target_compile_options(onnx PRIVATE -Wno-deprecated-declarations)
-     endif()
-   else()
--    add_library(onnx UNKNOWN IMPORTED)
--    find_library(ONNX_LIBRARY NAMES onnx REQUIRED)
--    if(NOT ONNX_LIBRARY)
--      message(FATAL_ERROR "Cannot find onnx")
--    endif()
--    set_property(TARGET onnx PROPERTY IMPORTED_LOCATION ${ONNX_LIBRARY})
--    add_library(onnx_proto UNKNOWN IMPORTED)
--    find_library(ONNX_PROTO_LIBRARY NAMES onnx_proto REQUIRED)
--    if(NOT ONNX_PROTO_LIBRARY)
--      message(FATAL_ERROR "Cannot find onnx")
--    endif()
--    set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY})
--    message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}")
-+    find_package(ONNX REQUIRED)
-+    set(ONNX_LIBRARY onnx)
-+    set(ONNX_PROTO_LIBRARY onnx_proto)
-+    message("-- Found onnx")
-     list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx)
-   endif()
-   include_directories(${FOXI_INCLUDE_DIRS})
 diff --git a/pyproject.toml b/pyproject.toml
 index eb764cb..c70f317 100644
 --- a/pyproject.toml
diff --git a/ports/libtorch/more-fixes.patch b/ports/libtorch/more-fixes.patch
index a2d721025b9788..84400781f71e14 100644
--- a/ports/libtorch/more-fixes.patch
+++ b/ports/libtorch/more-fixes.patch
@@ -164,37 +164,6 @@ index 74d0d55..cf349c2 100644
  endif()
  
  # ---[ Caffe2 HIP sources.
-diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index cfaf83e..b46a444 100644
---- a/cmake/Dependencies.cmake
-+++ b/cmake/Dependencies.cmake
-@@ -1130,7 +1130,7 @@ if(BUILD_PYTHON)
-     # Observers are required in the python build
-     caffe2_update_option(USE_OBSERVERS ON)
-   else()
--    message(WARNING "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF")
-+    message(FATAL_ERROR "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF")
-     caffe2_update_option(BUILD_PYTHON OFF)
-   endif()
- endif()
-@@ -1234,7 +1234,7 @@ endif()
- # ---[ LLVM
- if(USE_LLVM)
-   message(STATUS "Looking for LLVM in ${USE_LLVM}")
--  find_package(LLVM PATHS ${USE_LLVM} NO_DEFAULT_PATH)
-+  find_package(LLVM)
- 
-   if(LLVM_FOUND)
-     message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-@@ -1248,6 +1248,8 @@ endif(USE_LLVM)
- # ---[ cuDNN
- if(USE_CUDNN)
-   find_package(CUDNN REQUIRED)
-+  set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include)
-+  target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR})
-   target_include_directories(torch::cudnn INTERFACE "${CUDNN_INCLUDE_DIR}")
- endif()
- 
 diff --git a/cmake/Modules/FindCUSPARSELT.cmake b/cmake/Modules/FindCUSPARSELT.cmake
 index 8727f44..1e41281 100644
 --- a/cmake/Modules/FindCUSPARSELT.cmake
diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json
index 7f6920cff59eb7..c8c639f2ad4831 100644
--- a/ports/libtorch/vcpkg.json
+++ b/ports/libtorch/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libtorch",
   "version": "2.1.2",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration",
   "homepage": "https://pytorch.org/",
   "license": null,

From 2143cc67fbf3c39e75779687a40305caabb5a195 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Thu, 26 Sep 2024 02:40:12 -0700
Subject: [PATCH 12/21] update version

---
 versions/baseline.json    | 2 +-
 versions/l-/libtorch.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index ad483b4165094b..e0b50ed4093fc5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5170,7 +5170,7 @@
     },
     "libtorch": {
       "baseline": "2.1.2",
-      "port-version": 6
+      "port-version": 7
     },
     "libtorrent": {
       "baseline": "2.0.10",
diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json
index d9d120d0db3d46..12820c3bd6f383 100644
--- a/versions/l-/libtorch.json
+++ b/versions/l-/libtorch.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6fa6c479134e4efd88c934e92264ee09bb8d3064",
+      "version": "2.1.2",
+      "port-version": 7
+    },
     {
       "git-tree": "12485495c895b105a0b0a35558edce15579a5a98",
       "version": "2.1.2",

From 6c35e65e8fb447d49d6e6db09036bf7cd4c5a05b Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Thu, 26 Sep 2024 23:18:29 -0700
Subject: [PATCH 13/21] fix feature pybind11

---
 ports/onnx/fix-pybind11.patch | 14 ++++++++++++++
 ports/onnx/portfile.cmake     |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 ports/onnx/fix-pybind11.patch

diff --git a/ports/onnx/fix-pybind11.patch b/ports/onnx/fix-pybind11.patch
new file mode 100644
index 00000000000000..b12c9488c4e93c
--- /dev/null
+++ b/ports/onnx/fix-pybind11.patch
@@ -0,0 +1,14 @@
+diff --git a/tools/protoc-gen-mypy.py b/tools/protoc-gen-mypy.py
+index 5288d13..ebb34c4 100644
+--- a/tools/protoc-gen-mypy.py
++++ b/tools/protoc-gen-mypy.py
+@@ -28,7 +28,8 @@ try:
+     import google.protobuf.descriptor_pb2 as d_typed
+     from google.protobuf.compiler import plugin_pb2 as plugin
+ except ImportError as e:
+-    raise RuntimeError("Failed to generate mypy stubs") from e
++    sys.stderr.write(f"Failed to generate mypy stubs: {e}\n")
++    sys.exit(0)
+ 
+ 
+ # Hax to get around fact that google protobuf libraries aren't in typeshed yet
diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake
index 9cab0c6f3d6bc9..5b2a8c71ff23f7 100644
--- a/ports/onnx/portfile.cmake
+++ b/ports/onnx/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     PATCHES
         fix-cmakelists.patch
         fix-dependency-protobuf.patch
+        fix-pybind11.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME)

From 47fd86fe98c2b69d20d994cda5b68c629ce13191 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Thu, 26 Sep 2024 23:27:34 -0700
Subject: [PATCH 14/21] update git-tree

---
 versions/o-/onnx.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json
index 0abcbd8412c68f..0e032843fadef3 100644
--- a/versions/o-/onnx.json
+++ b/versions/o-/onnx.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "57d8f77c2964232239ba10b3f2ebf16698486d9a",
+      "git-tree": "24f334220b72826998295c19120a46fa87e8660c",
       "version-semver": "1.16.2",
       "port-version": 0
     },

From 47ae84d25bff0642ea78f31fac84943cbc751c11 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Fri, 27 Sep 2024 00:27:55 -0700
Subject: [PATCH 15/21] fix onnx-optimizer

---
 ports/onnx-optimizer/fix-cmakelists.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ports/onnx-optimizer/fix-cmakelists.patch b/ports/onnx-optimizer/fix-cmakelists.patch
index bcfd18a739d92e..e590b400f8d9a7 100644
--- a/ports/onnx-optimizer/fix-cmakelists.patch
+++ b/ports/onnx-optimizer/fix-cmakelists.patch
@@ -82,3 +82,17 @@ index 6cca9f3..9d79f1a 100644
  # Poor man's FetchContent
  function(add_subdirectory_if_no_target dir target)
    if (NOT TARGET ${target})
+diff --git a/cmake/ONNXOptimizerConfig.cmake.in b/cmake/ONNXOptimizerConfig.cmake.in
+index 72dcc88..c5639c8 100644
+--- a/cmake/ONNXOptimizerConfig.cmake.in
++++ b/cmake/ONNXOptimizerConfig.cmake.in
+@@ -3,6 +3,9 @@
+ #   ONNX_OPTIMIZER_INCLUDE_DIRS     - include directories for onnx optimizer
+ # as well as ONNX Optimizer targets for other cmake libraries to use.
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(onnx CONFIG)
++
+ # library version information
+ set(ONNX_OPTIMIZER_VERSION "@ONNX_OPTIMIZER_VERSION@")
+ 

From 6a850145a90d5ac1811cb3f2cf72c2eef2139b2a Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Fri, 27 Sep 2024 00:28:50 -0700
Subject: [PATCH 16/21] update git-tree

---
 versions/o-/onnx-optimizer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/onnx-optimizer.json b/versions/o-/onnx-optimizer.json
index 770ed513fca771..21ff564b1714cc 100644
--- a/versions/o-/onnx-optimizer.json
+++ b/versions/o-/onnx-optimizer.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "767477d6bc309f0bc0a0d816baf69485ce285862",
+      "git-tree": "126bfc519dc0c50fc52ed0b19a0bd88663bae87f",
       "version-semver": "0.3.19",
       "port-version": 0
     },

From f9802fcc01098bb3c83ec11d3aa4d3cafa4848d2 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Sat, 28 Sep 2024 19:51:56 -0700
Subject: [PATCH 17/21] format

---
 versions/o-/onnx.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json
index 0e032843fadef3..61271004418440 100644
--- a/versions/o-/onnx.json
+++ b/versions/o-/onnx.json
@@ -5,11 +5,6 @@
       "version-semver": "1.16.2",
       "port-version": 0
     },
-    {
-      "git-tree": "e65e33affe141144d0ef0e1336841e268af0e72c",
-      "version-semver": "1.16.1",
-      "port-version": 0
-    },
     {
       "git-tree": "69ad297b15bb801f74d50be6e5d290eab7573be4",
       "version-semver": "1.15.0",

From 0e3d1dcce55c8dffe249d6fcd085ea3d4b3b3779 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Tue, 8 Oct 2024 03:23:46 -0700
Subject: [PATCH 18/21] resolve conflict

---
 ...-onnx-codegen.patch => 002-fix-onnx.patch} | 13 ------
 ports/openvino/portfile.cmake                 | 40 ++++++++-----------
 ports/openvino/usage                          |  6 ---
 ports/openvino/vcpkg.json                     |  4 +-
 versions/baseline.json                        |  4 +-
 versions/o-/openvino.json                     |  6 +--
 6 files changed, 23 insertions(+), 50 deletions(-)
 rename ports/openvino/{002-fix-onnx-codegen.patch => 002-fix-onnx.patch} (56%)

diff --git a/ports/openvino/002-fix-onnx-codegen.patch b/ports/openvino/002-fix-onnx.patch
similarity index 56%
rename from ports/openvino/002-fix-onnx-codegen.patch
rename to ports/openvino/002-fix-onnx.patch
index e92b177ed2ad2e..7fdbc006a6f0f8 100644
--- a/ports/openvino/002-fix-onnx-codegen.patch
+++ b/ports/openvino/002-fix-onnx.patch
@@ -1,16 +1,3 @@
-diff --git a/src/frontends/onnx/frontend/CMakeLists.txt b/src/frontends/onnx/frontend/CMakeLists.txt
-index 0ceeec8f7606a3..80fd16e2ed6483 100644
---- a/src/frontends/onnx/frontend/CMakeLists.txt
-+++ b/src/frontends/onnx/frontend/CMakeLists.txt
-@@ -4,7 +4,7 @@
- 
- if(NOT BUILD_SHARED_LIBS)
-     file(GLOB_RECURSE op_list "src/op/*.cpp")
--    set(static_reg_file "src/static_reg.hpp")
-+    set(static_reg_file ${CMAKE_CURRENT_BINARY_DIR}/static_reg.hpp)
-     file(WRITE ${static_reg_file} "// Copyright (C) 2018-2024 Intel Corporation\n// SPDX-License-Identifier: Apache-2.0\n// Auto generated file, DO NOT EDIT INLINE\n\n")
-     file(APPEND ${static_reg_file} "#include \"core/operator_set.hpp\"\n\n")
-     file(APPEND ${static_reg_file} "#define ONNX_DECL_OP(op) extern ov::OutputVector op(const Node&)\n\n")
 diff --git a/src/frontends/onnx/onnx_common/CMakeLists.txt b/src/frontends/onnx/onnx_common/CMakeLists.txt
 index d63bce4..116a6e3 100644
 --- a/src/frontends/onnx/onnx_common/CMakeLists.txt
diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake
index f9fff1490826f9..1ca95d575ab521 100644
--- a/ports/openvino/portfile.cmake
+++ b/ports/openvino/portfile.cmake
@@ -2,13 +2,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openvinotoolkit/openvino
     REF "${VERSION}"
-    SHA512 25ec2bb4c087f58033681920b027d43b1778b60042e3bee358b54c83b0296ac0b754880db6bd4fce94fefe8b53d129ff3ec51f17bcb42f4b7adcdc532701f801
+    SHA512 2bf3f00589d825b7f4ca40d43129d81af4ba62382f98b283a3a206e7661a7a69f178c6afafdde646db8d68cb7fc54ec5280d2f4ff4fbbffe24082cf6649dda29
     PATCHES
         # vcpkg specific patch, because OV creates a file in source tree, which is prohibited
         001-disable-tools.patch
-        # https://github.com/openvinotoolkit/openvino/pull/25937
-        # onnx codegen cmake script taints source directory
-        002-fix-onnx-codegen.patch
+        002-fix-onnx.patch
     HEAD_REF master)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -34,20 +32,13 @@ if(ENABLE_INTEL_GPU)
     # remove 'rapidjson' directory and use vcpkg's one to comply with ODR
     file(REMOVE_RECURSE ${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/rapidjson)
 
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND ENABLE_INTEL_CPU)
-        message(WARNING
-            "OneDNN for GPU is not available for static build, which is required for dGPU. "
-            "Please, consider using VCPKG_LIBRARY_LINKAGE=\"dynamic\" or disable CPU plugin, "
-            "which uses another flavor of oneDNN.")
-    else()
-        vcpkg_from_github(
-            OUT_SOURCE_PATH DEP_SOURCE_PATH
-            REPO oneapi-src/oneDNN
-            REF 7ab8ee9adda866d675edeee7a3a6a29b2d0a1572
-            SHA512 03d0adab0cbb8b2841bd5de73a21911d63314f0a6299590e2396f42ca66673743c32ef1ec72e856cdac863802632b1e9a065bfffd75659e2007db581e1052e89
-        )
-        file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
-    endif()
+    vcpkg_from_github(
+        OUT_SOURCE_PATH DEP_SOURCE_PATH
+        REPO oneapi-src/oneDNN
+        REF 4ccd07e3a10e1c08075cf824ac14708245fbc334
+        SHA512 c9a28f8427b5cd9c057a546b0b62303026f848045b26e0c9705e2f64d5bc84424ee15935d3bf5ee120d3c430a9dd41b7a6e26ef4fc0c53a2154ce83fcaee8b5a
+    )
+    file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
 
     list(APPEND FEATURE_OPTIONS
         "-DENABLE_SYSTEM_OPENCL=ON"
@@ -58,8 +49,8 @@ if(ENABLE_INTEL_CPU)
     vcpkg_from_github(
         OUT_SOURCE_PATH DEP_SOURCE_PATH
         REPO openvinotoolkit/oneDNN
-        REF f0f8defe2dff5058391f2a66e775e20b5de33b08
-        SHA512 d52d1ea504bc3ae7cdd01f7fce80f28231827b3778acda232201ec90c119cb845c4b406ac639d63a8f05ccc91063fbf5f405ba36332c5f539531c01ce9443b5f
+        REF c8ae8d96e963bd04214858319fa334968e5e73c9
+        SHA512 6877ca37c3678e738fa94767b70432d3fff73305342164d0902875d9bcce3fe12abaf52bfc6ae0ef288532324e746b01e604ab7e47f198e7776352b8f5b6f009
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn")
 
@@ -85,19 +76,20 @@ if(ENABLE_INTEL_CPU)
         vcpkg_from_github(
             OUT_SOURCE_PATH DEP_SOURCE_PATH
             REPO ARM-software/ComputeLibrary
-            REF v24.06
-            SHA512 d020e4bb710534bb5789355f7396729a9230ce3ce8e0194df7e66750efe0667e38334e1e3696fa07496cf34de38ffcecd1ff6de266fb0e8d85f4f1c60ed9f782
+            REF v24.08
+            SHA512 82debaf8d8345b79b112afdabf6019c7ad8a9b30161d3061320a3da3040b2ad49153cc508caafe9fb1182c2669c958785acf2c361382080af273465d1727a71c
         )
         file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
     endif()
 endif()
 
 if(ENABLE_INTEL_NPU)
+    list(APPEND FEATURE_OPTIONS "-DENABLE_INTEL_NPU_INTERNAL=OFF")
     vcpkg_from_github(
         OUT_SOURCE_PATH DEP_SOURCE_PATH
         REPO oneapi-src/level-zero
-        REF 4ed13f327d3389285592edcf7598ec3cb2bc712e
-        SHA512 1159b2dc59ffe201821aa6c4c65c1803f8be26654a5f7e09d4e2cea70afdaf6a49508acbc74279d2d5c8fc7b632ad29b70ea506c442cd599d7db47323de9e62d
+        REF v1.17.6
+        SHA512 bb412e875d97d1c80a0e67087e6dac1a6ffb91fa50e22deb7649ee3250c0937679d225419b52bfd7938f71a66ac15742a6a215cee7714c27e0f935e04df5b88e
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero")
 
diff --git a/ports/openvino/usage b/ports/openvino/usage
index ede01545d213d5..27e68898dc2706 100644
--- a/ports/openvino/usage
+++ b/ports/openvino/usage
@@ -2,9 +2,3 @@ The package OpenVINO can be used in cmake scripts as:
 
     find_package(OpenVINO REQUIRED)
     target_link_libraries(main PRIVATE openvino::runtime)
-
-Note: static build of Intel GPU plugin disables usage of oneDNN for GPU, which is important
-for decent performance on discrete GPU devices. If you want to levarage performance of dGPU,
-please, consider either option:
-- Building with 'VCPKG_LIBRARY_LINKAGE=dynamic'
-- Disable Intel CPU plugin, because it uses different oneDNN flavor
diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json
index 827969d2e1af41..f43c76336cff7a 100644
--- a/ports/openvino/vcpkg.json
+++ b/ports/openvino/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "openvino",
-  "version": "2024.3.0",
+  "version": "2024.4.0",
   "port-version": 1,
   "maintainers": "OpenVINO Developers <openvino@intel.com>",
   "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
@@ -15,7 +15,7 @@
   "homepage": "https://github.com/openvinotoolkit/openvino",
   "documentation": "https://docs.openvino.ai/latest/index.html",
   "license": "Apache-2.0",
-  "supports": "!uwp & !x86",
+  "supports": "!uwp & !x86 & !(android & arm32)",
   "dependencies": [
     {
       "name": "pkgconf",
diff --git a/versions/baseline.json b/versions/baseline.json
index e0b50ed4093fc5..5f0f0b4bec9101 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6717,8 +6717,8 @@
       "port-version": 0
     },
     "openvino": {
-      "baseline": "2024.3.0",
-      "port-version": 1
+      "baseline": "2024.4.0",
+      "port-version": 0
     },
     "openvpn3": {
       "baseline": "3.10",
diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json
index 76918a46d3c8d4..cce2b4c1a73515 100644
--- a/versions/o-/openvino.json
+++ b/versions/o-/openvino.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "492a8220c231fc4e4a6ca47801d8e02b81192dbe",
-      "version": "2024.3.0",
-      "port-version": 1
+      "git-tree": "e65d1d305cc744e9ff5d96358695cbfe22deb8c3",
+      "version": "2024.4.0",
+      "port-version": 0
     },
     {
       "git-tree": "6cef527510309fcb267a5c81c12e106fa4ae5064",

From 8c970b5a4c49dde2c18be7e8666857e50bf30f2a Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Tue, 8 Oct 2024 03:25:47 -0700
Subject: [PATCH 19/21] update version

---
 versions/baseline.json    | 2 +-
 versions/o-/openvino.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 5f0f0b4bec9101..2f35b6c67a5ad4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6718,7 +6718,7 @@
     },
     "openvino": {
       "baseline": "2024.4.0",
-      "port-version": 0
+      "port-version": 1
     },
     "openvpn3": {
       "baseline": "3.10",
diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json
index cce2b4c1a73515..1798fe8704dc8e 100644
--- a/versions/o-/openvino.json
+++ b/versions/o-/openvino.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "668983aa79f507592885fa2ef91fb0dbd1e4a495",
+      "version": "2024.4.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e65d1d305cc744e9ff5d96358695cbfe22deb8c3",
       "version": "2024.4.0",

From e9794c26ce1e79183aa65e32d6091b1378d34139 Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Wed, 9 Oct 2024 20:04:42 -0700
Subject: [PATCH 20/21] fix cmake-fixes.patch

---
 ports/libtorch/cmake-fixes.patch | 27 +++++++++++++--------------
 ports/onnx/fix-pybind11.patch    | 14 --------------
 ports/onnx/portfile.cmake        |  1 -
 3 files changed, 13 insertions(+), 29 deletions(-)
 delete mode 100644 ports/onnx/fix-pybind11.patch

diff --git a/ports/libtorch/cmake-fixes.patch b/ports/libtorch/cmake-fixes.patch
index 10a0e87bdb44c5..8d618714ef1128 100644
--- a/ports/libtorch/cmake-fixes.patch
+++ b/ports/libtorch/cmake-fixes.patch
@@ -40,7 +40,7 @@ index feebad7..ad407e1 100644
  
  if(ANDROID)
 diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index c3abce5..971c651 100644
+index c3abce5..63f665f 100644
 --- a/cmake/Dependencies.cmake
 +++ b/cmake/Dependencies.cmake
 @@ -285,7 +285,7 @@ endif()
@@ -53,7 +53,7 @@ index c3abce5..971c651 100644
      find_path(FFTW3_INCLUDE_DIR NAMES fftw3.h ONLY_CMAKE_FIND_ROOT_PATH)
      if(FFTW3_INCLUDE_DIR)
 @@ -415,8 +415,8 @@ if(INTERN_BUILD_MOBILE OR NOT DISABLE_NNPACK_AND_FAMILY)
-
+ 
    if(NOT TARGET pthreadpool)
      if(USE_SYSTEM_PTHREADPOOL)
 -      add_library(pthreadpool SHARED IMPORTED)
@@ -64,7 +64,7 @@ index c3abce5..971c651 100644
        if(NOT PTHREADPOOL_LIBRARY)
          message(FATAL_ERROR "Cannot find pthreadpool")
 @@ -450,13 +450,15 @@ endif()
-
+ 
  # ---[ Caffe2 uses cpuinfo library in the thread pool
  if(NOT TARGET cpuinfo AND USE_SYSTEM_CPUINFO)
 -  add_library(cpuinfo SHARED IMPORTED)
@@ -93,7 +93,7 @@ index c3abce5..971c651 100644
    if(NOT XNNPACK_LIBRARY)
      message(FATAL_ERROR "Cannot find XNNPACK")
 @@ -858,7 +860,7 @@ endif()
-
+ 
  # ---[ LMDB
  if(USE_LMDB)
 -  find_package(LMDB)
@@ -112,7 +112,7 @@ index c3abce5..971c651 100644
 +  target_include_directories(fp16 INTERFACE "${FP16_INCLUDE_DIR}")
  endif()
  list(APPEND Caffe2_DEPENDENCY_LIBS fp16)
-
+ 
 @@ -1127,7 +1130,7 @@ if(BUILD_PYTHON)
      # Observers are required in the python build
      caffe2_update_option(USE_OBSERVERS ON)
@@ -128,11 +128,11 @@ index c3abce5..971c651 100644
    message(STATUS "Looking for LLVM in ${USE_LLVM}")
 -  find_package(LLVM PATHS ${USE_LLVM} NO_DEFAULT_PATH)
 +  find_package(LLVM)
-
+ 
    if(LLVM_FOUND)
      message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 @@ -1244,8 +1247,10 @@ endif(USE_LLVM)
-
+ 
  # ---[ cuDNN
  if(USE_CUDNN)
 +  find_package(CUDNN REQUIRED)
@@ -140,7 +140,7 @@ index c3abce5..971c651 100644
    target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR})
 +  target_include_directories(torch::cudnn INTERFACE "${CUDNN_INCLUDE_DIR}")
  endif()
-
+ 
  # ---[ HIP
 @@ -1555,7 +1560,10 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
        set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17)
@@ -151,10 +151,10 @@ index c3abce5..971c651 100644
 +  # setup foxi
 +  find_library(FOXI_LOADER_LIBPATH NAMES foxi_loader REQUIRED)
 +  list(APPEND Caffe2_DEPENDENCY_LIBS "${FOXI_LOADER_LIBPATH}")
-
+ 
    add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE})
    if(NOT USE_SYSTEM_ONNX)
-@@ -1573,23 +1581,14 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+@@ -1573,23 +1581,13 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
        target_compile_options(onnx PRIVATE -Wno-deprecated-declarations)
      endif()
    else()
@@ -175,7 +175,6 @@ index c3abce5..971c651 100644
 +    find_package(ONNX CONFIG REQUIRED)
 +    set(ONNX_LIBRARY ONNX::onnx)
 +    set(ONNX_PROTO_LIBRARY ONNX::onnx_proto)
-+    message("-- Found onnx")
 +    list(APPEND Caffe2_DEPENDENCY_LIBS ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY})
    endif()
    include_directories(${FOXI_INCLUDE_DIRS})
@@ -184,7 +183,7 @@ index c3abce5..971c651 100644
    # Recover the build shared libs option.
    set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS})
  endif()
-@@ -1834,8 +1833,8 @@ endif()
+@@ -1834,8 +1832,8 @@ endif()
  #
  set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
  set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
@@ -195,12 +194,12 @@ index c3abce5..971c651 100644
  # Disable compiler feature checks for `fmt`.
  #
  # CMake compiles a little program to check compiler features. Some of our build
-@@ -1843,7 +1842,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
+@@ -1843,7 +1841,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
  # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
  # `fmt` is compatible with a superset of the compilers that PyTorch is, it
  # shouldn't be too bad to just disable the checks.
 -set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "")
-
+ 
  list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
  set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
 diff --git a/cmake/Modules/FindLMDB.cmake b/cmake/Modules/FindLMDB.cmake
diff --git a/ports/onnx/fix-pybind11.patch b/ports/onnx/fix-pybind11.patch
deleted file mode 100644
index b12c9488c4e93c..00000000000000
--- a/ports/onnx/fix-pybind11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/tools/protoc-gen-mypy.py b/tools/protoc-gen-mypy.py
-index 5288d13..ebb34c4 100644
---- a/tools/protoc-gen-mypy.py
-+++ b/tools/protoc-gen-mypy.py
-@@ -28,7 +28,8 @@ try:
-     import google.protobuf.descriptor_pb2 as d_typed
-     from google.protobuf.compiler import plugin_pb2 as plugin
- except ImportError as e:
--    raise RuntimeError("Failed to generate mypy stubs") from e
-+    sys.stderr.write(f"Failed to generate mypy stubs: {e}\n")
-+    sys.exit(0)
- 
- 
- # Hax to get around fact that google protobuf libraries aren't in typeshed yet
diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake
index 5b2a8c71ff23f7..9cab0c6f3d6bc9 100644
--- a/ports/onnx/portfile.cmake
+++ b/ports/onnx/portfile.cmake
@@ -8,7 +8,6 @@ vcpkg_from_github(
     PATCHES
         fix-cmakelists.patch
         fix-dependency-protobuf.patch
-        fix-pybind11.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME)

From 83f8e8dd8d8b699acdbf3d66c78160044247b18b Mon Sep 17 00:00:00 2001
From: Monica <v-liumonica@microsoft.com>
Date: Wed, 9 Oct 2024 20:05:55 -0700
Subject: [PATCH 21/21] update git-tree

---
 versions/l-/libtorch.json | 2 +-
 versions/o-/onnx.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json
index 12820c3bd6f383..a2385e25f38450 100644
--- a/versions/l-/libtorch.json
+++ b/versions/l-/libtorch.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "6fa6c479134e4efd88c934e92264ee09bb8d3064",
+      "git-tree": "e738e2da09a82affc4bf4090d8c672579364231b",
       "version": "2.1.2",
       "port-version": 7
     },
diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json
index 61271004418440..5914427a3a7b4b 100644
--- a/versions/o-/onnx.json
+++ b/versions/o-/onnx.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "24f334220b72826998295c19120a46fa87e8660c",
+      "git-tree": "57d8f77c2964232239ba10b3f2ebf16698486d9a",
       "version-semver": "1.16.2",
       "port-version": 0
     },