From: 박세희/동작제어Lab(SR)/Principal Engineer/삼성전자 <saehie.park@samsung.com>
Date: Thu, 6 Dec 2018 09:37:58 +0000 (+0900)
Subject: [enco] frontend/caffe: Prepare to use GraphBuilder (#2538)
X-Git-Tag: nncc_backup~1169
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1bb911ca60f6e523dad0d29f6bef1d83f4e389eb;p=platform%2Fcore%2Fml%2Fnnfw.git

[enco] frontend/caffe: Prepare to use GraphBuilder (#2538)

This will add using GraphBuilderRegistry to prepare handling by each layer GraphBuilder

Signed-off-by: SaeHie Park <saehie.park@samsung.com>
---

diff --git a/contrib/enco/frontend/caffe/src/Frontend.cpp b/contrib/enco/frontend/caffe/src/Frontend.cpp
index e5e80cb..d6532d2 100644
--- a/contrib/enco/frontend/caffe/src/Frontend.cpp
+++ b/contrib/enco/frontend/caffe/src/Frontend.cpp
@@ -21,6 +21,7 @@
 #include "IRBuilder.h"
 #include "Context.h"
 #include "Convert.h"
+#include "GraphBuilderRegistry.h"
 
 #include <coco/IR/FeatureLayouts.h>
 #include <coco/IR/KernelLayouts.h>
@@ -122,7 +123,15 @@ enco::Bundle Frontend::load(void) const
       use(layer.bottom(n));
     }
 
-    if (layer.type() == "Input")
+    caffeimport::GraphBuilderContext opbuilder_context(module.get(), data.get(), blk, shape_ctx,
+                                                       bag_ctx, weight_ctx);
+
+    if (const auto *graph_builder = caffeimport::GraphBuilderRegistry::get().lookup(layer.type()))
+    {
+      graph_builder->build(layer, &opbuilder_context);
+    }
+    // TODO move type handlers to separate builder
+    else if (layer.type() == "Input")
     {
       assert(layer.has_input_param());
       const auto &param = layer.input_param();