From d80f0399e6193cf7a6d54d8f14ab7483f746a34c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladimir=20Plazun/AI=20Tools=20Lab/Engineer/=EC=82=BC?= =?utf8?q?=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 5 Jun 2018 19:48:10 +0400 Subject: [PATCH] [nnc] Fix operation description namespace issues (#308) This commit fixes compilation errors introduced by switch to clang-7 Signed-off-by: Vladimir Plazun --- .../libs/core/include/nnc/core/IR/model/operations/bias_add_op.h | 6 +++--- .../libs/core/include/nnc/core/IR/model/operations/conv_2d_op.h | 6 +++--- .../include/nnc/core/IR/model/operations/depthwise_conv2d_op.h | 6 +++--- .../include/nnc/core/IR/model/operations/fully_connected_op.h | 8 +++++--- .../libs/core/include/nnc/core/IR/model/operations/operation.h | 3 +++ 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/bias_add_op.h b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/bias_add_op.h index ba1255a..dcb59b1 100644 --- a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/bias_add_op.h +++ b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/bias_add_op.h @@ -20,12 +20,12 @@ namespace ops class BiasAddOp : public OpDescription { public: - explicit BiasAddOp(const ADT::TensorVariant &weights) : OpDescription(1, 1), _weights(weights) {} + explicit BiasAddOp(const TensorVariant &weights) : OpDescription(1, 1), _weights(weights) {} - const ADT::TensorVariant &getWeights() const { return _weights; } + const TensorVariant &getWeights() const { return _weights; } private: - ADT::TensorVariant _weights; + TensorVariant _weights; }; } // namespace ops diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/conv_2d_op.h b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/conv_2d_op.h index 9a086a9..ad35439 100644 --- a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/conv_2d_op.h +++ b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/conv_2d_op.h @@ -27,14 +27,14 @@ using nncc::core::ADT::tensor::Shape; class Conv2DOp : public OpDescription { public: - Conv2DOp(const ADT::TensorVariant &kernel, const Shape &strides, PaddingType padding) + Conv2DOp(const TensorVariant &kernel, const Shape &strides, PaddingType padding) : OpDescription(1, 1), _kernel(kernel), _strides(strides), _padding(padding) { _pads.resize(3); } - const ADT::TensorVariant &getKernel() const { return _kernel; } + const TensorVariant &getKernel() const { return _kernel; } const Shape &getStrides() const { return _strides; } @@ -45,7 +45,7 @@ public: void setPadding(int dim, int pad) { _pads[dim] = pad; } private: - const ADT::TensorVariant _kernel; + const TensorVariant _kernel; Shape _strides; PaddingType _padding; std::vector _pads; diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h index 54c28cb..172f9dd 100644 --- a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h +++ b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h @@ -27,13 +27,13 @@ using nncc::core::ADT::tensor::Shape; class DepthwiseConv2DOp : public OpDescription { public: - explicit DepthwiseConv2DOp(const ADT::TensorVariant &kernel, const Shape &strides, PaddingType padding) + explicit DepthwiseConv2DOp(const TensorVariant &kernel, const Shape &strides, PaddingType padding) : OpDescription(1, 1), _kernel(kernel), _strides(strides), _padding(padding) { _pads.resize(_kernel.getShape().rank()); } - const ADT::TensorVariant &getKernel() const { return _kernel; } + const TensorVariant &getKernel() const { return _kernel; } const Shape &getStrides() const { return _strides; } @@ -44,7 +44,7 @@ public: void setPadding(int dim, int pad) { _pads[dim] = pad; } private: - const ADT::TensorVariant _kernel; + const TensorVariant _kernel; Shape _strides; PaddingType _padding; std::vector _pads; diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/fully_connected_op.h b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/fully_connected_op.h index 9670797..5ce0ee0 100644 --- a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/fully_connected_op.h +++ b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/fully_connected_op.h @@ -17,15 +17,17 @@ namespace model namespace ops { +using namespace nncc::contrib::core; + class FullyConnectedOp : public OpDescription { public: - explicit FullyConnectedOp(const ADT::TensorVariant &weights) : OpDescription(1, 1), _weights(weights) {} + explicit FullyConnectedOp(const TensorVariant &weights) : OpDescription(1, 1), _weights(weights) {} - const ADT::TensorVariant &getWeights() const { return _weights; } + const TensorVariant &getWeights() const { return _weights; } private: - ADT::TensorVariant _weights; + TensorVariant _weights; }; } // namespace ops diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/operation.h b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/operation.h index 8d5dc67..7fa9cce 100644 --- a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/operation.h +++ b/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/operation.h @@ -3,6 +3,7 @@ #include #include +#include #include "nncc/core/ADT/tensor/Shape.h" @@ -17,6 +18,8 @@ namespace IR namespace model { +using nncc::contrib::core::ADT::TensorVariant; + class OpDescription { public: explicit OpDescription(const size_t max_inputs, const size_t max_outputs); -- 2.7.4