Skip to content

Commit

Permalink
Added CUBIC type support for resize op
Browse files Browse the repository at this point in the history
Type: New Feature
Signed-off-by: Feiyue Chen <[email protected]>
  • Loading branch information
chenfeiyue-cfy committed Aug 5, 2024
1 parent fcdf223 commit d4bd353
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 1 deletion.
2 changes: 1 addition & 1 deletion include/tim/vx/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ enum class OverflowPolicy { WRAP, SATURATE };

enum class RoundingPolicy { TO_ZERO, RTNE };

enum class ResizeType { NEAREST_NEIGHBOR, BILINEAR, AREA };
enum class ResizeType { NEAREST_NEIGHBOR, BILINEAR, AREA, CUBIC};

enum class DataLayout {
ANY,
Expand Down
62 changes: 62 additions & 0 deletions src/tim/vx/ops/resize_cubic_test.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/****************************************************************************
*
* Copyright (c) 2020-2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
*****************************************************************************/
#include "tim/vx/context.h"
#include "tim/vx/graph.h"
#include "tim/vx/ops/resize.h"
#include "test_utils.h"
#include "gtest/gtest.h"

TEST(Resize, Cubic_float) {
auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph();

tim::vx::ShapeType input_shape({4, 4});
tim::vx::ShapeType output_shape({3, 3});
tim::vx::TensorSpec input_spec(tim::vx::DataType::FLOAT32, input_shape,
tim::vx::TensorAttribute::INPUT);
tim::vx::TensorSpec output_spec(tim::vx::DataType::FLOAT32, output_shape,
tim::vx::TensorAttribute::OUTPUT);

auto input_tensor = graph->CreateTensor(input_spec);
auto output_tensor = graph->CreateTensor(output_spec);

std::vector<float> in_data = {1.0, 2.0, 3.0, 4.0, 5.0, 6.0,7.0, 8.0,
9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0};
std::vector<float> golden = {1.5439453125, 2.935546875, 4.328125,
7.109375, 8.5, 9.890625,
12.671875, 14.0625, 15.453125};

EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data()));

auto op = graph->CreateOperation<tim::vx::ops::Resize>(
tim::vx::ResizeType::CUBIC, 0, false, true, 3, 3);
(*op).BindInputs({input_tensor}).BindOutputs({output_tensor});

EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run());

std::vector<float> output(golden.size());
EXPECT_TRUE(output_tensor->CopyDataFromTensor(output.data()));
EXPECT_TRUE(ArraysMatch(golden, output, 3e-3f));
}
2 changes: 2 additions & 0 deletions src/tim/vx/type_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ vsi_enum TranslateResizeType(ResizeType type) {
return VSI_NN_INTERPOLATION_BILINEAR;
case ResizeType::AREA:
return VSI_NN_INTERPOLATION_AREA;
case ResizeType::CUBIC:
return VSI_NN_INTERPOLATION_CUBIC;
}
return VSI_NN_INTERPOLATION_NEAREST_NEIGHBOR;
}
Expand Down

0 comments on commit d4bd353

Please sign in to comment.