[mir_onnx] Update ONNX source to version 1.5.0 (#6748)
authorСергей Баранников/AI Tools Lab /SRR/Engineer/삼성전자 <s.barannikov@samsung.com>
Tue, 20 Aug 2019 17:44:06 +0000 (02:44 +0900)
committerAlexander Efimov/AI Tools Lab/./Samsung Electronics <a.efimov@samsung.com>
Tue, 20 Aug 2019 17:44:06 +0000 (20:44 +0300)
Update ONNX source version to support ONNX IR version 5.

Signed-off-by: Sergei Barannikov <s.barannikov@samsung.com>
compiler/mir-onnx-importer/CMakeLists.txt

index df03dd6..1a33476 100644 (file)
@@ -1,9 +1,24 @@
-nncc_find_package(ONNXProto QUIET)
+nncc_find_package(ONNXSource EXACT 1.5.0 QUIET)
+nncc_find_package(Protobuf QUIET)
 
-if (NOT ONNXProto_FOUND)
+if (NOT ONNXSource_FOUND)
     return()
 endif ()
 
+if (NOT Protobuf_FOUND)
+    return()
+endif ()
+
+Protobuf_Generate(MIR_ONNX_PROTO
+        ${CMAKE_CURRENT_BINARY_DIR}/generated
+        ${ONNXSource_DIR}
+        onnx/onnx.proto)
+
+add_library(mir_onnx_proto STATIC ${MIR_ONNX_PROTO_SOURCES})
+set_target_properties(mir_onnx_proto PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_include_directories(mir_onnx_proto PUBLIC ${MIR_ONNX_PROTO_INCLUDE_DIRS})
+target_link_libraries(mir_onnx_proto PUBLIC libprotobuf)
+
 set(MIR_ONNX_IMPORTER_SOURCES
         ONNXHelpers.cpp
         ONNXHelpers.h
@@ -58,6 +73,5 @@ set(MIR_ONNX_IMPORTER_SOURCES
 
 add_library(mir_onnx_importer STATIC ${MIR_ONNX_IMPORTER_SOURCES})
 set_target_properties(mir_onnx_importer PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_compile_definitions(mir_onnx_importer PUBLIC ONNX_NAMESPACE=onnx)
 target_include_directories(mir_onnx_importer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(mir_onnx_importer PUBLIC onnxproto mir PRIVATE stdex)
+target_link_libraries(mir_onnx_importer PUBLIC mir_onnx_proto mir PRIVATE stdex)