NHWC DepthToSpace U8 and its transformation #23784

yihonglyu · 2025-02-21T15:31:55Z

Description

Motivation and Context

Add tests

github-actions

You can commit the suggested changes from lintrunner.

github-actions · 2025-02-21T15:36:38Z

onnxruntime/core/graph/contrib_ops/contrib_defs.cc

+                  {input_shape.dim(0),
+                    input_shape.dim(1) / (blocksize * blocksize),
+                    input_shape.dim(2) * blocksize,
+                    input_shape.dim(3) * blocksize});
+            } else { // channels_last
+              updateOutputShape(


Suggested change

{input_shape.dim(0),

input_shape.dim(1) / (blocksize * blocksize),

input_shape.dim(2) * blocksize,

input_shape.dim(3) * blocksize});

} else { // channels_last

updateOutputShape(

{input_shape.dim(0),

input_shape.dim(1) / (blocksize * blocksize),

input_shape.dim(2) * blocksize,

input_shape.dim(3) * blocksize});

} else { // channels_last

updateOutputShape(

github-actions · 2025-02-21T15:36:38Z

onnxruntime/core/graph/contrib_ops/contrib_defs.cc

+                  {input_shape.dim(0),
+                    input_shape.dim(1) * blocksize,
+                    input_shape.dim(2) * blocksize,
+                    input_shape.dim(3) / (blocksize * blocksize)});
+            }


Suggested change

{input_shape.dim(0),

input_shape.dim(1) * blocksize,

input_shape.dim(2) * blocksize,

input_shape.dim(3) / (blocksize * blocksize)});

}

{input_shape.dim(0),

input_shape.dim(1) * blocksize,

input_shape.dim(2) * blocksize,

input_shape.dim(3) / (blocksize * blocksize)});

}

github-actions · 2025-02-21T15:36:38Z

onnxruntime/core/providers/cpu/tensor/space_depth_ops.cc

+    ORT_RETURN_IF_ERROR(InputValidationsAndOutputDimsCalc<true>(input,
+                                                          batch,
+                                                          input_depth, input_height, input_width,
+                                                          output_depth, output_height, output_width,
+                                                          false));
+


Suggested change

ORT_RETURN_IF_ERROR(InputValidationsAndOutputDimsCalc<true>(input,

batch,

input_depth, input_height, input_width,

output_depth, output_height, output_width,

false));

ORT_RETURN_IF_ERROR(InputValidationsAndOutputDimsCalc<true>(input,

batch,

input_depth, input_height, input_width,

output_depth, output_height, output_width,

false));

github-actions · 2025-02-21T15:36:38Z

onnxruntime/core/providers/cpu/tensor/space_depth_ops.cc

+    if (input.IsDataType<uint8_t>()) {
+
+      return Transpose::DoTranspose(
+        permutation, input, output, &virtual_input_shape, &virtual_output_shape, context->GetOperatorThreadPool());
+


Suggested change

if (input.IsDataType<uint8_t>()) {

return Transpose::DoTranspose(

permutation, input, output, &virtual_input_shape, &virtual_output_shape, context->GetOperatorThreadPool());

if (input.IsDataType<uint8_t>()) {

return Transpose::DoTranspose(

permutation, input, output, &virtual_input_shape, &virtual_output_shape, context->GetOperatorThreadPool());

github-actions · 2025-02-21T15:36:38Z

onnxruntime/test/contrib_ops/depth_to_space_op_test.cc

+TEST(DepthToSpaceOpTest, ContribDCR) {
+
+    constexpr int64_t N = 2, H = 3, W = 2, C = 12;
+    constexpr int64_t blocksize = 2;
+    std::vector<uint8_t> input = {
+          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
+    };
+    std::vector<int64_t> input_shape = {N, H, W, C};
+    std::vector<uint8_t> output = {
+          0,   1,   2,
+          3,   4,   5,
+         12,  13,  14,
+         15,  16,  17,
+
+          6,   7,   8,
+          9,  10,  11,
+         18,  19,  20,
+         21,  22,  23,
+
+         24,  25,  26,
+         27,  28,  29,
+         36,  37,  38,
+         39,  40,  41,
+
+         30,  31,  32,
+         33,  34,  35,
+         42,  43,  44,
+         45,  46,  47,
+
+         48,  49,  50,
+         51,  52,  53,
+         60,  61,  62,
+         63,  64,  65,
+
+         54,  55,  56,
+         57,  58,  59,
+         66,  67,  68,
+         69,  70,  71,
+
+
+         72,  73,  74,
+         75,  76,  77,
+         84,  85,  86,
+         87,  88,  89,
+
+         78,  79,  80,
+         81,  82,  83,
+         90,  91,  92,
+         93,  94,  95,
+
+         96,  97,  98,
+         99, 100, 101,
+        108, 109, 110,
+        111, 112, 113,
+
+        102, 103, 104,
+        105, 106, 107,
+        114, 115, 116,
+        117, 118, 119,
+
+        120, 121, 122,
+        123, 124, 125,
+        132, 133, 134,
+        135, 136, 137,
+
+        126, 127, 128,
+        129, 130, 131,
+        138, 139, 140,
+        141, 142, 143
+    };
+    std::vector<int64_t> output_shape = {N, H * blocksize, W * blocksize, C / (blocksize * blocksize)};
+
+    RunDepthToSpace<uint8_t>(input, input_shape, blocksize, 1, "DCR", output, output_shape);
+}


Suggested change

TEST(DepthToSpaceOpTest, ContribDCR) {

constexpr int64_t N = 2, H = 3, W = 2, C = 12;

constexpr int64_t blocksize = 2;

std::vector<uint8_t> input = {

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

};

std::vector<int64_t> input_shape = {N, H, W, C};

std::vector<uint8_t> output = {

0, 1, 2,

3, 4, 5,

12, 13, 14,

15, 16, 17,

6, 7, 8,

9, 10, 11,

18, 19, 20,

21, 22, 23,

24, 25, 26,

27, 28, 29,

36, 37, 38,

39, 40, 41,

30, 31, 32,

33, 34, 35,

42, 43, 44,

45, 46, 47,

48, 49, 50,

51, 52, 53,

60, 61, 62,

63, 64, 65,

54, 55, 56,

57, 58, 59,

66, 67, 68,

69, 70, 71,

72, 73, 74,

75, 76, 77,

84, 85, 86,

87, 88, 89,

78, 79, 80,

81, 82, 83,

90, 91, 92,

93, 94, 95,

96, 97, 98,

99, 100, 101,

108, 109, 110,

111, 112, 113,

102, 103, 104,

105, 106, 107,

114, 115, 116,

117, 118, 119,

120, 121, 122,

123, 124, 125,

132, 133, 134,

135, 136, 137,

126, 127, 128,

129, 130, 131,

138, 139, 140,

141, 142, 143

};

std::vector<int64_t> output_shape = {N, H * blocksize, W * blocksize, C / (blocksize * blocksize)};

RunDepthToSpace<uint8_t>(input, input_shape, blocksize, 1, "DCR", output, output_shape);

}

TEST(DepthToSpaceOpTest, ContribDCR) {

constexpr int64_t N = 2, H = 3, W = 2, C = 12;

constexpr int64_t blocksize = 2;

std::vector<uint8_t> input = {

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};

std::vector<int64_t> input_shape = {N, H, W, C};

std::vector<uint8_t> output = {

0, 1, 2,

3, 4, 5,

12, 13, 14,

15, 16, 17,

6, 7, 8,

9, 10, 11,

18, 19, 20,

21, 22, 23,

24, 25, 26,

27, 28, 29,

36, 37, 38,

39, 40, 41,

30, 31, 32,

33, 34, 35,

42, 43, 44,

45, 46, 47,

48, 49, 50,

51, 52, 53,

60, 61, 62,

63, 64, 65,

54, 55, 56,

57, 58, 59,

66, 67, 68,

69, 70, 71,

72, 73, 74,

75, 76, 77,

84, 85, 86,

87, 88, 89,

78, 79, 80,

81, 82, 83,

90, 91, 92,

93, 94, 95,

96, 97, 98,

99, 100, 101,

108, 109, 110,

111, 112, 113,

102, 103, 104,

105, 106, 107,

114, 115, 116,

117, 118, 119,

120, 121, 122,

123, 124, 125,

132, 133, 134,

135, 136, 137,

126, 127, 128,

129, 130, 131,

138, 139, 140,

141, 142, 143};

std::vector<int64_t> output_shape = {N, H * blocksize, W * blocksize, C / (blocksize * blocksize)};

RunDepthToSpace<uint8_t>(input, input_shape, blocksize, 1, "DCR", output, output_shape);

}

github-actions · 2025-02-21T15:36:39Z

onnxruntime/test/contrib_ops/depth_to_space_op_test.cc

+TEST(DepthToSpaceOpTest, ContribCRD) {
+
+  constexpr int64_t N = 2, H = 3, W = 2, C = 12;


Suggested change

TEST(DepthToSpaceOpTest, ContribCRD) {

constexpr int64_t N = 2, H = 3, W = 2, C = 12;

TEST(DepthToSpaceOpTest, ContribCRD) {

constexpr int64_t N = 2, H = 3, W = 2, C = 12;

github-actions · 2025-02-21T15:36:39Z

onnxruntime/test/contrib_ops/depth_to_space_op_test.cc

+  std::vector<uint8_t> input = {
+        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,


Suggested change

std::vector<uint8_t> input = {

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,

std::vector<uint8_t> input = {

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,

github-actions · 2025-02-21T15:36:39Z

onnxruntime/test/contrib_ops/depth_to_space_op_test.cc

+      120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+      132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143
+  };
+  std::vector<int64_t> input_shape = {N, H, W, C};
+  std::vector<uint8_t> output = {
+        0,   4,   8,
+        1,   5,   9,
+       12,  16,  20,
+       13,  17,  21,
+
+        2,   6,  10,
+        3,   7,  11,
+       14,  18,  22,
+       15,  19,  23,
+
+       24,  28,  32,
+       25,  29,  33,
+       36,  40,  44,
+       37,  41,  45,
+
+       26,  30,  34,
+       27,  31,  35,
+       38,  42,  46,
+       39,  43,  47,
+
+       48,  52,  56,
+       49,  53,  57,
+       60,  64,  68,
+       61,  65,  69,
+
+       50,  54,  58,
+       51,  55,  59,
+       62,  66,  70,
+       63,  67,  71,
+
+
+       72,  76,  80,
+       73,  77,  81,
+       84,  88,  92,
+       85,  89,  93,
+
+       74,  78,  82,
+       75,  79,  83,
+       86,  90,  94,
+       87,  91,  95,
+
+       96, 100, 104,
+       97, 101, 105,
+      108, 112, 116,


Suggested change

120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,

132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143

};

std::vector<int64_t> input_shape = {N, H, W, C};

std::vector<uint8_t> output = {

0, 4, 8,

1, 5, 9,

12, 16, 20,

13, 17, 21,

2, 6, 10,

3, 7, 11,

14, 18, 22,

15, 19, 23,

24, 28, 32,

25, 29, 33,

36, 40, 44,

37, 41, 45,

26, 30, 34,

27, 31, 35,

38, 42, 46,

39, 43, 47,

48, 52, 56,

49, 53, 57,

60, 64, 68,

61, 65, 69,

50, 54, 58,

51, 55, 59,

62, 66, 70,

63, 67, 71,

72, 76, 80,

73, 77, 81,

84, 88, 92,

85, 89, 93,

74, 78, 82,

75, 79, 83,

86, 90, 94,

87, 91, 95,

96, 100, 104,

97, 101, 105,

108, 112, 116,

120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,

132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143};

std::vector<int64_t> input_shape = {N, H, W, C};

std::vector<uint8_t> output = {

0, 4, 8,

1, 5, 9,

12, 16, 20,

13, 17, 21,

2, 6, 10,

3, 7, 11,

14, 18, 22,

15, 19, 23,

24, 28, 32,

25, 29, 33,

36, 40, 44,

37, 41, 45,

26, 30, 34,

27, 31, 35,

38, 42, 46,

39, 43, 47,

48, 52, 56,

49, 53, 57,

60, 64, 68,

61, 65, 69,

50, 54, 58,

51, 55, 59,

62, 66, 70,

63, 67, 71,

72, 76, 80,

73, 77, 81,

84, 88, 92,

85, 89, 93,

74, 78, 82,

75, 79, 83,

86, 90, 94,

87, 91, 95,

96, 100, 104,

97, 101, 105,

108, 112, 116,

github-actions · 2025-02-21T15:36:39Z

onnxruntime/test/contrib_ops/depth_to_space_op_test.cc

+
+       98, 102, 106,
+       99, 103, 107,
+      110, 114, 118,


Suggested change

98, 102, 106,

99, 103, 107,

110, 114, 118,

98, 102, 106,

99, 103, 107,

110, 114, 118,

github-actions · 2025-02-21T15:36:39Z

onnxruntime/test/contrib_ops/depth_to_space_op_test.cc

+      134, 138, 142,
+      135, 139, 143
+  };
+  std::vector<int64_t> output_shape = {N, H * blocksize, W * blocksize, C / (blocksize * blocksize)};


Suggested change

134, 138, 142,

135, 139, 143

};

std::vector<int64_t> output_shape = {N, H * blocksize, W * blocksize, C / (blocksize * blocksize)};

134, 138, 142,

135, 139, 143};

std::vector<int64_t> output_shape = {N, H * blocksize, W * blocksize, C / (blocksize * blocksize)};

onnxruntime/test/contrib_ops/depth_to_space_op_test.cc

@@ -0,0 +1,230 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.


yihonglyu added 6 commits February 20, 2025 11:13

[Draft] NHWC DepthToSpace U8 and its transformation

2a4a88b

[Draft] Use our own Transpose instead of Eigen one

91c1139

Revist NHWC DepthToSpace U8 and its transformation

35029a2

Add tests

Add output_shape_override for transpose

e9acabe

Use Transpose::DoTranspose in NHWC DepthToSpace

cd572f7

Remove unused code

9652b1e

github-actions bot reviewed Feb 21, 2025

View reviewed changes

github-advanced-security bot found potential problems Feb 21, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NHWC DepthToSpace U8 and its transformation #23784

NHWC DepthToSpace U8 and its transformation #23784

yihonglyu commented Feb 21, 2025

github-actions bot left a comment

github-actions bot Feb 21, 2025

github-actions bot Feb 21, 2025

github-actions bot Feb 21, 2025

github-actions bot Feb 21, 2025

github-actions bot Feb 21, 2025

github-actions bot Feb 21, 2025

github-actions bot Feb 21, 2025

github-actions bot Feb 21, 2025

github-actions bot Feb 21, 2025

github-actions bot Feb 21, 2025

		TEST(DepthToSpaceOpTest, ContribCRD) {

		constexpr int64_t N = 2, H = 3, W = 2, C = 12;

		@@ -0,0 +1,230 @@
		// Copyright (c) Microsoft Corporation. All rights reserved.

NHWC DepthToSpace U8 and its transformation #23784

Are you sure you want to change the base?

NHWC DepthToSpace U8 and its transformation #23784

Conversation

yihonglyu commented Feb 21, 2025

Description

Motivation and Context

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment

github-actions bot Feb 21, 2025

Choose a reason for hiding this comment