Skip to content

Commit 8317089

Browse files
sammarden-metasammarden-meta
authored
Merge branch 'main' into export-D75488427
2 parents cf23d5d + 809a1fd commit 8317089

File tree

14 files changed

+329
-208
lines changed

14 files changed

+329
-208
lines changed

‎backends/cadence/aot/replace_ops.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,8 +939,8 @@ def replace_conv_with_nhwc_conv(self, graph_module: torch.fx.GraphModule):
939939

940940
# This pass needs to be reworked to be compatible with PT2. It is an optimization
941941
# pass anyway, so move it to opt level 2.
942-
# TODO(matthiascremon): update and improve this pass.
943-
@register_cadence_pass(CadencePassAttribute(opt_level=2))
942+
# TODO: T213724613 update and improve this pass.
943+
# @register_cadence_pass(CadencePassAttribute(opt_level=2))
944944
class ReplaceConvWithChannelLastConvPass(ExportPass):
945945
"""
946946
Replace the ATen convolution op with custom conv op with NCHW or NHWC layout

‎backends/cadence/utils/facto_util.py

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
MAX_CASES = 50
2121

2222

23-
def apply_tensor_contraints(op_name: str, tensor_constraints: list[object]) -> None:
24-
additional_tensor_constraints = [
23+
def apply_tensor_contraints(op_name: str, index: int) -> list[object]:
24+
tensor_constraints = [
2525
cp.Dtype.In(lambda deps: [torch.int, torch.float]),
2626
cp.Dtype.NotIn(lambda deps: [torch.int64, torch.float64]),
2727
cp.Value.Ge(lambda deps, dtype, struct: -(2**4)),
@@ -33,17 +33,28 @@ def apply_tensor_contraints(op_name: str, tensor_constraints: list[object]) -> N
3333

3434
match op_name:
3535
case "where.self":
36-
additional_tensor_constraints = [
37-
cp.Dtype.In(lambda deps: [torch.float, torch.int, torch.bool]),
38-
cp.Dtype.NotIn(lambda deps: [torch.int64, torch.float64]),
39-
cp.Value.Ge(lambda deps, dtype, struct: -(2**4)),
40-
cp.Value.Le(lambda deps, dtype, struct: 2**4),
41-
cp.Rank.Ge(lambda deps: 1),
42-
cp.Size.Ge(lambda deps, r, d: 1),
43-
cp.Size.Le(lambda deps, r, d: 2**9),
44-
]
36+
if index == 0: # condition
37+
tensor_constraints = [
38+
cp.Dtype.In(lambda deps: [torch.bool]),
39+
cp.Dtype.NotIn(lambda deps: [torch.int64, torch.float64]),
40+
cp.Value.Ge(lambda deps, dtype, struct: -(2**4)),
41+
cp.Value.Le(lambda deps, dtype, struct: 2**4),
42+
cp.Rank.Ge(lambda deps: 1),
43+
cp.Size.Ge(lambda deps, r, d: 1),
44+
cp.Size.Le(lambda deps, r, d: 2**9),
45+
]
46+
else:
47+
tensor_constraints = [
48+
cp.Dtype.In(lambda deps: [torch.float, torch.int]),
49+
cp.Dtype.NotIn(lambda deps: [torch.int64, torch.float64]),
50+
cp.Value.Ge(lambda deps, dtype, struct: -(2**4)),
51+
cp.Value.Le(lambda deps, dtype, struct: 2**4),
52+
cp.Rank.Ge(lambda deps: 1),
53+
cp.Size.Ge(lambda deps, r, d: 1),
54+
cp.Size.Le(lambda deps, r, d: 2**9),
55+
]
4556
case "sigmoid.default":
46-
additional_tensor_constraints.extend(
57+
tensor_constraints.extend(
4758
[
4859
cp.Dtype.In(lambda deps: [torch.float]),
4960
cp.Rank.Le(lambda deps: 2**2),
@@ -52,7 +63,7 @@ def apply_tensor_contraints(op_name: str, tensor_constraints: list[object]) -> N
5263
]
5364
)
5465
case "rsqrt.default":
55-
additional_tensor_constraints.extend(
66+
tensor_constraints.extend(
5667
[
5768
cp.Dtype.In(lambda deps: [torch.float]),
5869
cp.Rank.Le(lambda deps: 2**2),
@@ -63,35 +74,35 @@ def apply_tensor_contraints(op_name: str, tensor_constraints: list[object]) -> N
6374
]
6475
)
6576
case "mean.dim":
66-
additional_tensor_constraints.extend(
77+
tensor_constraints.extend(
6778
[
6879
cp.Dtype.In(lambda deps: [torch.float]),
6980
cp.Rank.Le(lambda deps: 2**2),
7081
]
7182
)
7283
case "exp.default":
73-
additional_tensor_constraints.extend(
84+
tensor_constraints.extend(
7485
[
7586
cp.Rank.Le(lambda deps: 2**3),
7687
cp.Value.Ge(lambda deps, dtype, struct: -(2**2)),
7788
cp.Value.Le(lambda deps, dtype, struct: 2**2),
7889
]
7990
)
8091
case "slice_copy.Tensor":
81-
additional_tensor_constraints.extend(
92+
tensor_constraints.extend(
8293
[
8394
cp.Rank.Le(lambda deps: 2),
8495
cp.Value.Ge(lambda deps, dtype, struct: 1),
8596
cp.Value.Le(lambda deps, dtype, struct: 2),
8697
]
8798
)
8899
case _:
89-
additional_tensor_constraints.extend(
100+
tensor_constraints.extend(
90101
[
91102
cp.Rank.Le(lambda deps: 2**2),
92103
]
93104
)
94-
tensor_constraints.extend(additional_tensor_constraints)
105+
return tensor_constraints
95106

96107

97108
def apply_scalar_contraints(op_name: str) -> list[ScalarDtype]:
@@ -107,9 +118,6 @@ def apply_scalar_contraints(op_name: str) -> list[ScalarDtype]:
107118
def facto_testcase_gen(op_name: str) -> List[Tuple[List[str], OrderedDict[str, str]]]:
108119
# minimal example to test add.Tensor using FACTO
109120
spec = SpecDictDB[op_name]
110-
tensor_constraints = []
111-
# common tensor constraints
112-
apply_tensor_contraints(op_name, tensor_constraints)
113121

114122
for index, in_spec in enumerate(copy.deepcopy(spec.inspec)):
115123
if in_spec.type.is_scalar():
@@ -142,7 +150,9 @@ def facto_testcase_gen(op_name: str) -> List[Tuple[List[str], OrderedDict[str, s
142150
]
143151
)
144152
elif in_spec.type.is_tensor():
145-
spec.inspec[index].constraints.extend(tensor_constraints)
153+
spec.inspec[index].constraints.extend(
154+
apply_tensor_contraints(op_name, index)
155+
)
146156
elif in_spec.type.is_dim_list():
147157
spec.inspec[index].constraints.extend(
148158
[

‎backends/vulkan/test/op_tests/cases.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,6 +1147,7 @@ def get_reduce_op_inputs():
11471147
"aten.hardsigmoid.default",
11481148
"aten.leaky_relu.default",
11491149
"aten.round.default",
1150+
"aten.tan.default",
11501151
]
11511152
)
11521153
def get_unary_ops_inputs():

‎backends/xnnpack/third-party/cpuinfo

‎extension/apple/ExecuTorch/Exported/ExecuTorch+Tensor.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public extension Tensor {
5454
func withUnsafeBytes<T: Scalar, R>(_ body: (UnsafeBufferPointer<T>) throws -> R) throws -> R {
5555
guard dataType == T.dataType else { throw Error(code: .invalidArgument) }
5656
var result: Result<R, Error>?
57-
bytes { pointer, count, _ in
57+
__bytes { pointer, count, _ in
5858
result = Result { try body(
5959
UnsafeBufferPointer(
6060
start: pointer.assumingMemoryBound(to: T.self),
@@ -74,7 +74,7 @@ public extension Tensor {
7474
func withUnsafeMutableBytes<T: Scalar, R>(_ body: (UnsafeMutableBufferPointer<T>) throws -> R) throws -> R {
7575
guard dataType == T.dataType else { throw Error(code: .invalidArgument) }
7676
var result: Result<R, Error>?
77-
mutableBytes { pointer, count, _ in
77+
__mutableBytes { pointer, count, _ in
7878
result = Result { try body(
7979
UnsafeMutableBufferPointer(
8080
start: pointer.assumingMemoryBound(to: T.self),

‎extension/apple/ExecuTorch/Exported/ExecuTorchTensor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ __attribute__((deprecated("This API is experimental.")))
176176
* - and the data type.
177177
*/
178178
- (void)bytesWithHandler:(NS_NOESCAPE void (^)(const void *pointer, NSInteger count, ExecuTorchDataType dataType))handler
179-
NS_SWIFT_NAME(bytes(_:));
179+
NS_REFINED_FOR_SWIFT;
180180

181181
/**
182182
* Executes a block with a pointer to the tensor's mutable byte data.
@@ -187,7 +187,7 @@ __attribute__((deprecated("This API is experimental.")))
187187
* - and the data type.
188188
*/
189189
- (void)mutableBytesWithHandler:(NS_NOESCAPE void (^)(void *pointer, NSInteger count, ExecuTorchDataType dataType))handler
190-
NS_SWIFT_NAME(mutableBytes(_:));
190+
NS_REFINED_FOR_SWIFT;
191191

192192
/**
193193
* Resizes the tensor to a new shape.

0 commit comments

Comments
 (0)