Skip to content
Snippets Groups Projects
Commit 3d0fd068 authored by Olivier BICHLER's avatar Olivier BICHLER
Browse files

Merge branch 'fix_pad' into 'dev' 

Fix padding

See merge request !100
parents fb4f93fd 0d421d33
No related branches found
No related tags found
3 merge requests!118v0.4.0,!108v0.4.0,!100Fix padding
Pipeline #57631 passed
Stage: static_analysis
    Stage: build
      Stage: test
        Stage: coverage
          Hide whitespace changes
          Inline Side-by-side
          include/aidge/backend/cpu/operator/PadImpl_kernels.hpp
          + 14
          − 14
          View file @ 3d0fd068
          ......@@ -55,19 +55,19 @@ void PadImpl1D_cpu_forward_kernel(const std::array<DimSize_t, 2>& beginEndBorder
          O outputValue = static_cast<O>(borderValue);
          if (borderType == PadBorderType::Constant) {
          int ix = static_cast<int>(ox) - static_cast<int>(beginEndBorders[1]);
          int ix = static_cast<int>(ox) - static_cast<int>(beginEndBorders[0]);
          if (ix >= 0 && ix < static_cast<int>(dims[2])) {
          outputValue = input[iIndex + static_cast<std::size_t>(ix)];
          }
          }
          else if (borderType == PadBorderType::Edge) {
          int ix = std::max(0, std::min(static_cast<int>(dims[2]) - 1, static_cast<int>(ox) - static_cast<int>(beginEndBorders[1])));
          int ix = std::max(0, std::min(static_cast<int>(dims[2]) - 1, static_cast<int>(ox) - static_cast<int>(beginEndBorders[0])));
          outputValue = input[iIndex + static_cast<std::size_t>(ix)];
          }
          else if (borderType == PadBorderType::Reflect) {
          int ix = static_cast<int>(ox) - static_cast<int>(beginEndBorders[1]);
          int ix = static_cast<int>(ox) - static_cast<int>(beginEndBorders[0]);
          if (ix < 0)
          ix = 0 - ix;
          ......@@ -77,7 +77,7 @@ void PadImpl1D_cpu_forward_kernel(const std::array<DimSize_t, 2>& beginEndBorder
          outputValue = input[iIndex + static_cast<std::size_t>(ix)];
          }
          else if (borderType == PadBorderType::Wrap) {
          int ix = (static_cast<int>(dims[2]) + static_cast<int>(ox) - static_cast<int>(beginEndBorders[1])) % static_cast<int>(dims[2]);
          int ix = (static_cast<int>(dims[2]) + static_cast<int>(ox) - static_cast<int>(beginEndBorders[0])) % static_cast<int>(dims[2]);
          outputValue = input[iIndex + static_cast<std::size_t>(ix)];
          }
          ......@@ -120,8 +120,8 @@ void PadImpl2D_cpu_forward_kernel(const std::array<DimSize_t, 4>& beginEndBorder
          const I *input = static_cast<const I *>(input_);
          O *output = static_cast<O *>(output_);
          const std::size_t oySize = dims[2] + beginEndBorders[0] + beginEndBorders[1];
          const std::size_t oxSize = dims[3] + beginEndBorders[2] + beginEndBorders[3];
          const std::size_t oySize = dims[2] + beginEndBorders[0] + beginEndBorders[2];
          const std::size_t oxSize = dims[3] + beginEndBorders[1] + beginEndBorders[3];
          for (std::size_t batch = 0; batch < dims[0]; ++batch) {
          for (std::size_t ch = 0; ch < dims[1]; ++ch) {
          ......@@ -135,22 +135,22 @@ void PadImpl2D_cpu_forward_kernel(const std::array<DimSize_t, 4>& beginEndBorder
          O outputValue = static_cast<O>(borderValue);
          if (borderType == PadBorderType::Constant) {
          std::int32_t ix = static_cast<std::int32_t>(ox) - static_cast<std::int32_t>(beginEndBorders[3]);
          std::int32_t iy = static_cast<std::int32_t>(oy) - static_cast<std::int32_t>(beginEndBorders[1]);
          std::int32_t ix = static_cast<std::int32_t>(ox) - static_cast<std::int32_t>(beginEndBorders[1]);
          std::int32_t iy = static_cast<std::int32_t>(oy) - static_cast<std::int32_t>(beginEndBorders[0]);
          if (ix >= 0 && ix < static_cast<std::int32_t>(dims[3]) && iy >= 0 && iy < static_cast<std::int32_t>(dims[2])) {
          outputValue = input[iIndex + static_cast<std::size_t>(iy)*dims[3] + static_cast<std::size_t>(ix)];
          }
          }
          else if (borderType == PadBorderType::Edge) {
          std::int32_t ix = std::max(0, std::min(static_cast<std::int32_t>(dims[3]) - 1, static_cast<std::int32_t>(ox) - static_cast<std::int32_t>(beginEndBorders[3])));
          std::int32_t iy = std::max(0, std::min(static_cast<std::int32_t>(dims[2]) - 1, static_cast<std::int32_t>(oy) - static_cast<std::int32_t>(beginEndBorders[1])));
          std::int32_t ix = std::max(0, std::min(static_cast<std::int32_t>(dims[3]) - 1, static_cast<std::int32_t>(ox) - static_cast<std::int32_t>(beginEndBorders[1])));
          std::int32_t iy = std::max(0, std::min(static_cast<std::int32_t>(dims[2]) - 1, static_cast<std::int32_t>(oy) - static_cast<std::int32_t>(beginEndBorders[0])));
          outputValue = input[iIndex + static_cast<std::size_t>(iy)*dims[3] + static_cast<std::size_t>(ix)];
          }
          else if (borderType == PadBorderType::Reflect) {
          std::int32_t ix = static_cast<std::int32_t>(ox) - static_cast<std::int32_t>(beginEndBorders[3]);
          std::int32_t iy = static_cast<std::int32_t>(oy) - static_cast<std::int32_t>(beginEndBorders[1]);
          std::int32_t ix = static_cast<std::int32_t>(ox) - static_cast<std::int32_t>(beginEndBorders[1]);
          std::int32_t iy = static_cast<std::int32_t>(oy) - static_cast<std::int32_t>(beginEndBorders[0]);
          if (ix < 0)
          ix = 0 - ix;
          ......@@ -164,8 +164,8 @@ void PadImpl2D_cpu_forward_kernel(const std::array<DimSize_t, 4>& beginEndBorder
          outputValue = input[iIndex + static_cast<std::size_t>(iy)*dims[3] + static_cast<std::size_t>(ix)];
          }
          else if (borderType == PadBorderType::Wrap) {
          std::int32_t ix = (static_cast<std::int32_t>(dims[3]) + static_cast<std::int32_t>(ox) - static_cast<std::int32_t>(beginEndBorders[3])) % static_cast<std::int32_t>(dims[3]);
          std::int32_t iy = (static_cast<std::int32_t>(dims[2]) + static_cast<std::int32_t>(oy) - static_cast<std::int32_t>(beginEndBorders[1])) % static_cast<std::int32_t>(dims[2]);
          std::int32_t ix = (static_cast<std::int32_t>(dims[3]) + static_cast<std::int32_t>(ox) - static_cast<std::int32_t>(beginEndBorders[1])) % static_cast<std::int32_t>(dims[3]);
          std::int32_t iy = (static_cast<std::int32_t>(dims[2]) + static_cast<std::int32_t>(oy) - static_cast<std::int32_t>(beginEndBorders[0])) % static_cast<std::int32_t>(dims[2]);
          outputValue = input[iIndex + static_cast<std::size_t>(iy)*dims[3] + static_cast<std::size_t>(ix)];
          }
          ......
          unit_tests/operator/Test_PadImpl.cpp
          + 1
          − 1
          View file @ 3d0fd068
          ......@@ -134,7 +134,7 @@ TEST_CASE("[cpu/operator] Pad(forward)", "[Pad][CPU]") {
          SECTION("Asymmetric Pad") {
          const int pv = 0; // pad value
          std::shared_ptr<Node> myPad = Pad<2>({0, 1, 1, 0}, "mypad", PadBorderType::Constant, static_cast<double>(pv));
          std::shared_ptr<Node> myPad = Pad<2>({1, 0, 0, 1}, "mypad", PadBorderType::Constant, static_cast<double>(pv));
          auto op = std::static_pointer_cast<OperatorTensor>(myPad -> getOperator());
          std::shared_ptr<Tensor> myInput = std::make_shared<Tensor>(Array4D<int,2,3,5,5> { //NCHW
          {
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment

          Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent