From 2f16172e69becc58b01ecff4036ec2d551a55fa3 Mon Sep 17 00:00:00 2001
From: edgchen1 <18449977+edgchen1@users.noreply.github.com>
Date: Wed, 15 Apr 2020 15:51:52 -0700
Subject: [PATCH] Address PR comments and clean up. (#3536)

Address PR comments and clean up.
- https://github.com/microsoft/onnxruntime/pull/3174#discussion_r408549886
- https://github.com/microsoft/onnxruntime/pull/3174#discussion_r408551151
---
 cmake/horovod/CMakeLists.txt             | 7 ++-----
 cmake/onnxruntime_unittests.cmake        | 3 ++-
 onnxruntime/core/protobuf/onnx-ml.proto  | 2 ++
 onnxruntime/core/protobuf/onnx-ml.proto3 | 2 ++
 onnxruntime/core/protobuf/onnx.in.proto  | 2 ++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cmake/horovod/CMakeLists.txt b/cmake/horovod/CMakeLists.txt
index 528ca8c55e..fa8b835bda 100644
--- a/cmake/horovod/CMakeLists.txt
+++ b/cmake/horovod/CMakeLists.txt
@@ -1,8 +1,5 @@
-# Minimum CMake required
-
-cmake_minimum_required(VERSION 3.11)
-
-set(CMAKE_CXX_STANDARD 11)
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
 
 set(THIRD_PARTY_ROOT ${HOROVOD_ROOT}/third_party)
 
diff --git a/cmake/onnxruntime_unittests.cmake b/cmake/onnxruntime_unittests.cmake
index f2cdc08ff2..f8249eaf32 100644
--- a/cmake/onnxruntime_unittests.cmake
+++ b/cmake/onnxruntime_unittests.cmake
@@ -29,11 +29,12 @@ function(AddTest)
   add_executable(${_UT_TARGET} ${_UT_SOURCES})
 
   source_group(TREE ${REPO_ROOT} FILES ${_UT_SOURCES})
+
   if (MSVC AND NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
     #TODO: fix the warnings, they are dangerous
     target_compile_options(${_UT_TARGET} PRIVATE "/wd4244")
   endif()
-  #source_group(TREE ${TEST_SRC_DIR} FILES ${_UT_SOURCES})
+
   set_target_properties(${_UT_TARGET} PROPERTIES FOLDER "ONNXRuntimeTest")
 
   if (_UT_DEPENDS)
diff --git a/onnxruntime/core/protobuf/onnx-ml.proto b/onnxruntime/core/protobuf/onnx-ml.proto
index b96e987678..e3ce6063b8 100644
--- a/onnxruntime/core/protobuf/onnx-ml.proto
+++ b/onnxruntime/core/protobuf/onnx-ml.proto
@@ -370,6 +370,7 @@ message ModelProto {
 
   // Named metadata values; keys should be distinct.
   repeated StringStringEntryProto metadata_props = 14;
+
   // Training-specific information. Sequentially executing all stored
   // `TrainingInfoProto.algorithm`s and assigning their outputs following
   // the corresponding `TrainingInfoProto.update_binding`s is one training
@@ -759,6 +760,7 @@ message FunctionProto {
   repeated NodeProto node = 7;
   // A human-readable documentation for this function. Markdown is allowed.
   optional string doc_string = 8;
+
   // The OperatorSets this function body (graph) relies on.
   // A FunctionProto body (graph) may implicitly rely on the OperatorSet that
   // this function belongs to. It can also explicitly rely on more OperatorSets
diff --git a/onnxruntime/core/protobuf/onnx-ml.proto3 b/onnxruntime/core/protobuf/onnx-ml.proto3
index 3e268a5a82..76239ec1d4 100644
--- a/onnxruntime/core/protobuf/onnx-ml.proto3
+++ b/onnxruntime/core/protobuf/onnx-ml.proto3
@@ -370,6 +370,7 @@ message ModelProto {
 
   // Named metadata values; keys should be distinct.
   repeated StringStringEntryProto metadata_props = 14;
+
   // Training-specific information. Sequentially executing all stored
   // `TrainingInfoProto.algorithm`s and assigning their outputs following
   // the corresponding `TrainingInfoProto.update_binding`s is one training
@@ -763,6 +764,7 @@ message FunctionProto {
   repeated NodeProto node = 7;
   // A human-readable documentation for this function. Markdown is allowed.
   string doc_string = 8;
+
   // The OperatorSets this function body (graph) relies on.
   // A FunctionProto body (graph) may implicitly rely on the OperatorSet that
   // this function belongs to. It can also explicitly rely on more OperatorSets
diff --git a/onnxruntime/core/protobuf/onnx.in.proto b/onnxruntime/core/protobuf/onnx.in.proto
index 96ef7959c2..c239bd1d49 100644
--- a/onnxruntime/core/protobuf/onnx.in.proto
+++ b/onnxruntime/core/protobuf/onnx.in.proto
@@ -367,6 +367,7 @@ message ModelProto {
 
   // Named metadata values; keys should be distinct.
   repeated StringStringEntryProto metadata_props = 14;
+
   // Training-specific information. Sequentially executing all stored
   // `TrainingInfoProto.algorithm`s and assigning their outputs following
   // the corresponding `TrainingInfoProto.update_binding`s is one training
@@ -761,6 +762,7 @@ message FunctionProto {
   repeated NodeProto node = 7;
   // A human-readable documentation for this function. Markdown is allowed.
   optional string doc_string = 8;
+
   // The OperatorSets this function body (graph) relies on.
   // A FunctionProto body (graph) may implicitly rely on the OperatorSet that
   // this function belongs to. It can also explicitly rely on more OperatorSets