Skip to content

Commit e9c83e2

Browse files
author
Zonglin Peng
committed
miss 1 rebase
1 parent 45cb515 commit e9c83e2

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

backends/cadence/reference/operators/quantized_ops.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,8 @@ inline __attribute__((always_inline)) void quantized_linear_per_channel_(
8989
// weight comes in shape [out_dim, in_dim]
9090
// output comes in empty with shape [leading_dims, out_dim]
9191
// Perform matrix multiply (M x N) x (N x P)' => M x P
92-
<<<<<<< HEAD
9392
int64_t leading_dims =
9493
executorch::runtime::getLeadingDims(src, src.dim() - 1);
95-
=======
96-
int64_t leading_dims = getLeadingDims(src, src.dim() - 1);
97-
>>>>>>> 74283da5a (Populate cadence cpu ops (#7165))
9894
const int64_t out_dim = weight.size(0); // = out_dim
9995
const int64_t in_dim = weight.size(1); // = in_dim
10096

0 commit comments

Comments
 (0)