saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-20 19:12:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle the case when scales is constant but size is 0 (#2218)

Browse source
This commit is contained in:
Ashwini Khade 2019-10-21 23:28:43 -07:00 committed by Changming Sun
parent 856c6cae0a
commit b23cc04f34
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
onnxruntime/core/providers/cpu/tensor/upsample.h
View file

@ -79,7 +79,7 @@ class UpsampleBase {
const Tensor* scale;
bool get_scale = info.TryGetConstantInput(scales_input_idx_, &scale);
if (get_scale) {
if (get_scale&& scale->Shape().Size() > 0) {
ParseScalesData(scale, scales_);
scales_cached_ = true;
}
@ -214,7 +214,7 @@ class UpsampleBase {
}
}
if (UpsampleMode::LINEAR == mode) {
if (UpsampleMode::LINEAR == mode || UpsampleMode::CUBIC == mode) {
ORT_ENFORCE(scales.size() == 2 || (scales.size() == 4 && scales[0] == 1 && scales[1] == 1),
"'Linear' mode only support 2-D inputs ('Bilinear') or 4-D inputs "
"with the corresponding outermost 2 scale values being 1 in the ",

30
onnxruntime/test/providers/cpu/tensor/resize_op_test.cc
View file

@ -441,6 +441,36 @@ TEST(ResizeOpTest, ResizeOpCubicDownSampleTest) {
test.Run();
}
TEST(ResizeOpTest, ResizeOpLineartDownSampleTest_exclude_outside) {
OpTester test("Resize", 11);
std::vector<float> roi{};
std::vector<float> scales{0.8f, 0.8f};
std::vector<int64_t> sizes{};
test.AddAttribute("mode", "cubic");
test.AddAttribute("exclude_outside", static_cast<int64_t>(1));
test.AddAttribute("cubic_coeff_a", -0.5f);
const int64_t H = 4, W = 4;
std::vector<float> X = {
1.0f, 2.0f, 3.0f, 4.0f,
5.0f, 6.0f, 7.0f, 8.0f,
9.0f, 10.0f, 11.0f, 12.0f,
13.0f, 14.0f, 15.0f, 16.0f};
test.AddInput<float>("X", {H, W}, X);
test.AddInput<float>("roi", {0}, roi);
test.AddInput<float>("scales", {2}, scales);
std::vector<float> Y = {1.36813f, 2.6695f, 4.01334f,
6.57363f, 7.875f, 9.21884f,
11.949f, 13.2503f, 14.5942f};
test.AddOutput<float>("Y", {(int64_t)(H * scales[0]), (int64_t)(W * scales[1])}, Y);
test.Run();
}
TEST(ResizeOpTest, ResizeOpCubicDownSampleTest_coeff) {
OpTester test("Resize", 11);
std::vector<float> scales{1.0f, 1.0f, 0.8f, 0.8f};