From 91302d3fa5e766e3b35dbb47875e6a60c8f0fb59 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 4 Dec 2019 14:31:16 -0800 Subject: [PATCH 1/3] a --- onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc b/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc index a92b9caab0d07..ad1c18064db7e 100644 --- a/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc +++ b/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc @@ -42,7 +42,8 @@ NnapiExecutionProvider::GetCapability(const onnxruntime::GraphViewer& graph, const std::vector& /*kernel_registries*/) const { // This method is based on that of TRT EP // Construct modelproto from graph - onnxruntime::Model model(graph.Name(), true, ModelMetaData(), IOnnxRuntimeOpSchemaRegistryList(), graph.DomainToVersionMap()); + onnxruntime::Model model(graph.Name(), true, ModelMetaData(), IOnnxRuntimeOpSchemaRegistryList(), graph.DomainToVersionMap(), + std::vector(), *GetLogger()); onnxruntime::Graph& graph_build = model.MainGraph(); const std::vector& node_index = graph.GetNodesInTopologicalOrder(); std::set all_node_inputs; From 943305561f9c299d54637c93a71a745ef750f4ae Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 4 Dec 2019 16:48:03 -0800 Subject: [PATCH 2/3] a --- onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc b/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc index ad1c18064db7e..9d04f55c4315a 100644 --- a/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc +++ b/onnxruntime/core/providers/nnapi/nnapi_execution_provider.cc @@ -203,7 +203,8 @@ common::Status NnapiExecutionProvider::Compile(const std::vectorBody(); onnxruntime::Model model(graph_body.Name(), true, ModelMetaData(), - IOnnxRuntimeOpSchemaRegistryList(), graph_body.DomainToVersionMap()); + IOnnxRuntimeOpSchemaRegistryList(), graph_body.DomainToVersionMap(), + std::vector(), *GetLogger()); ONNX_NAMESPACE::ModelProto model_proto = model.ToProto(); *(model_proto.mutable_graph()) = graph_body.ToGraphProto(); model_proto.set_ir_version(ONNX_NAMESPACE::Version::IR_VERSION); From bf490138e73419674274399c9b6ddc82418d52c9 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 5 Dec 2019 10:53:39 -0800 Subject: [PATCH 3/3] update --- onnxruntime/test/providers/nnapi/nnapi_basic_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onnxruntime/test/providers/nnapi/nnapi_basic_test.cc b/onnxruntime/test/providers/nnapi/nnapi_basic_test.cc index 90fc3c1d52ed8..dc497bad25418 100644 --- a/onnxruntime/test/providers/nnapi/nnapi_basic_test.cc +++ b/onnxruntime/test/providers/nnapi/nnapi_basic_test.cc @@ -23,7 +23,7 @@ void VerifyOutputs(const std::vector& fetches, const std::vector inputs; std::vector outputs;