Merge branch 'main' into jathu/move-build

Author: jathu

.ci/docker/common/install_android.sh

@@ -70,6 +70,7 @@ install_sdk() {
   # These are the tools needed to build Android apps
   yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "platforms;android-34"
   yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "build-tools;33.0.1"
+  yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "build-tools;35.0.0"
   # And some more tools for future emulator tests
   yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "platform-tools"
   yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "tools"

backends/arm/operators/op_avg_pool2d.py

@@ -43,12 +43,19 @@ def _build_generic_avgpool2d(
         output_zp: int,
         accumulator_type: ts.DType,
     ) -> None:
-        input_tensor = inputs[0]
 
+        input_tensor = inputs[0]
         kernel_size_list = inputs[1].special
         stride_size_list = inputs[2].special
+
         try:
             pad_size_list = inputs[3].special
+            pad_size_list = [
+                pad_size_list[0],
+                pad_size_list[0],
+                pad_size_list[1],
+                pad_size_list[1],
+            ]
         except IndexError:
             pad_size_list = [0, 0, 0, 0]
 

backends/arm/operators/op_max_pool2d.py

@@ -42,9 +42,15 @@ def define_node(
         stride = inputs[2].special
 
         try:
-            padding = [*inputs[3].special, *inputs[3].special]
+            pad_size_list = inputs[3].special
+            pad_size_list = [
+                pad_size_list[0],
+                pad_size_list[0],
+                pad_size_list[1],
+                pad_size_list[1],
+            ]
         except IndexError:
-            padding = [0, 0, 0, 0]
+            pad_size_list = [0, 0, 0, 0]
 
         accumulator_type = output.dtype
 
@@ -63,7 +69,7 @@ def define_node(
         attr.PoolAttribute(
             kernel=kernel_size,
             stride=stride,
-            pad=padding,
+            pad=pad_size_list,
             input_zp=input_zp,
             output_zp=output_zp,
             accum_dtype=accumulator_type,