Merge branch 'main' into toupstream/sub_scalar

Author: Sebastian-Larsson

.Package.swift/executorch_llm/dummy.swift

@@ -0,0 +1 @@
+

.Package.swift/executorch_llm_debug/dummy.swift

@@ -0,0 +1 @@
+

.ci/docker/build.sh

@@ -7,9 +7,11 @@
 
 set -exu
 
-IMAGE_NAME="$1"
+FULL_IMAGE_NAME="$1"
 shift
 
+IMAGE_NAME=$(echo "${FULL_IMAGE_NAME}" | sed 's/ci-image://')
+
 echo "Building ${IMAGE_NAME} Docker image"
 
 OS=ubuntu

.ci/scripts/setup-emscripten.sh

@@ -1,3 +1,9 @@
+#!/bin/bash
+# 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.
 
 set -ex
 

.github/workflows/_android.yml

@@ -13,7 +13,7 @@ jobs:
       contents: read
     with:
       runner: linux.2xlarge
-      docker-image: executorch-ubuntu-22.04-clang12-android
+      docker-image: ci-image:executorch-ubuntu-22.04-clang12-android
       submodules: 'recursive'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 90

.github/workflows/_link_check.yml

@@ -11,7 +11,7 @@ jobs:
     uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
     with:
       runner: linux.2xlarge
-      docker-image: executorch-ubuntu-22.04-linter
+      docker-image: ci-image:executorch-ubuntu-22.04-linter
       submodules: false
       fetch-depth: 0
       ref: ${{ inputs.ref }}
@@ -36,7 +36,7 @@ jobs:
     uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
     with:
       runner: linux.2xlarge
-      docker-image: executorch-ubuntu-22.04-linter
+      docker-image: ci-image:executorch-ubuntu-22.04-linter
       submodules: false
       fetch-depth: 0
       ref: ${{ inputs.ref }}

.github/workflows/android-perf.yml

@@ -168,7 +168,7 @@ jobs:
       fail-fast: false
     with:
       runner: linux.2xlarge.memory
-      docker-image: executorch-ubuntu-22.04-qnn-sdk
+      docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk
       submodules: 'recursive'
       timeout: 60
       upload-artifact: android-models
@@ -409,7 +409,7 @@ jobs:
     needs: set-parameters
     with:
       runner: linux.2xlarge
-      docker-image: executorch-ubuntu-22.04-clang12-android
+      docker-image: ci-image:executorch-ubuntu-22.04-clang12-android
       submodules: 'recursive'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 90

.github/workflows/android-release-artifacts.yml

@@ -54,7 +54,7 @@ jobs:
       contents: read
     with:
       secrets-env: EXECUTORCH_MAVEN_SIGNING_KEYID EXECUTORCH_MAVEN_SIGNING_PASSWORD EXECUTORCH_MAVEN_CENTRAL_PASSWORD EXECUTORCH_MAVEN_CENTRAL_USERNAME EXECUTORCH_MAVEN_SIGNING_GPG_KEY_CONTENTS
-      docker-image: executorch-ubuntu-22.04-clang12-android
+      docker-image: ci-image:executorch-ubuntu-22.04-clang12-android
       submodules: 'recursive'
       ref: ${{ github.sha }}
       timeout: 90

.github/workflows/apple.yml

@@ -149,6 +149,7 @@ jobs:
         VERSION="${{ needs.set-version.outputs.version }}"
         FRAMEWORKS=(
           "executorch"
+          "executorch_llm"
           "backend_coreml"
           "backend_mps"
           "backend_xnnpack"

.github/workflows/build-presets.yml

@@ -44,7 +44,7 @@ jobs:
       job-name: build
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       runner: linux.2xlarge
-      docker-image: executorch-ubuntu-22.04-arm-sdk
+      docker-image: ci-image:executorch-ubuntu-22.04-arm-sdk
       submodules: recursive
       timeout: 90
       script: |
@@ -63,7 +63,7 @@ jobs:
         # Verify download
         echo "93128be0235cf5cf5f1ee561aa6eac5f  ${toolchain_dir}.tar.xz" > arm-zephyr-eabi.md5
         md5sum -c --strict arm-zephyr-eabi.md5
-        
+
         # Extract and install to PATH
         tar xf "${toolchain_dir}.tar.xz"
         rm -f "${toolchain_dir}.tar.xz"
@@ -93,7 +93,7 @@ jobs:
       job-name: build
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       runner: ${{ matrix.runner }}
-      docker-image: ${{ matrix.docker-image }}
+      docker-image: ci-image:${{ matrix.docker-image }}
       submodules: recursive
       timeout: 90
       script: |