Update on "[ET-VK] 7/n Split dispatches between multiple command buffers. Split execute dispatch into multiple commands based on dispatch count."

Differential Revision: [D78360039](https://our.internmc.facebook.com/intern/diff/D78360039/)

[ghstack-poisoned]

Author: trivedivivek

.ci/scripts/build-mediatek-sdk.sh

@@ -14,9 +14,9 @@ build_neuron_backend() {
   export NEURON_BUFFER_ALLOCATOR_LIB=${MEDIATEK_SDK_ROOT}/libneuron_buffer_allocator.so
   export EXECUTORCH_ROOT="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)"
 
-
   cd ${EXECUTORCH_ROOT}
   ./backends/mediatek/scripts/mtk_build.sh
+  ./examples/mediatek/mtk_build_examples.sh
 }
 
 build_neuron_backend

backends/mediatek/scripts/mtk_build.sh

@@ -4,18 +4,20 @@
 set -e
 
 # Define the directory where CMakeLists.txt is located
-SOURCE_DIR=$(realpath "$(dirname "$0")/../../..")
+EXECUTORCH_ROOT=$(realpath "$(dirname "$0")/../../..")
+echo EXECUTORCH_ROOT=${EXECUTORCH_ROOT}
 
 # Check if the ANDROID_NDK environment variable is set
 if [ -z "$ANDROID_NDK" ]; then
     echo "Error: ANDROID_NDK environment variable is not set." >&2
     exit 1
 fi
 
-# Create and enter the build directory
+# Enter the build directory
+cd "$EXECUTORCH_ROOT"
+
 # Set build directory
 build_dir="cmake-android-out"
-cd "$SOURCE_DIR"
 rm -rf "${build_dir}"
 
 # Configure the project with CMake

docs/source/using-executorch-ios.md

@@ -246,7 +246,7 @@ let inputTensor = Tensor<Float>(&imageBuffer, shape: [1, 3, 224, 224])
 let outputTensor: Tensor<Float> = try module.forward(inputTensor)[0].tensor()!
 
 // Copy the tensor data into logits array for easier access.
-let logits = try outputTensor.scalars()
+let logits = outputTensor.scalars()
 
 // Use logits...
 ```
@@ -444,11 +444,11 @@ Swift:
 let tensor = Tensor<Float>([1.0, 2.0, 3.0, 4.0], shape: [2, 2])
 
 // Get data copy as a Swift array.
-let scalars = try tensor.scalars()
+let scalars = tensor.scalars()
 print("All scalars: \(scalars)") // [1.0, 2.0, 3.0, 4.0]
 
 // Access data via a buffer pointer.
-try tensor.withUnsafeBytes { buffer in
+tensor.withUnsafeBytes { buffer in
   print("First float element: \(buffer.first ?? 0.0)")
 }
 
@@ -482,7 +482,7 @@ Swift:
 let tensor = Tensor<Float>([1.0, 2.0, 3.0, 4.0], shape: [2, 2])
 
 // Modify the tensor's data in place.
-try tensor.withUnsafeMutableBytes { buffer in
+tensor.withUnsafeMutableBytes { buffer in
   buffer[1] = 200.0
 }
 // tensor's data is now [1.0, 200.0, 3.0, 4.0]

examples/mediatek/README.md

@@ -28,6 +28,8 @@ examples/mediatek
 ## Environment Setup
 - Follow the instructions of **Prerequisites** and **Setup** in `backends/mediatek/scripts/README.md`.
 
+- Build required libraries by `backends/mediatek/scripts/mtk_build.sh` before building examples.
+
 ## Build MediaTek Examples
 1. Build the backend and the examples by exedcuting the script:
 ```bash

examples/mediatek/mtk_build_examples.sh

@@ -14,29 +14,18 @@ if [ -z "$ANDROID_NDK" ]; then
 fi
 
 main() {
-    # Set build directory
-    local build_dir="cmake-android-out"
-
-    # Create and enter the build directory
+    # Enter the build directory
     cd "$EXECUTORCH_ROOT"
-    rm -rf "${build_dir}"
-
-    # Configure the project with CMake
-    # Note: Add any additional configuration options you need here
-    cmake -DCMAKE_INSTALL_PREFIX="${build_dir}" \
-          -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
-          -DANDROID_ABI=arm64-v8a \
-          -DANDROID_NATIVE_API_LEVEL=26 \
-          -DANDROID_PLATFORM=android-26 \
-          -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
-          -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
-          -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
-          -DEXECUTORCH_BUILD_NEURON=ON \
-          -B"${build_dir}"
 
+    # Set build directory
+    local build_dir="cmake-android-out"
 
-    # Build the project
-    cmake --build "${build_dir}" --target install --config Release -j5
+    # Check if the build directory exists
+    if [ ! -d "$EXECUTORCH_ROOT/$build_dir" ]; then
+        echo "Error: Build directory '$build_dir' does not exist."
+        echo "Please build MTK backend before running this script."
+        exit 1
+    fi
 
     ## Build example
     local example_dir=examples/mediatek

extension/apple/ExecuTorch/Exported/ExecuTorch+Module.swift

@@ -63,16 +63,15 @@ public extension Module {
     try __executeMethod(method, withInputs: inputs.map { $0.asValue() } )
   }
 
-  /// Executes a specific method with a single input value.
-  /// The method is loaded on demand if not already loaded.
+  /// Executes a specific method with variadic inputs.
   ///
   /// - Parameters:
   ///   - method: The name of the method to execute.
-  ///   - input: A single `ValueConvertible` type representing the input.
+  ///   - inputs: A variadic list of `ValueConvertible` inputs.
   /// - Returns: An array of `Value` objects representing the outputs.
-  /// - Throws: An error if method execution fails.
-  func execute(_ method: String, _ input: ValueConvertible) throws -> [Value] {
-    try __executeMethod(method, withInputs: [input.asValue()])
+  /// - Throws: An error if loading or execution fails.
+  func execute(_ method: String, _ inputs: ValueConvertible...) throws -> [Value] {
+    try execute(method, inputs)
   }
 
   /// Executes the "forward" method with the provided input values.
@@ -85,13 +84,12 @@ public extension Module {
     try __executeMethod("forward", withInputs: inputs.map { $0.asValue() })
   }
 
-  /// Executes the "forward" method with a single input value.
-  /// The method is loaded on demand if not already loaded.
+  /// Executes the "forward" method with variadic inputs.
   ///
-  /// - Parameter input: A single `ValueConvertible` type representing the input.
+  /// - Parameter inputs: A variadic list of `ValueConvertible` inputs.
   /// - Returns: An array of `Value` objects representing the outputs.
-  /// - Throws: An error if method execution fails.
-  func forward(_ input: ValueConvertible) throws -> [Value] {
-    try __executeMethod("forward", withInputs: [input.asValue()])
+  /// - Throws: An error if loading or execution fails.
+  func forward(_ inputs: ValueConvertible...) throws -> [Value] {
+    try forward(inputs)
   }
 }

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

@@ -770,35 +770,29 @@ public final class Tensor<T: Scalar>: Equatable {
   /// - Parameter body: A closure that receives an `UnsafeBufferPointer<T>` bound to the tensor’s data.
   /// - Returns: The value returned by `body`.
   /// - Throws: Any error thrown by `body`.
-  public func withUnsafeBytes<R>(_ body: (UnsafeBufferPointer<T>) throws -> R) throws -> R {
-    var result: Result<R, Error>?
-    anyTensor.bytes { pointer, count, _ in
-      result = Result { try body(
-        UnsafeBufferPointer(
-          start: pointer.assumingMemoryBound(to: T.self),
-          count: count
-        )
-      ) }
+  public func withUnsafeBytes<R>(_ body: (UnsafeBufferPointer<T>) throws -> R) rethrows -> R {
+    try withoutActuallyEscaping(body) { body in
+      var result: Result<R, Error>?
+      anyTensor.bytes { pointer, count, _ in
+        result = Result { try body(UnsafeBufferPointer(start: pointer.assumingMemoryBound(to: T.self), count: count)) }
+      }
+      return try result!.get()
     }
-    return try result!.get()
   }
 
   /// Calls the closure with a typed, mutable buffer pointer over the tensor’s elements.
   ///
   /// - Parameter body: A closure that receives an `UnsafeMutableBufferPointer<T>` bound to the tensor’s data.
   /// - Returns: The value returned by `body`.
   /// - Throws: Any error thrown by `body`.
-  public func withUnsafeMutableBytes<R>(_ body: (UnsafeMutableBufferPointer<T>) throws -> R) throws -> R {
-    var result: Result<R, Error>?
-    anyTensor.mutableBytes { pointer, count, _ in
-      result = Result { try body(
-        UnsafeMutableBufferPointer(
-          start: pointer.assumingMemoryBound(to: T.self),
-          count: count
-        )
-      ) }
+  public func withUnsafeMutableBytes<R>(_ body: (UnsafeMutableBufferPointer<T>) throws -> R) rethrows -> R {
+    try withoutActuallyEscaping(body) { body in
+      var result: Result<R, Error>?
+      anyTensor.mutableBytes { pointer, count, _ in
+        result = Result { try body(UnsafeMutableBufferPointer(start: pointer.assumingMemoryBound(to: T.self), count: count)) }
+      }
+      return try result!.get()
     }
-    return try result!.get()
   }
 
   /// Resizes the tensor to a new shape.
@@ -830,9 +824,8 @@ public extension Tensor {
   /// Returns the tensor's elements as an array of scalars.
   ///
   /// - Returns: An array of scalars of type `T`.
-  /// - Throws: An error if the underlying data cannot be accessed.
-  func scalars() throws -> [T] {
-    try withUnsafeBytes { Array($0) }
+  func scalars() -> [T] {
+    withUnsafeBytes { Array($0) }
   }
 }