From 4b4a3599433fa768cf8ffa42f6dd0bc8f66737d4 Mon Sep 17 00:00:00 2001
From: Pranav Sharma <emailpranav@gmail.com>
Date: Mon, 15 Apr 2019 15:57:19 -0700
Subject: [PATCH] Exclude unreferenced global data and op doc strings in the
 opschema object. The first causes a decrease in the binary size by at least
 85k. The latter reduces resident memory size. (#823)

* Exclude unreferenced global data and op doc strings in the opschema object. The first causes a decrease in the binary size by at least 85k. The latter reduces resident memory size.

* Update onnx to incorporate my PR that fixes SetDoc compiler warnings
---
 cgmanifest.json                                            | 2 +-
 cmake/CMakeLists.txt                                       | 4 ++--
 cmake/external/onnx                                        | 2 +-
 cmake/onnx/CMakeLists.txt                                  | 7 ++++++-
 tools/ci_build/github/linux/docker/scripts/install_deps.sh | 5 +++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index cbcc077f34..b269b2988f 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -49,7 +49,7 @@
          "component":{
             "type":"git",
             "git":{
-               "commitHash":"7a112a6f930aac375da5a38d744ccda93e37632c",
+               "commitHash":"a80c3371a6514bd11664249e59cae958f45b3b59",
                "repositoryUrl":"https://github.com/onnx/onnx.git"
             }
          }
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index bf6736f6b3..2d7a89cf30 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -148,8 +148,8 @@ if (MSVC)
   #Disable 4100 globally. Too many this kind errors in protobuf
   SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4100")
   if (NOT onnxruntime_USE_CUDA)
-    SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
-    SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /GL")
+    SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Gw /GL")
+    SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Gw /GL")
   endif()
   check_cxx_compiler_flag(-Qspectre HAS_QSPECTRE)
   if (HAS_QSPECTRE)
diff --git a/cmake/external/onnx b/cmake/external/onnx
index 7a112a6f93..a80c3371a6 160000
--- a/cmake/external/onnx
+++ b/cmake/external/onnx
@@ -1 +1 @@
-Subproject commit 7a112a6f930aac375da5a38d744ccda93e37632c
+Subproject commit a80c3371a6514bd11664249e59cae958f45b3b59
diff --git a/cmake/onnx/CMakeLists.txt b/cmake/onnx/CMakeLists.txt
index 53b6d7567f..414f899981 100644
--- a/cmake/onnx/CMakeLists.txt
+++ b/cmake/onnx/CMakeLists.txt
@@ -24,6 +24,11 @@ file(GLOB_RECURSE onnx_exclude_src
     "${ONNX_SOURCE_ROOT}/onnx/cpp2py_export.cc"
 )
 
+if (MSVC)
+  SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Gw /GL")
+  SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Gw /GL")
+endif()
+
 list(REMOVE_ITEM onnx_src ${onnx_exclude_src})
 add_library(onnx ${onnx_src})
 add_dependencies(onnx onnx_proto)
@@ -33,7 +38,7 @@ target_compile_definitions(onnx PUBLIC $<TARGET_PROPERTY:onnx_proto,INTERFACE_CO
 if (onnxruntime_USE_FULL_PROTOBUF)
   target_compile_definitions(onnx PUBLIC "ONNX_ML" "ONNX_NAMESPACE=onnx")
 else()
-  target_compile_definitions(onnx PUBLIC "ONNX_ML" "ONNX_NAMESPACE=onnx" "ONNX_USE_LITE_PROTO")
+  target_compile_definitions(onnx PUBLIC "ONNX_ML" "ONNX_NAMESPACE=onnx" "ONNX_USE_LITE_PROTO" "__ONNX_NO_DOC_STRINGS")
 endif()
 if (WIN32)
     target_compile_options(onnx PRIVATE
diff --git a/tools/ci_build/github/linux/docker/scripts/install_deps.sh b/tools/ci_build/github/linux/docker/scripts/install_deps.sh
index 62a18a8478..b38aeed4ef 100755
--- a/tools/ci_build/github/linux/docker/scripts/install_deps.sh
+++ b/tools/ci_build/github/linux/docker/scripts/install_deps.sh
@@ -38,8 +38,9 @@ else
   #5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3
   #bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0
   #9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1
-  #7a112a6f930aac375da5a38d744ccda93e37632c" is v1.4.1 latest
-  for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7a112a6f930aac375da5a38d744ccda93e37632c" ; do
+  #7a112a6f930aac375da5a38d744ccda93e37632c" is v1.4.1
+  #a80c3371a6514bd11664249e59cae958f45b3b59 latest  
+    for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7a112a6f930aac375da5a38d744ccda93e37632c" "a80c3371a6514bd11664249e59cae958f45b3b59"; do
     if [ -z ${lastest_onnx_version+x} ]; then
       echo "first pass";
     else