[onnx-optimizer] Fix compiler error in fuse_add_bias_into_conv.h (#48445)

ports/onnx-optimizer/fix-cmakelists.patch

@@ -2,17 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 0063385..f1522bc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -10,6 +10,15 @@ project(onnx_optimizer C CXX)
+@@ -10,6 +10,10 @@ project(onnx_optimizer C CXX)
  
  set(CMAKE_CXX_STANDARD 17)
  
-+# Add MSVC RunTime Flag
 +function(add_msvc_runtime_flag lib)
-+  if(${ONNX_USE_MSVC_STATIC_RUNTIME})
-+    target_compile_options(${lib} PRIVATE $<$<NOT:$<CONFIG:Debug>>:/MT> $<$<CONFIG:Debug>:/MTd>)    
-+  else()
-+    target_compile_options(${lib} PRIVATE $<$<NOT:$<CONFIG:Debug>>:/MD> $<$<CONFIG:Debug>:/MDd>)
-+  endif()
++    # Dummy function to mock embedded ONNX project build. Let CMake decide /MT, /MD, /MTd, /MDd, etc.
 +endfunction()
 +
  set(CMAKE_POSITION_INDEPENDENT_CODE ON)

ports/onnx-optimizer/fix-pr-201.patch

@@ -0,0 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5f2b5d6..0db568b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,7 @@ find_package(ONNX CONFIG REQUIRED)
+ file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION)
+ string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION)
+ 
+-file(GLOB onnx_opt_srcs "onnxoptimizer/*.cc"
++file(GLOB onnx_opt_srcs CONFIGURE_DEPENDS "onnxoptimizer/*.cc"
+     "onnxoptimizer/*.h"
+     "onnxoptimizer/passes/*.cc"
+     "onnxoptimizer/passes/*.h"
+@@ -58,7 +58,7 @@ onnxopt_add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp)
+ target_link_libraries(onnx_optimizer_exec onnx_optimizer)
+ 
+ 
+-file(GLOB onnx_opt_c_api_srcs "onnxoptimizer/c_api/*.cc"
++file(GLOB onnx_opt_c_api_srcs CONFIGURE_DEPENDS "onnxoptimizer/c_api/*.cc"
+   "onnxoptimizer/c_api/*.h"
+     )
+ 
+diff --git a/onnxoptimizer/pass_registry.h b/onnxoptimizer/pass_registry.h
+index b8dc26f..e8f0faa 100644
+--- a/onnxoptimizer/pass_registry.h
++++ b/onnxoptimizer/pass_registry.h
+@@ -9,6 +9,7 @@
+ 
+ #include <unordered_set>
+ #include <vector>
++#include <map>
+ 
+ #include "onnx/common/ir.h"
+ #include "onnx/common/ir_pb_converter.h"
+diff --git a/onnxoptimizer/passes/fuse_add_bias_into_conv.h b/onnxoptimizer/passes/fuse_add_bias_into_conv.h
+index b4696b5..dea0369 100644
+--- a/onnxoptimizer/passes/fuse_add_bias_into_conv.h
++++ b/onnxoptimizer/passes/fuse_add_bias_into_conv.h
+@@ -134,7 +134,7 @@ struct FuseAddBiasIntoConv final : public PredicateBasedPass {
+         t.elem_type() = TensorProto_DataType_INT64;
+         Symbol sym = Symbol("value");
+         constant->t_(sym, t);
+-        std::vector<Dimension> s = {1};
++        std::vector<Dimension> s{Dimension{1}};
+         constant->output()->setSizes(s);
+         constant->output()->setElemType(TensorProto_DataType_INT64);
+         constant->insertBefore(orig_conv->node());

ports/onnx-optimizer/portfile.cmake

@@ -7,18 +7,15 @@ vcpkg_from_github(
     SHA512 552d6fa261c3ce2db2e0938a5b5261676335bce9bd828b46a1e2631f3b362c748ae9a6cfe7d62072fc3774b3f506bc54aa5827b52241e6f48d78a08dea1d9316
     HEAD_REF master
     PATCHES
+        fix-pr-201.patch # https://github.com/onnx/optimizer/pull/201
         fix-cmakelists.patch
 )
 
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME)
-
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DONNX_OPT_USE_SYSTEM_PROTOBUF=ON
-        -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME}
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(PACKAGE_NAME ONNXOptimizer CONFIG_PATH lib/cmake/ONNXOptimizer)

ports/onnx-optimizer/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "onnx-optimizer",
   "version-semver": "0.3.19",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Actively maintained ONNX Optimizer",
   "homepage": "https://github.com/onnx/optimizer",
   "license": "Apache-2.0",

scripts/ci.feature.baseline.txt

@@ -1180,8 +1180,6 @@ ompl:arm64-uwp = cascade
 ompl:x64-uwp = cascade
 omplapp:arm64-uwp = cascade
 omplapp:x64-uwp = cascade
-onnx-optimizer:arm64-uwp = cascade
-onnx-optimizer:x64-uwp = cascade
 onnx-optimizer[pybind11]:arm64-windows = cascade
 onnx-optimizer[pybind11]:x64-linux = cascade
 onnx-optimizer[pybind11]:x64-windows-static = cascade

versions/baseline.json

@@ -7102,7 +7102,7 @@
     },
     "onnx-optimizer": {
       "baseline": "0.3.19",
-      "port-version": 1
+      "port-version": 2
     },
     "onnxruntime-gpu": {
       "baseline": "1.19.2",

versions/o-/onnx-optimizer.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "046da6d30651c088a30d19ea72e5494c14f30edb",
+      "version-semver": "0.3.19",
+      "port-version": 2
+    },
     {
       "git-tree": "df755dc18bda1d4c02a54db6cef63e46021ce872",
       "version-semver": "0.3.19",