Fix merge issues (#505)

This commit fixes merge issues from #404

Signed-off-by: Vladimir Plazun <v.plazun@partner.samsung.com>

diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/common.h b/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/common.h
index 46eab6e..fc44ddb 100644 (file)
--- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/common.h
+++ b/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/common.h
@@ -27,7 +27,7 @@ using nncc::core::ADT::tensor::Shape;
 /// \param[in] strides
 /// \param[in] paddings
 void translate(Index &translatedIndex, const Index &sourceIndex, const Index &kernelIndex,
-               const Index &strides, const Index &paddings);
+               const Shape &strides, const Index &paddings);
 
 } // namespace impl
 } // namespace interpreter

diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/common.cpp b/contrib/nnc/libs/backend/interpreter/core/src/ops/common.cpp
index 0f2c174..f004bfd 100644 (file)
--- a/contrib/nnc/libs/backend/interpreter/core/src/ops/common.cpp
+++ b/contrib/nnc/libs/backend/interpreter/core/src/ops/common.cpp
@@ -1,3 +1,5 @@
+#include <cassert>
+
 #include "interpreter/ops/common.h"
 
 namespace nncc
@@ -16,7 +18,7 @@ void translate(Index &translatedIndex, const Index &sourceIndex, const Index &ke
 {
   assert(translatedIndex.rank() == sourceIndex.rank());
 
-  for (uint32_t d = 0; d < outputIndex.rank(); ++d)
+  for (uint32_t d = 0; d < translatedIndex.rank(); ++d)
   {
     translatedIndex.at(d) = sourceIndex.at(d) * strides.dim(d) + kernelIndex.at(d) - paddings.at(d);
   }