Skip to content

Commit 6ace5a3

Browse files
Ordered the header file inclusion. Used allocate_temp instead of malloc in mean operator
1 parent e79b466 commit 6ace5a3

File tree

11 files changed

+37
-21
lines changed

11 files changed

+37
-21
lines changed

backends/cadence/fusion_g3/operators/op_cat.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
*/
88

99
#include <executorch/backends/cadence/fusion_g3/operators/operators.h>
10+
11+
#include <cstring>
12+
13+
#include <xa_nnlib_kernels_api.h>
14+
1015
#include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
1116
#include <executorch/kernels/portable/cpu/util/copy_ops_util.h>
1217
#include <executorch/runtime/kernel/kernel_includes.h>
13-
#include <xa_nnlib_kernels_api.h>
14-
#include <cstring>
1518

1619
using ::executorch::aten::Scalar;
1720
using ::executorch::aten::ScalarType;

backends/cadence/fusion_g3/operators/op_dequantize.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88

99
#include <executorch/backends/cadence/fusion_g3/operators/operators.h>
1010

11+
#include <algorithm>
12+
#include <cinttypes>
13+
#include <cmath>
14+
1115
#include <xa_nnlib_kernels_api.h>
1216

1317
#include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
1418
#include <executorch/kernels/portable/cpu/util/reduce_util.h>
1519
#include <executorch/runtime/kernel/kernel_includes.h>
16-
#include <algorithm>
17-
#include <cinttypes>
18-
#include <cmath>
1920

2021
using ::executorch::aten::Scalar;
2122
using ::executorch::aten::ScalarType;

backends/cadence/fusion_g3/operators/op_div.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#include <executorch/backends/cadence/fusion_g3/operators/operators.h>
1010

11+
#include <cmath>
12+
1113
#include <xa_nnlib_kernels_api.h>
1214

1315
#include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
@@ -16,7 +18,6 @@
1618
#include <executorch/kernels/portable/cpu/util/math_util.h>
1719
#include <executorch/runtime/kernel/kernel_includes.h>
1820
#include <executorch/runtime/platform/assert.h>
19-
#include <cmath>
2021

2122
using ::executorch::aten::Scalar;
2223
using ::executorch::aten::ScalarType;

backends/cadence/fusion_g3/operators/op_exp.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
*/
88

99
#include <executorch/backends/cadence/fusion_g3/operators/operators.h>
10+
11+
#include <cmath>
12+
13+
#include <xa_nnlib_kernels_api.h>
14+
1015
#include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
1116
#include <executorch/kernels/portable/cpu/pattern/pattern.h>
1217
#include <executorch/runtime/kernel/kernel_includes.h>
13-
#include <xa_nnlib_kernels_api.h>
14-
#include <cmath>
1518

1619
using ::executorch::aten::Scalar;
1720
using ::executorch::aten::ScalarType;

backends/cadence/fusion_g3/operators/op_mean.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,10 @@ Tensor& mean_dim_out(
146146
scratch_size *= inp_shape[i];
147147
}
148148

149-
void* __restrict__ p_scratch_in =
150-
(void* __restrict__)malloc(scratch_size * sizeof(float));
149+
executorch::runtime::Result<void*> temp_mem =
150+
ctx.allocate_temp(scratch_size * sizeof(float));
151+
152+
void* __restrict__ p_scratch_in = (void* __restrict__)(temp_mem.get());
151153

152154
XT_KERNEL_CHECK(
153155
ctx,

backends/cadence/fusion_g3/operators/op_native_layer_norm.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
*/
88

99
#include <executorch/backends/cadence/fusion_g3/operators/operators.h>
10+
11+
#include <cmath>
12+
#include <tuple>
13+
14+
#include <xa_nnlib_kernels_api.h>
15+
1016
#include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
1117
#include <executorch/kernels/portable/cpu/util/normalization_ops_util.h>
1218
#include <executorch/kernels/portable/cpu/vec_ops.h>
1319
#include <executorch/runtime/kernel/kernel_includes.h>
14-
#include <xa_nnlib_kernels_api.h>
15-
#include <cmath>
16-
#include <tuple>
1720

1821
using Tensor = ::executorch::aten::Tensor;
1922
using ScalarType = ::executorch::aten::ScalarType;

backends/cadence/fusion_g3/operators/op_permute_copy.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <xa_nnlib_kernels_api.h>
1212

1313
#include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
14-
1514
#include <executorch/kernels/portable/cpu/util/copy_ops_util.h>
1615
#include <executorch/runtime/kernel/kernel_includes.h>
1716

backends/cadence/fusion_g3/operators/op_quantize.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9+
#include <executorch/backends/cadence/fusion_g3/operators/operators.h>
10+
911
#include <algorithm>
1012
#include <cinttypes>
1113
#include <cmath>
1214

13-
#include <executorch/backends/cadence/fusion_g3/operators/operators.h>
14-
1515
#include <xa_nnlib_kernels_api.h>
1616

1717
#include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>

backends/cadence/fusion_g3/operators/op_slice_copy.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88

99
#include <executorch/backends/cadence/fusion_g3/operators/operators.h>
1010

11+
#include <cstring>
12+
1113
#include <xa_nnlib_kernels_api.h>
1214

1315
#include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
1416
#include <executorch/kernels/portable/cpu/util/slice_util.h>
1517
#include <executorch/runtime/kernel/kernel_includes.h>
16-
#include <cstring>
1718

1819
using ::executorch::aten::Scalar;
1920
using ::executorch::aten::ScalarType;

backends/cadence/fusion_g3/operators/op_softmax.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
*/
88

99
#include <executorch/backends/cadence/fusion_g3/operators/operators.h>
10+
11+
#include <cmath>
12+
13+
#include <xa_nnlib_kernels_api.h>
14+
1015
#include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
1116
#include <executorch/kernels/portable/cpu/util/activation_ops_util.h>
1217
#include <executorch/kernels/portable/cpu/util/functional_util.h>
1318
#include <executorch/kernels/portable/cpu/util/reduce_util.h>
1419
#include <executorch/runtime/kernel/kernel_includes.h>
15-
#include <xa_nnlib_kernels_api.h>
16-
#include <cmath>
1720

1821
using ::executorch::aten::Scalar;
1922
using ::executorch::aten::ScalarType;

0 commit comments

Comments
 (0)