Merge branch 'main' into gh/swolchok/136/head

Author: swolchok

examples/cadence/operators/TARGETS

@@ -1,26 +1,5 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree.
-
-load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
+load("targets.bzl", "define_common_targets")
 
 oncall("odai_jarvis")
 
-
-python_unittest(
-    name = "test_add_op",
-    srcs = [
-        "test_add_op.py",
-    ],
-    typing = True,
-    supports_static_listing = False,
-    deps = [
-        "fbsource//third-party/pypi/parameterized:parameterized",
-        "//caffe2:torch",
-        "//executorch/backends/cadence/aot:ops_registrations",
-        "//executorch/backends/cadence/aot:export_example",
-        "//executorch/backends/cadence/aot:compiler",
-    ],
-)
+define_common_targets()

examples/cadence/operators/targets.bzl

@@ -0,0 +1,36 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
+
+TESTS_LIST = [
+    "add_op",
+    "quantized_conv1d_op",
+    "quantized_linear_op",
+]
+
+def define_common_targets():
+    for op in TESTS_LIST:
+        _define_test_target(op)
+
+
+def _define_test_target(test_name):
+    file_name = "test_{}".format(test_name)
+    python_unittest(
+        name = file_name,
+        srcs = [
+            "{}.py".format(file_name),
+        ],
+        typing = True,
+        supports_static_listing = False,
+        deps = [
+            "fbsource//third-party/pypi/parameterized:parameterized",
+            "fbcode//caffe2:torch",
+            "fbcode//executorch/backends/cadence/aot:ops_registrations",
+            "fbcode//executorch/backends/cadence/aot:export_example",
+            "fbcode//executorch/backends/cadence/aot:compiler",
+        ],
+    )

examples/cadence/operators/quantized_conv1d_op.py renamed to examples/cadence/operators/test_quantized_conv1d_op.py

@@ -8,6 +8,8 @@
 
 import logging
 
+from typing import cast, Sequence
+
 import torch
 
 from executorch.backends.cadence.aot.ops_registrations import *  # noqa
@@ -53,6 +55,6 @@ def forward(self, x: torch.Tensor):
     model = QuantizedConv()
     model.eval()
 
-    example_inputs = (torch.randn(shape),)
+    example_inputs = (torch.randn(cast(Sequence[int], shape)),)
 
     export_model(model, example_inputs)

examples/cadence/operators/quantized_linear_op.py renamed to examples/cadence/operators/test_quantized_linear_op.py

@@ -101,6 +101,19 @@ Result<Tensor> parseTensor(
     sizes = const_cast<exec_aten::SizesType*>(serialized_sizes);
     dim_order = const_cast<exec_aten::DimOrderType*>(serialized_dim_order);
   }
+  // Validate sizes before using them in case the PTE data is bad. We can't
+  // detect bad positive values, but we can reject negative values, which would
+  // otherwise panic in the TensorImpl ctor. dim_order_to_stride() will validate
+  // dim_order.
+  for (int i = 0; i < dim; i++) {
+    ET_CHECK_OR_RETURN_ERROR(
+        sizes[i] >= 0,
+        InvalidProgram,
+        "Negative size[%d] %" PRId32,
+        i,
+        sizes[i]);
+  }
+
   // We will remove strides from schema.
   // Allocating strides buffer here and populating it.
   // In subsequent diffs we can remove strides accessor, however this