From 3a184ff4265c42cb46f30c670ef35c672ea1d7d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9C=A4=ED=98=84=EC=8B=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Principal=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Wed, 28 Nov 2018 13:48:28 +0900 Subject: [PATCH] [enco/tfl/frontend] change names : `conv..` to `dconv...` (#2431) By refactoring, names with `conv...` was changed to `dconv...`. Signed-off-by: Hyun Sik Yoon --- .../frontend/tflite/src/Op/DepthwiseConv2D.cpp | 24 +++++++++++----------- contrib/enco/frontend/tflite/src/Op/Padding.cpp | 5 +++-- contrib/enco/frontend/tflite/src/Op/Padding.h | 5 +++-- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/contrib/enco/frontend/tflite/src/Op/DepthwiseConv2D.cpp b/contrib/enco/frontend/tflite/src/Op/DepthwiseConv2D.cpp index ae976b8..5f2a7f6 100644 --- a/contrib/enco/frontend/tflite/src/Op/DepthwiseConv2D.cpp +++ b/contrib/enco/frontend/tflite/src/Op/DepthwiseConv2D.cpp @@ -134,10 +134,10 @@ void DepthwiseConv2DGraphBuilder::build(const tflite::Operator *op, // Create a Load op auto load = op_builder(m).load(ifm_obj).pop(); - // Create a Conv2D op + // Create a coco::Conv2D op for DepthwiseConv2D auto coco_dconv2d = m->entity()->op()->create(); - // populating Conv2D objects and options such as stride and padding + // populating objects and options such as stride and padding for DepthwiseConv2D coco_dconv2d->ker(ker_obj); // setting params passed from TFLITE DepthwiseConv2DOptions @@ -150,7 +150,7 @@ void DepthwiseConv2DGraphBuilder::build(const tflite::Operator *op, coco_dconv2d->stride()->vertical(dconv_params->stride_h()); coco_dconv2d->stride()->horizontal(dconv_params->stride_w()); - coco::Padding2D padding = conv2D_padding(dconv_params, ifm_shape, ker_shape); + coco::Padding2D padding = depthwiseConv2D_padding(dconv_params, ifm_shape, ker_shape); coco_dconv2d->pad()->top(padding.top()); coco_dconv2d->pad()->bottom(padding.bottom()); coco_dconv2d->pad()->left(padding.left()); @@ -159,20 +159,20 @@ void DepthwiseConv2DGraphBuilder::build(const tflite::Operator *op, // Link ops coco_dconv2d->arg(load); - // Object to store Conv2D output - auto *conv2d_obj = m->entity()->object()->create(); - auto *conv2d_bag = m->entity()->bag()->create(num_elements(ofm_shape)); - conv2d_obj->bag(conv2d_bag); - conv2d_obj->layout(coco::FeatureLayouts::BHWC::create(as_feature_shape(ofm_shape))); + // Object to store output for DepthwiseConv2D + auto *dconv2d_obj = m->entity()->object()->create(); + auto *dconv2d_bag = m->entity()->bag()->create(num_elements(ofm_shape)); + dconv2d_obj->bag(dconv2d_bag); + dconv2d_obj->layout(coco::FeatureLayouts::BHWC::create(as_feature_shape(ofm_shape))); - // Create an Eval instruction for Conv2D - auto conv2d_ins = instr_builder(m).eval(conv2d_obj, coco_dconv2d); + // Create an Eval instruction for DepthwiseConv2D + auto dconv2d_ins = instr_builder(m).eval(dconv2d_obj, coco_dconv2d); // Append the instruction to the block - blk->instr()->append(conv2d_ins); + blk->instr()->append(dconv2d_ins); // Last Object to make a copy to Output Object - coco::FeatureObject *last_obj = conv2d_obj; + coco::FeatureObject *last_obj = dconv2d_obj; if (hasBias) { diff --git a/contrib/enco/frontend/tflite/src/Op/Padding.cpp b/contrib/enco/frontend/tflite/src/Op/Padding.cpp index cfdbf9a..f382490 100644 --- a/contrib/enco/frontend/tflite/src/Op/Padding.cpp +++ b/contrib/enco/frontend/tflite/src/Op/Padding.cpp @@ -90,8 +90,9 @@ coco::Padding2D conv2D_padding(const tflite::Conv2DOptions *options, const tenso options->dilation_w_factor(), options->dilation_h_factor()); } -coco::Padding2D conv2D_padding(const tflite::DepthwiseConv2DOptions *options, - const tensor::Shape &ifm_shape, const tensor::Shape &kernel_shape) +coco::Padding2D depthwiseConv2D_padding(const tflite::DepthwiseConv2DOptions *options, + const tensor::Shape &ifm_shape, + const tensor::Shape &kernel_shape) { return get_padding(ifm_shape, kernel_shape.dim(2), kernel_shape.dim(1), /* kernel layout: NHWC */ options->padding(), options->stride_w(), options->stride_h(), diff --git a/contrib/enco/frontend/tflite/src/Op/Padding.h b/contrib/enco/frontend/tflite/src/Op/Padding.h index 7e6dd65..ac84ade 100644 --- a/contrib/enco/frontend/tflite/src/Op/Padding.h +++ b/contrib/enco/frontend/tflite/src/Op/Padding.h @@ -33,8 +33,9 @@ coco::Padding2D pool2D_padding(const tflite::Pool2DOptions *options, const tenso coco::Padding2D conv2D_padding(const tflite::Conv2DOptions *options, const tensor::Shape &ifm_shape, const tensor::Shape &kernel_shape); -coco::Padding2D conv2D_padding(const tflite::DepthwiseConv2DOptions *options, - const tensor::Shape &ifm_shape, const tensor::Shape &kernel_shape); +coco::Padding2D depthwiseConv2D_padding(const tflite::DepthwiseConv2DOptions *options, + const tensor::Shape &ifm_shape, + const tensor::Shape &kernel_shape); } // namespace tflimport -- 2.7.4