From abdd0e290201a064bbe3732f13ed148343891764 Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Sun, 16 Aug 2020 09:33:58 +0800 Subject: [PATCH 1/2] make --nnapi_accelerator_name work in kernel test --- tensorflow/lite/kernels/test_main.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tensorflow/lite/kernels/test_main.cc b/tensorflow/lite/kernels/test_main.cc index a1b1a913281..d32e914ba2e 100644 --- a/tensorflow/lite/kernels/test_main.cc +++ b/tensorflow/lite/kernels/test_main.cc @@ -31,8 +31,12 @@ void InitKernelTest(int* argc, char** argv) { // In Android Q, the NNAPI delegate avoids delegation if the only device // is the reference CPU. However, for testing purposes, we still want // delegation coverage, so force use of this reference path. + const auto opt_name = "nnapi_accelerator_name"; + std::string accelerator_name = + delegate_providers->ConstParams().Get(opt_name); delegate_providers->MutableParams()->Set( - "nnapi_accelerator_name", "nnapi-reference"); + opt_name, accelerator_name.empty() ? "nnapi-reference" + : accelerator_name.c_str()); } } From dc65286f124daca51ecd82be7ccf277850c71570 Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Mon, 17 Aug 2020 13:10:45 +0800 Subject: [PATCH 2/2] per review comments --- tensorflow/lite/kernels/test_main.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tensorflow/lite/kernels/test_main.cc b/tensorflow/lite/kernels/test_main.cc index d32e914ba2e..3b3797890a3 100644 --- a/tensorflow/lite/kernels/test_main.cc +++ b/tensorflow/lite/kernels/test_main.cc @@ -31,12 +31,10 @@ void InitKernelTest(int* argc, char** argv) { // In Android Q, the NNAPI delegate avoids delegation if the only device // is the reference CPU. However, for testing purposes, we still want // delegation coverage, so force use of this reference path. - const auto opt_name = "nnapi_accelerator_name"; - std::string accelerator_name = - delegate_providers->ConstParams().Get(opt_name); - delegate_providers->MutableParams()->Set( - opt_name, accelerator_name.empty() ? "nnapi-reference" - : accelerator_name.c_str()); + auto* params = delegate_providers->MutableParams(); + if (!params->HasValueSet("nnapi_accelerator_name")) { + params->Set("nnapi_accelerator_name", "nnapi-reference"); + } } }