From: 박종현/동작제어Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Date: Tue, 2 Oct 2018 00:01:36 +0000 (+0900)
Subject: [enco.nnapi] Do NOT manipulate layout through KernelObject (#1699)
X-Git-Tag: nncc_backup~1657
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b868095dfd5614115214f3e04f0cea6753982a8;p=platform%2Fcore%2Fml%2Fnnfw.git

[enco.nnapi] Do NOT manipulate layout through KernelObject (#1699)

This commit eliminates the use of deprecated Kernel layout manipulatoin
methods from NNAPI backend implementation.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
---

diff --git a/contrib/enco/core/src/Transforms/Normalize.cpp b/contrib/enco/core/src/Transforms/Normalize.cpp
index b4b16f2..c2d30dc 100644
--- a/contrib/enco/core/src/Transforms/Normalize.cpp
+++ b/contrib/enco/core/src/Transforms/Normalize.cpp
@@ -153,11 +153,13 @@ void ShuffleGen::mutate(coco::UnitF *unit)
     // Reorder Kernel as NHWC
     auto ker_obj = unit->op()->asConv2D()->ker();
     auto ker_bag = ker_obj->bag();
+    auto ker_layout = make_unique<coco::GenericKernelLayout>(ker_obj->shape());
 
     assert(ker_bag != nullptr);
     assert(coco::dependent_objects(ker_bag).size() == 1);
     assert((ker_bag->isInput() == false) && (ker_bag->isOutput() == false));
-    ker_obj->reorder<nncc::core::ADT::kernel::NHWCLayout>();
+    ker_layout->reorder<nncc::core::ADT::kernel::NHWCLayout>();
+    ker_obj->layout(std::move(ker_layout));
   }
 }