From 359c0650d4e216863aff0db00453a67e791de080 Mon Sep 17 00:00:00 2001 From: wandongdong Date: Sat, 31 Oct 2020 04:18:31 -0700 Subject: [PATCH] fix reshape bug --- .../src/runtime/kernel/opencl/cl/reshape.cl | 56 +++++++++---------- .../runtime/kernel/opencl/reshape_tests.cc | 36 ++++++++---- 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/mindspore/lite/src/runtime/kernel/opencl/cl/reshape.cl b/mindspore/lite/src/runtime/kernel/opencl/cl/reshape.cl index c22970b98b..88bf756e83 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/cl/reshape.cl +++ b/mindspore/lite/src/runtime/kernel/opencl/cl/reshape.cl @@ -13,43 +13,37 @@ __kernel void reshape_NHWC4(__read_only image2d_t src_data, __write_only image2d } int CI4 = UP_DIV(src_size.x, C4NUM); int CI4_rem = src_size.x % C4NUM; + CI4_rem = (CI4_rem == 0) ? C4NUM : CI4_rem; int in_img_x = CI4 * src_size.y; FLT4 res = (FLT4)(0.0f); FLT tmp[4]; FLT res_tmp[4]; int gcnt = 0; - int start = 0; - int i = 0; - int j = 0; - int n = 0; - int cond = (((int)(CO4_rem > 0)) << 1) | (CI4_rem > 0); - switch (cond) { - case 1: - start = ((X / CO4 * dst_size.z + min(dst_size.z, (X % CO4) * C4NUM)) + dst_size.w * Y); - gcnt = start / src_size.x * CI4 + (start % src_size.x) / C4NUM; - start = (CI4 > 1 && gcnt < CI4) ? 0 : ((X + Y * dst_size.x) * C4NUM) % src_size.x % C4NUM; - for (i = 0, n = 0, j = start; i < 4; ++n, j = 0) { - int X_src = (gcnt + n) % in_img_x; - res = READ_IMAGE(src_data, smp_zero, (int2)(X_src, (gcnt + n) / in_img_x)); - tmp[0] = res.x; - tmp[1] = res.y; - tmp[2] = res.z; - tmp[3] = res.w; - int k = (X_src % CI4) == (CI4 - 1) ? CI4_rem : 4; - for (; j < k && i < 4; ++j, ++i) { - res_tmp[i] = tmp[j]; - } + if (CO4_rem == 0 && ((CI4_rem & 0x3) == 0)) { + gcnt = X + dst_size.x * Y; + res = READ_IMAGE(src_data, smp_zero, (int2)(gcnt % in_img_x, gcnt / in_img_x)); + WRITE_IMAGE(dst_data, (int2)(X, Y), res); + } else { + int start = ((X / CO4 * dst_size.z + min(dst_size.z, (X % CO4) * C4NUM)) + dst_size.w * Y); + gcnt = start / src_size.x * CI4 + (start % src_size.x) / C4NUM; + start = start % src_size.x % C4NUM; + for (int i = 0, n = 0, j = start; i < C4NUM; ++n, j = 0) { + int X_src = (gcnt + n) % in_img_x; + res = READ_IMAGE(src_data, smp_zero, (int2)(X_src, (gcnt + n) / in_img_x)); + tmp[0] = res.x; + tmp[1] = res.y; + tmp[2] = res.z; + tmp[3] = res.w; + int k = (X_src % CI4) == (CI4 - 1) ? CI4_rem : C4NUM; + for (; j < k && i < C4NUM; ++j, ++i) { + res_tmp[i] = tmp[j]; } - res.x = res_tmp[0]; - res.y = res_tmp[1]; - res.z = res_tmp[2]; - res.w = res_tmp[3]; - WRITE_IMAGE(dst_data, (int2)(X, Y), res); - break; - default: - gcnt = X + dst_size.x * Y; - res = READ_IMAGE(src_data, smp_zero, (int2)(gcnt % in_img_x, gcnt / in_img_x)); - WRITE_IMAGE(dst_data, (int2)(X, Y), res); + } + res.x = res_tmp[0]; + res.y = res_tmp[1]; + res.z = res_tmp[2]; + res.w = res_tmp[3]; + WRITE_IMAGE(dst_data, (int2)(X, Y), res); } } diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/reshape_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/opencl/reshape_tests.cc index 46f1636373..7f7340ad08 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/reshape_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/reshape_tests.cc @@ -137,16 +137,6 @@ TEST_F(TestReshapeOpenCL, Reshape4D2DFp32) { RunTestCaseReshape(shape_in, shape_out, input_data.data(), output_data.data(), false); } -TEST_F(TestReshapeOpenCL, Reshape4DFp32Rem10) { - std::vector shape_in = {1, 3, 2, 4}; - std::vector shape_out = {1, 4, 2, 3}; - std::vector input_data = {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}; - std::vector output_data = {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}; - - RunTestCaseReshape(shape_in, shape_out, input_data.data(), output_data.data(), false); -} TEST_F(TestReshapeOpenCL, Reshape4DFp32Rem01Test0) { std::vector shape_in = {1, 4, 2, 3}; std::vector shape_out = {1, 3, 2, 4}; @@ -183,6 +173,32 @@ TEST_F(TestReshapeOpenCL, Reshape4DFp32Rem01Test2) { RunTestCaseReshape(shape_in, shape_out, input_data.data(), output_data.data(), false); } +TEST_F(TestReshapeOpenCL, Reshape4DFp32Rem10) { + std::vector shape_in = {1, 5, 5, 8}; + std::vector shape_out = {8, 1, 5, 5}; + std::vector input_data = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199}; + std::vector output_data = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199}; + + RunTestCaseReshape(shape_in, shape_out, input_data.data(), output_data.data(), false); +} TEST_F(TestReshapeOpenCL, Reshape4DFp32Rem11) { std::vector shape_in = {1, 3, 2, 5}; std::vector shape_out = {1, 5, 2, 3};