Skip to content

Commit 551f6b7

Browse files
committed
support channels last dim order in xnnpack
1 parent f803f92 commit 551f6b7

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

backends/xnnpack/runtime/XNNExecutor.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,13 @@ ET_NODISCARD Error XNNExecutor::prepare_args(EValue** args) {
114114
XNN_MAX_TENSOR_DIMS,
115115
num_dims);
116116

117+
<<<<<<< HEAD
117118
for (int j = 0; j < num_dims; ++j) {
118119
dims[j] = tensor->size(static_cast<int>(dim_order[j]));
120+
=======
121+
for (int i = 0; i < num_dims; ++i) {
122+
dims[i] = tensor->size(static_cast<int>(dim_order[i]));
123+
>>>>>>> b5785b2fda (support channels last dim order in xnnpack)
119124
}
120125
status =
121126
xnn_reshape_external_value(runtime_.get(), ext_id, num_dims, dims);
@@ -224,9 +229,15 @@ ET_NODISCARD Error XNNExecutor::resize_outputs(EValue** args) const {
224229
Internal,
225230
"Failed to retrieve dim order from tensor!");
226231

232+
<<<<<<< HEAD
227233
for (int j = 0; j < num_dim; ++j) {
228234
expected_output_size[static_cast<int>(dim_order[j])] =
229235
static_cast<SizesType>(dims[j]);
236+
=======
237+
for (int i = 0; i < num_dim; ++i) {
238+
expected_output_size[static_cast<int>(dim_order[i])] =
239+
static_cast<SizesType>(dims[i]);
240+
>>>>>>> b5785b2fda (support channels last dim order in xnnpack)
230241
}
231242

232243
executorch::aten::ArrayRef<SizesType> output_size{

0 commit comments

Comments
 (0)