Merge branch 'main' into dev/denis/upstream_giovanni_grid_sampler_2d_support

Author: manuelcandales

.Package.swift/executorch_llm/dummy.swift

@@ -0,0 +1 @@
+

.Package.swift/executorch_llm_debug/dummy.swift

@@ -0,0 +1 @@
+

.Package.swift/kernels_custom/dummy.swift renamed to .Package.swift/kernels_llm/dummy.swift

@@ -39,6 +39,7 @@
 
 [buck2]
 restarter=true
+file_watcher=notify
 
 [oss]
 folly_cxx_tests = False

.Package.swift/kernels_custom_debug/dummy.swift renamed to .Package.swift/kernels_llm_debug/dummy.swift

@@ -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
@@ -41,6 +43,10 @@ case "${IMAGE_NAME}" in
     ARM_SDK=yes
     CLANG_VERSION=12
     ;;
+  executorch-ubuntu-22.04-zephyr-sdk)
+    ZEPHYR_SDK=yes
+    GCC_VERSION=11
+    ;;
   executorch-ubuntu-22.04-qnn-sdk)
     QNN_SDK=yes
     CLANG_VERSION=12
@@ -85,6 +91,7 @@ docker build \
   --build-arg "LINTRUNNER=${LINTRUNNER:-}" \
   --build-arg "BUILD_DOCS=${BUILD_DOCS}" \
   --build-arg "ARM_SDK=${ARM_SDK:-}" \
+  --build-arg "ZEPHYR_SDK=${ZEPHYR_SDK:-}" \
   --build-arg "QNN_SDK=${QNN_SDK:-}" \
   --build-arg "MEDIATEK_SDK=${MEDIATEK_SDK:-}" \
   --build-arg "ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-}" \

.Package.swift/kernels_portable/dummy.swift renamed to .Package.swift/kernels_torchao/dummy.swift

@@ -1 +1 @@
-2024-12-16
+2025-05-06

.Package.swift/kernels_portable_debug/dummy.swift renamed to .Package.swift/kernels_torchao_debug/dummy.swift

@@ -0,0 +1 @@
+40b02a2dc61bbf901a2df91719f47c98d65368ec