From 4ca50d9352568db044597d7d44d3d45ff3f5633f Mon Sep 17 00:00:00 2001
From: daquexian <daquexian566@gmail.com>
Date: Tue, 28 Jan 2020 21:03:28 +0800
Subject: [PATCH] Update DNNLibrary to v0.9.0 and update NNAPI
 GetSupportedNodes

---
 cmake/external/DNNLibrary                                   | 2 +-
 .../core/providers/nnapi/nnapi_execution_provider.cc        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/external/DNNLibrary b/cmake/external/DNNLibrary
index 647d4c3f4d..e17f11e966 160000
--- a/cmake/external/DNNLibrary
+++ b/cmake/external/DNNLibrary
@@ -1 +1 @@
-Subproject commit 647d4c3f4d47d9cf63fb90ec175c414a005adea7
+Subproject commit e17f11e966b2cce7d747799b76bb9843813d4b01
diff --git a/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc b/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc
index 9d04f55c43..e63c588ce5 100644
--- a/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc
+++ b/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc
@@ -34,7 +34,11 @@ NnapiExecutionProvider::~NnapiExecutionProvider() {}
 
 std::vector<std::vector<int>> NnapiExecutionProvider::GetSupportedNodes(const ONNX_NAMESPACE::ModelProto& model_proto) const {
   dnn::OnnxConverter converter;
-  return converter.GetSupportedNodes(model_proto);
+  const auto nodes = converter.GetSupportedNodes(model_proto);
+  if (!nodes) {
+      return {{}};
+  }
+  return nodes.value();
 }
 
 std::vector<std::unique_ptr<ComputeCapability>>