Switch to onnx-ml.pb.h as a ONNX protobuf message definitions header. (#1738)

cmake/external_onnx.cmake

@@ -45,6 +45,7 @@ if (${CMAKE_VERSION} VERSION_LESS 3.2)
                        -DPROTOBUF_LIBRARY=${Protobuf_LIBRARY}
                        -DPROTOBUF_INCLUDE_DIR=${Protobuf_INCLUDE_DIR}
                        -DPROTOBUF_SRC_ROOT_FOLDER=${Protobuf_SRC_ROOT_FOLDER}
+                       -DONNX_ML=TRUE
             TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/onnx/tmp"
             STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/onnx/stamp"
             DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/onnx/download"
@@ -68,6 +69,7 @@ else()
                            -DPROTOBUF_LIBRARY=${Protobuf_LIBRARY}
                            -DPROTOBUF_INCLUDE_DIR=${Protobuf_INCLUDE_DIR}
                            -DPROTOBUF_SRC_ROOT_FOLDER=${Protobuf_SRC_ROOT_FOLDER}
+                           -DONNX_ML=TRUE
                 TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/onnx/tmp"
                 STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/onnx/stamp"
                 DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/onnx/download"
@@ -92,6 +94,7 @@ else()
                            -DProtobuf_PROTOC_EXECUTABLE=${Protobuf_PROTOC_EXECUTABLE}
                            -DProtobuf_LIBRARY=${Protobuf_LIBRARY}
                            -DProtobuf_INCLUDE_DIR=${Protobuf_INCLUDE_DIR}
+                           -DONNX_ML=TRUE
                 TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/onnx/tmp"
                 STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/onnx/stamp"
                 DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/onnx/download"

src/ngraph/frontend/onnx_import/core/attribute.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <onnx.pb.h>
+#include <onnx-ml.pb.h>
 #include "ngraph/except.hpp"
 #include "tensor.hpp"
 

src/ngraph/frontend/onnx_import/core/graph.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <onnx.pb.h>
+#include <onnx-ml.pb.h>
 #include <string>
 #include <vector>
 

src/ngraph/frontend/onnx_import/core/model.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <onnx.pb.h>
+#include <onnx-ml.pb.h>
 #include <ostream>
 
 namespace ngraph

src/ngraph/frontend/onnx_import/core/node.hpp

@@ -20,7 +20,7 @@
 
 #include "ngraph/node_vector.hpp"
 
-#include <onnx.pb.h>
+#include <onnx-ml.pb.h>
 
 #include "attribute.hpp"
 #include "tensor.hpp"

src/ngraph/frontend/onnx_import/core/tensor.hpp

@@ -21,7 +21,7 @@
 #include "ngraph/shape.hpp"
 #include "ngraph/type/element_type.hpp"
 
-#include <onnx.pb.h>
+#include <onnx-ml.pb.h>
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/core/value_info.hpp

@@ -21,7 +21,7 @@
 #include "ngraph/shape.hpp"
 #include "ngraph/type/element_type.hpp"
 
-#include <onnx.pb.h>
+#include <onnx-ml.pb.h>
 
 #include "node.hpp"
 #include "tensor.hpp"

src/ngraph/frontend/onnx_import/op/cast.cpp

@@ -15,7 +15,7 @@
 //*****************************************************************************
 
 #include <memory>
-#include <onnx.pb.h>
+#include <onnx-ml.pb.h>
 
 #include "ngraph/op/convert.hpp"
 #include "ngraph/type/element_type.hpp"