commit 03144aeb46dd6776c96c90c2effb1ae4062464ca
author Georgios Pinitas <georgios.pinitas@arm.com> Thu Mar 12 23:59:40 2020 +0000
committer Georgios Pinitas <georgios.pinitas@arm.com> Thu Mar 12 23:59:40 2020 +0000
tree 4290fa35103dc4436375c6cc9e7a9b444bd5b073
parent 23831c8b3941034bfb29098cee7b9175b638b8d8

Load external library on stack

tensorflow/lite/tools/benchmark/external_delegate_provider.cc

diff --git a/tensorflow/lite/tools/benchmark/external_delegate_provider.cc b/tensorflow/lite/tools/benchmark/external_delegate_provider.cc
index 35a532b..9174b4a 100644
--- a/tensorflow/lite/tools/benchmark/external_delegate_provider.cc
+++ b/tensorflow/lite/tools/benchmark/external_delegate_provider.cc
@@ -73,25 +73,22 @@
   using DestroyDelegatePtr = std::add_pointer<void(TfLiteDelegate*)>::type;
 
   // Open a given delegate library and load the create/destroy symbols
-  void load(const std::string library) {
-    if (!is_loaded) {
-      void* handle = LibSupport::Load(library.c_str());
-      if (handle == nullptr) {
-        TFLITE_LOG(INFO) << "Unable to load external delegate from : "
-                         << library;
-      } else {
-        create = reinterpret_cast<decltype(create)>(
-            LibSupport::GetSymbol(handle, "tflite_plugin_create_delegate"));
-        destroy = reinterpret_cast<decltype(destroy)>(
-            LibSupport::GetSymbol(handle, "tflite_plugin_destroy_delegate"));
-        is_loaded = create && destroy;
-      }
+  bool load(const std::string library) {
+    void* handle = LibSupport::Load(library.c_str());
+    if (handle == nullptr) {
+      TFLITE_LOG(INFO) << "Unable to load external delegate from : " << library;
+    } else {
+      create = reinterpret_cast<decltype(create)>(
+          LibSupport::GetSymbol(handle, "tflite_plugin_create_delegate"));
+      destroy = reinterpret_cast<decltype(destroy)>(
+          LibSupport::GetSymbol(handle, "tflite_plugin_destroy_delegate"));
+      return create && destroy;
     }
+    return false;
   }
 
   CreateDelegatePtr create{nullptr};
   DestroyDelegatePtr destroy{nullptr};
-  bool is_loaded{false};
 };
 }  // namespace
 
@@ -110,9 +107,6 @@
       const BenchmarkParams& params) const final;
 
   std::string GetName() const final { return "EXTERNAL"; }
-
- private:
-  mutable ExternalLib delegate_lib_;
 };
 REGISTER_DELEGATE_PROVIDER(ExternalDelegateProvider);
 
@@ -147,9 +141,8 @@
   TfLiteDelegatePtr delegate(nullptr, [](TfLiteDelegate*) {});
   std::string lib_path = params.Get<std::string>("external_delegate_path");
   if (!lib_path.empty()) {
-    delegate_lib_.load(lib_path);
-
-    if (delegate_lib_.is_loaded) {
+    ExternalLib delegate_lib;
+    if (delegate_lib.load(lib_path)) {
       // Parse delegate options
       const std::vector<std::string> options = SplitString(
           params.Get<std::string>("external_delegate_options"), ';');
@@ -171,9 +164,9 @@
 
       // Create delegate
       delegate =
-          TfLiteDelegatePtr(delegate_lib_.create(ckeys.data(), cvalues.data(),
-                                                 num_options, nullptr),
-                            delegate_lib_.destroy);
+          TfLiteDelegatePtr(delegate_lib.create(ckeys.data(), cvalues.data(),
+                                                num_options, nullptr),
+                            delegate_lib.destroy);
     }
   }
   return delegate;