Skip to content

Commit 683ec42

Browse files
Revert "Unbreak dynamic shape minimal arrayref interface tests (pytorch#142091)"
This reverts commit 2bfc600. Reverted pytorch#142091 on behalf of https://github.com/atalman due to Breaks internal changes ([comment](pytorch#142091 (comment)))
1 parent f2f95ba commit 683ec42

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

test/inductor/test_aot_inductor_arrayref.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ def fail_minimal_arrayref_interface(is_skip=False):
6363
"test_add_complex": fail_minimal_arrayref_interface(is_skip=True),
6464
"test_conv_freezing": fail_minimal_arrayref_interface(is_skip=True),
6565
"test_deconv_freezing": fail_minimal_arrayref_interface(is_skip=True),
66+
"test_addmm_multiple_dynamic": fail_minimal_arrayref_interface(),
67+
"test_bmm_multiple_dynamic": fail_minimal_arrayref_interface(),
6668
"test_cond_nested": fail_minimal_arrayref_interface(),
6769
"test_cond_simple": fail_minimal_arrayref_interface(),
6870
"test_cond_symint_input": fail_minimal_arrayref_interface(),
@@ -72,7 +74,9 @@ def fail_minimal_arrayref_interface(is_skip=False):
7274
"test_cond_with_parameters": fail_minimal_arrayref_interface(),
7375
"test_cond_with_reinterpret_view_inputs_outputs": fail_minimal_arrayref_interface(),
7476
"test_cond_share_predicte": fail_stack_allocation(is_skip=True),
77+
"test_foreach_multiple_dynamic": fail_minimal_arrayref_interface(),
7578
"test_nested_tensor_from_jagged": fail_minimal_arrayref_interface(),
79+
"test_poi_multiple_dynamic": fail_minimal_arrayref_interface(),
7680
"test_while_loop_with_parameters": fail_minimal_arrayref_interface(),
7781
"test_while_loop_with_pytree_inputs": fail_stack_allocation(),
7882
# FIXME: failed with Segfault while exiting the Python runtime
@@ -84,6 +88,8 @@ def fail_minimal_arrayref_interface(is_skip=False):
8488
"test_dup_unbacked_sym_decl_with_refinement": fail_minimal_arrayref_interface(
8589
is_skip=True
8690
),
91+
# TODO: error: cannot convert ArrayRefTensor<float> to AtenTensorHandle
92+
"test_dynamic_cat": fail_minimal_arrayref_interface(),
8793
# https://github.com/pytorch/pytorch/issues/129550
8894
# https://github.com/pytorch/pytorch/issues/123691
8995
"test_dynamic_scalar": fail_minimal_arrayref_interface(is_skip=True),
@@ -98,6 +104,9 @@ def fail_minimal_arrayref_interface(is_skip=False):
98104
"test_multi_device": fail_minimal_arrayref_interface(is_skip=True),
99105
# TODO: AssertionError: unsupported Optional type in convert_arg_type: Generator
100106
"test_normal_functional": fail_stack_allocation(is_skip=True),
107+
# TODO: The same issue as https://github.com/pytorch/pytorch/issues/122978
108+
# error: cannot convert ArrayRefTensor<float> to AtenTensorHandle
109+
"test_reuse_kernel_dynamic": fail_minimal_arrayref_interface(is_skip=True),
101110
# the test segfaults
102111
"test_repeat_output": fail_stack_allocation(is_skip=True),
103112
# TODO: failed internally
@@ -128,6 +137,7 @@ def fail_minimal_arrayref_interface(is_skip=False):
128137
"test_shifted_constraint_ranges": fail_stack_allocation(is_skip=True),
129138
# https://github.com/pytorch/pytorch/issues/123691
130139
"test_amp_fallback_random": fail_minimal_arrayref_interface(is_skip=True),
140+
"test_simple_dynamic": fail_minimal_arrayref_interface(),
131141
# https://github.com/pytorch/pytorch/issues/123691
132142
"test_zero_grid_with_unbacked_symbols": fail_minimal_arrayref_interface(
133143
is_skip=True
@@ -151,6 +161,7 @@ def fail_minimal_arrayref_interface(is_skip=False):
151161
# TODO: use of undeclared identifier 'float8_e4m3fn' and 'half'
152162
"test_fp8": fail_minimal_arrayref_interface(is_skip=True),
153163
"test_size_from_multi_output": fail_stack_allocation(is_skip=True),
164+
"test_masked_select_dynamic": fail_stack_allocation(is_skip=True),
154165
"test_torchvision_transforms_functional_tensor_resize": fail_minimal_arrayref_interface(),
155166
# TODO: AttributeError: 'ShapeAsConstantBuffer' object has no attribute 'dtype'
156167
"test_symint_item": fail_minimal_arrayref_interface(is_skip=True),

torch/_inductor/codegen/cpp_wrapper_cpu.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,10 +538,10 @@ def codegen_tensor_dtype_var_decl(self, code: IndentedBuffer, name):
538538
)
539539

540540
def codegen_input_size_var_decl(self, code: IndentedBuffer, name):
541-
code.writeline(f"auto {name}_size = {name}.sizes();")
541+
code.writeline(f"int64_t* {name}_size = {name}.sizes();")
542542

543543
def codegen_input_stride_var_decl(self, code: IndentedBuffer, name):
544-
code.writeline(f"auto {name}_stride = {name}.strides();")
544+
code.writeline(f"int64_t* {name}_stride = {name}.strides();")
545545

546546
def codegen_model_kernels(self):
547547
self.prefix.writeline("namespace {")

0 commit comments

Comments
 (0)