Fix compiler warnings in operation descriptions (#310)
authorVladimir Plazun/AI Tools Lab/Engineer/삼성전자 <v.plazun@partner.samsung.com>
Tue, 5 Jun 2018 15:48:58 +0000 (19:48 +0400)
committerSergey Vostokov/AI Tools Lab/Staff Engineer/삼성전자 <s.vostokov@samsung.com>
Tue, 5 Jun 2018 15:48:58 +0000 (18:48 +0300)
Fixes compiler warnings in PoolOp and OpDescription classes
Add missing OpDescription virtual destructor

Signed-off-by: Vladimir Plazun <v.plazun@partner.samsung.com>
contrib/nnc/libs/core/include/nnc/core/IR/model/operations/operation.h
contrib/nnc/libs/core/include/nnc/core/IR/model/operations/pool_op.h

index 7fa9cce..55426bd 100644 (file)
@@ -23,6 +23,7 @@ using nncc::contrib::core::ADT::TensorVariant;
 class OpDescription {
  public:
   explicit OpDescription(const size_t max_inputs, const size_t max_outputs);
+  virtual ~OpDescription() = default;
 
   size_t getNumInputs() const;
   size_t getNumOutputs() const;
index 75bcdc1..8e2f242 100644 (file)
@@ -35,8 +35,7 @@ public:
 
   explicit PoolOp(const Shape &windowShape, const Shape &strides, PoolingType poolType,
                   PaddingType padding)
-      : OpDescription(1, 1), _padding(padding), _poolingType(poolType), _strides(strides),
-        _windowShape(windowShape)
+      : OpDescription(1, 1), _padding(padding), _poolingType(poolType), _windowShape(windowShape), _strides(strides)
   {
     _pads.resize(_windowShape.rank());
   }
@@ -49,7 +48,7 @@ public:
 
   const Shape &getStrides() const { return _strides; }
 
-  const int getPadding(int dim) const { return _pads[dim]; }
+  int getPadding(int dim) const { return _pads[dim]; }
 
   void setPadding(int dim, int pad) { _pads[dim] = pad; }