From 73ad58d0e6ccbaef8ca9d7c50b5689cac4e713d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=ED=95=9C=EC=A2=85/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Tue, 17 Jul 2018 10:06:45 +0900 Subject: [PATCH] [newrt] Update backend name to `acl_cl` (#1972) Update backend name to `acl_cl` from `arm_compute` since this backend only uses CL part. Signed-off-by: Hanjoung Lee --- runtimes/new_runtime/src/compilation.cc | 12 ++++++------ runtimes/new_runtime/src/internal/BackendManager.cc | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/runtimes/new_runtime/src/compilation.cc b/runtimes/new_runtime/src/compilation.cc index 494aa80..4a3833d 100644 --- a/runtimes/new_runtime/src/compilation.cc +++ b/runtimes/new_runtime/src/compilation.cc @@ -77,12 +77,12 @@ class BackendResolver public: BackendResolver(::internal::BackendManager &backend_manager) { -#define OP(InternalName, NnApiName) \ - { \ - const auto &backend_str = \ - ::nnfw::util::EnvVar{std::string("OP_BACKEND_") + #NnApiName}.asString("arm_compute"); \ - auto backend = backend_manager.get(backend_str); \ - _gen_map[typeid(::internal::tflite::op::InternalName::Node)] = backend; \ +#define OP(InternalName, NnApiName) \ + { \ + const auto &backend_str = \ + ::nnfw::util::EnvVar{std::string("OP_BACKEND_") + #NnApiName}.asString("acl_cl"); \ + auto backend = backend_manager.get(backend_str); \ + _gen_map[typeid(::internal::tflite::op::InternalName::Node)] = backend; \ } #include "internal/op/Op.lst" diff --git a/runtimes/new_runtime/src/internal/BackendManager.cc b/runtimes/new_runtime/src/internal/BackendManager.cc index db25e62..840bf6f 100644 --- a/runtimes/new_runtime/src/internal/BackendManager.cc +++ b/runtimes/new_runtime/src/internal/BackendManager.cc @@ -22,7 +22,8 @@ BackendManager::BackendManager(::internal::arm_compute::Plan &plan) : _plan(plan auto acl_stage_gen = std::make_shared<::internal::arm_compute::StageGenerator>(operands, acl_tensor_builder); - _gen_map["arm_compute"] = {acl_initializer_gen, acl_stage_gen}; + // TODO Do not use magic string for backend id + _gen_map["acl_cl"] = {acl_initializer_gen, acl_stage_gen}; } // Add CPU backend @@ -32,6 +33,7 @@ BackendManager::BackendManager(::internal::arm_compute::Plan &plan) : _plan(plan auto cpu_stage_gen = std::make_shared<::internal::cpu::StageGenerator>(operands, cpu_tensor_builder); + // TODO Do not use magic string for backend id _gen_map["cpu"] = {cpu_initializer_gen, cpu_stage_gen}; } } -- 2.7.4