saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-26 22:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clear cache when moving to next channel (#2253)

Browse source
This commit is contained in:
Ashwini Khade 2019-10-24 16:07:45 -07:00 committed by GitHub
parent 7494500221
commit e250e51e65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
onnxruntime/core/providers/cpu/tensor/upsample.cc
View file

@ -565,7 +565,7 @@ void ResizeBiCubic(
auto x_interpolation_result = CubicInterpolation1D(Xdata, x_int, y_val,
input_height, input_width, coeff_x, x_coeff_sum,
interpolation_result_cache);
result += x_interpolation_result * coeff_y[i]/y_coeff_sum;
result += x_interpolation_result * coeff_y[i] / y_coeff_sum;
}
Ydata[y * output_width + x] = static_cast<T>(result);
@ -574,6 +574,9 @@ void ResizeBiCubic(
Xdata += input_height * input_width;
Ydata += output_height * output_width;
// clear the cache when moving to the next channel
coeff_to_1Dinterpolation_map.clear();
}
}
}

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

@ -60,7 +60,7 @@ class UpsampleBase {
exclude_outside_ = info.GetAttrOrDefault<int64_t>("exclude_outside", 0) == 0 ? false : true;
if (exclude_outside_ == 1 && mode_ != CUBIC) {
ORT_THROW("exclude_outside can be set to 1 only when mode is CUBIC. Current mode is set to " + mode );
ORT_THROW("exclude_outside can be set to 1 only when mode is CUBIC. Current mode is set to " + mode);
}
// after version 11 update, this optimization is no longer applicable for all the available modes...
@ -79,7 +79,7 @@ class UpsampleBase {
const Tensor* scale;
bool get_scale = info.TryGetConstantInput(scales_input_idx_, &scale);
if (get_scale&& scale->Shape().Size() > 0) {
if (get_scale && scale->Shape().Size() > 0) {
ParseScalesData(scale, scales_);
scales_cached_ = true;
}

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

@ -584,6 +584,55 @@ TEST(ResizeOpTest, ResizeOpCubicUpSampleTest) {
test.Run();
}
TEST(ResizeOpTest, ResizeOpCubicUpSampleTest_MultiChannel) {
OpTester test("Resize", 11);
std::vector<float> scales{};
std::vector<int64_t> sizes{1, 2, 9, 9};
std::vector<float> roi{};
test.AddAttribute("mode", "cubic");
const int64_t N = 1, C = 2, H = 4, W = 4;
std::vector<float> X = {
0.0f, 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, 17.0f, 18.0f, 19.0f,
20.0f, 21.0f, 22.0f, 23.0f,
24.0f, 25.0f, 26.0f, 27.0f,
28.0f, 29.0f, 30.0f, 31.0f,
};
test.AddInput<float>("X", {N, C, H, W}, X);
test.AddInput<float>("roi", {0}, roi);
test.AddInput<float>("scales", {0}, scales);
test.AddInput<int64_t>("sizes", {4}, sizes);
std::vector<float> Y = {-0.543341f, -0.308515f, 0.0807175f, 0.644203f, 1.06533f, 1.48645f, 2.04994f, 2.43917f, 2.674f,
0.395961f, 0.630787f, 1.02002f, 1.5835f, 2.00463f, 2.42575f, 2.98924f, 3.37847f, 3.6133f,
1.95289f, 2.18772f, 2.57695f, 3.14043f, 3.56156f, 3.98268f, 4.54617f, 4.9354f, 5.17023f,
4.20683f, 4.44166f, 4.83089f, 5.39437f, 5.8155f, 6.23662f, 6.80011f, 7.18934f, 7.42417f,
5.89133f, 6.12616f, 6.51539f, 7.07887f, 7.5f, 7.92112f, 8.48461f, 8.87384f, 9.10867f,
7.57583f, 7.81066f, 8.19989f, 8.76337f, 9.1845f, 9.60562f, 10.1691f, 10.5583f, 10.7932f,
9.82977f, 10.0646f, 10.4538f, 11.0173f, 11.4384f, 11.8596f, 12.423f, 12.8123f, 13.0471f,
11.3867f, 11.6215f, 12.0108f, 12.5742f, 12.9954f, 13.4165f, 13.98f, 14.3692f, 14.604f,
12.326f, 12.5608f, 12.9501f, 13.5135f, 13.9347f, 14.3558f, 14.9193f, 15.3085f, 15.5433f,
15.4567f, 15.6915f, 16.0807f, 16.6442f, 17.0653f, 17.4865f, 18.0499f, 18.4392f, 18.674f,
16.396f, 16.6308f, 17.02f, 17.5835f, 18.0046f, 18.4258f, 18.9892f, 19.3785f, 19.6133f,
17.9529f, 18.1877f, 18.5769f, 19.1404f, 19.5616f, 19.9827f, 20.5462f, 20.9354f, 21.1702f,
20.2068f, 20.4417f, 20.8309f, 21.3944f, 21.8155f, 22.2366f, 22.8001f, 23.1893f, 23.4242f,
21.8913f, 22.1262f, 22.5154f, 23.0789f, 23.5f, 23.9211f, 24.4846f, 24.8738f, 25.1087f,
23.5758f, 23.8107f, 24.1999f, 24.7634f, 25.1845f, 25.6056f, 26.1691f, 26.5583f, 26.7932f,
25.8298f, 26.0646f, 26.4538f, 27.0173f, 27.4384f, 27.8596f, 28.423f, 28.8123f, 29.0471f,
27.3867f, 27.6215f, 28.0108f, 28.5742f, 28.9954f, 29.4165f, 29.98f, 30.3692f, 30.604f,
28.326f, 28.5608f, 28.9501f, 29.5135f, 29.9347f, 30.3558f, 30.9193f, 31.3085f, 31.5433f,};
test.AddOutput<float>("Y", {N, C, sizes[2], sizes[3]}, Y);
test.Run();
}
TEST(ResizeOpTest, ResizeOpCubicUpSampleTest_tf_half_pixel_for_nn) {
OpTester test("Resize", 11);
std::vector<float> scales{1.0f, 1.0f, 2.0f, 2.0f};