Commit b8901c88 authored by Artur Wojcik's avatar Artur Wojcik Committed by Robert Kimball

[ONNX] upgrade to version 1.3 pre-release (#1504)

* onnx: upgrade to version 1.3 pre-release
Signed-off-by: 's avatarArtur Wojcik <artur.wojcik@intel.com>

* onnx: fix to specific commit from master branch
Signed-off-by: 's avatarArtur Wojcik <artur.wojcik@intel.com>

* fix style
parent 112ff134
...@@ -21,14 +21,14 @@ include(ExternalProject) ...@@ -21,14 +21,14 @@ include(ExternalProject)
# ONNX.proto definition version # ONNX.proto definition version
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
set(ONNX_VERSION 1.2.2) set(ONNX_VERSION pre-1.3)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Download and install libonnx ... # Download and install libonnx ...
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
set(ONNX_GIT_REPO_URL https://github.com/onnx/onnx.git) set(ONNX_GIT_REPO_URL https://github.com/onnx/onnx.git)
set(ONNX_GIT_BRANCH rel-${ONNX_VERSION}) set(ONNX_GIT_SHA1 73b2d4d799a97fba18a7b3d9c077ff6e59749c3f)
# The 'BUILD_BYPRODUCTS' arguments was introduced in CMake 3.2. # The 'BUILD_BYPRODUCTS' arguments was introduced in CMake 3.2.
if (${CMAKE_VERSION} VERSION_LESS 3.2) if (${CMAKE_VERSION} VERSION_LESS 3.2)
...@@ -36,7 +36,7 @@ if (${CMAKE_VERSION} VERSION_LESS 3.2) ...@@ -36,7 +36,7 @@ if (${CMAKE_VERSION} VERSION_LESS 3.2)
ext_onnx ext_onnx
PREFIX onnx PREFIX onnx
GIT_REPOSITORY ${ONNX_GIT_REPO_URL} GIT_REPOSITORY ${ONNX_GIT_REPO_URL}
GIT_TAG ${ONNX_GIT_BRANCH} GIT_TAG ${ONNX_GIT_SHA1}
INSTALL_COMMAND "" INSTALL_COMMAND ""
UPDATE_COMMAND "" UPDATE_COMMAND ""
CMAKE_ARGS -DONNX_GEN_PB_TYPE_STUBS=OFF CMAKE_ARGS -DONNX_GEN_PB_TYPE_STUBS=OFF
......
...@@ -81,10 +81,11 @@ ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI onnxReleaseEvent(onnx ...@@ -81,10 +81,11 @@ ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI onnxReleaseEvent(onnx
ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI
onnxInitGraph(onnxBackend backend, onnxInitGraph(onnxBackend backend,
const uint64_t* auxPropertiesList,
std::size_t onnxModelSize, std::size_t onnxModelSize,
const void* onnxModel, const void* onnxModel,
std::uint32_t weightsCount, uint32_t weightsCount,
const onnxTensorDescriptor* weightDescriptors, const onnxTensorDescriptorV1* weightDescriptors,
onnxGraph* graph) onnxGraph* graph)
{ {
return ONNXIFI_STATUS_BACKEND_UNAVAILABLE; return ONNXIFI_STATUS_BACKEND_UNAVAILABLE;
...@@ -93,15 +94,15 @@ ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI ...@@ -93,15 +94,15 @@ ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI
ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI
onnxSetGraphIO(onnxGraph graph, onnxSetGraphIO(onnxGraph graph,
std::uint32_t inputsCount, std::uint32_t inputsCount,
const onnxTensorDescriptor* inputDescriptors, const onnxTensorDescriptorV1* inputDescriptors,
std::uint32_t outputsCount, std::uint32_t outputsCount,
const onnxTensorDescriptor* outputDescriptors) const onnxTensorDescriptorV1* outputDescriptors)
{ {
return ONNXIFI_STATUS_BACKEND_UNAVAILABLE; return ONNXIFI_STATUS_BACKEND_UNAVAILABLE;
} }
ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI ONNXIFI_PUBLIC ONNXIFI_CHECK_RESULT onnxStatus ONNXIFI_ABI onnxRunGraph(
onnxRunGraph(onnxGraph graph, const onnxMemoryFence* inputFence, onnxMemoryFence* outputFence) onnxGraph graph, const onnxMemoryFenceV1* inputFence, onnxMemoryFenceV1* outputFence)
{ {
return ONNXIFI_STATUS_BACKEND_UNAVAILABLE; return ONNXIFI_STATUS_BACKEND_UNAVAILABLE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment