[enco] Remove CanonicalAxisIndex (#1468)

CanonicalAxisIndex is currently just a wrapper of ShapeQuery.

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

diff --git a/contrib/enco/frontend/caffe/src/ConvolutionSpec.cpp b/contrib/enco/frontend/caffe/src/ConvolutionSpec.cpp
index c06678c..ae38ed5 100644 (file)
--- a/contrib/enco/frontend/caffe/src/ConvolutionSpec.cpp
+++ b/contrib/enco/frontend/caffe/src/ConvolutionSpec.cpp
@@ -3,36 +3,6 @@
 
 #include <cassert>
 
-namespace
-{
-
-/**
- * @breif Infer (positive) channel axis from channel axis specifier (which may be negative)
- *
- * NOTE This implementation SHOULD be aligned with CanonicalAxisIndex method in ::caffe::Blob
- */
-class CanonicalChannelAxis
-{
-public:
-  CanonicalChannelAxis(int32_t axis) : _axis{axis}
-  {
-    // DO NOTHING
-  }
-
-public:
-  uint32_t eval(const nncc::core::ADT::tensor::Shape &ifm) const
-  {
-    return query_on(ifm).axis(axis_specifier(_axis));
-  }
-
-private:
-  int32_t _axis;
-};
-
-CanonicalChannelAxis canonical_channel_axis(int32_t axis) { return CanonicalChannelAxis{axis}; }
-
-} // namespace
-
 ConvolutionSpec::ConvolutionSpec(const ::caffe::ConvolutionParameter &param) : _param(param)
 {
   // NOTE Dilation is not supported, yet
@@ -46,7 +16,7 @@ ConvolutionSpec::ConvolutionSpec(const ::caffe::ConvolutionParameter &param) : _
 
 uint32_t ConvolutionSpec::channel_axis(void) const
 {
-  return canonical_channel_axis(_param.axis()).eval(ifm_shape());
+  return query_on(ifm_shape()).axis(axis_specifier(_param.axis()));
 }
 
 uint32_t ConvolutionSpec::pad(uint32_t spatial_axis) const