Merge branch 'pytorch:main' into win_build

Author: vortex-captain

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "backends/arm/third-party/ethos-u-core-driver"]
 	path = backends/arm/third-party/ethos-u-core-driver
-	url = https://git.mlplatform.org/ml/ethos-u/ethos-u-core-driver.git/
+	url = https://github.com/pytorch-labs/ethos-u-core-driver-mirror
 [submodule "backends/arm/third-party/serialization_lib"]
 	path = backends/arm/third-party/serialization_lib
-	url = https://git.mlplatform.org/tosa/serialization_lib.git/
+	url = https://github.com/pytorch-labs/tosa_serialization_lib-mirror
 [submodule "backends/vulkan/third-party/Vulkan-Headers"]
 	path = backends/vulkan/third-party/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers

backends/qualcomm/quantizer/custom_annotation.py

@@ -78,7 +78,7 @@ def annotate_single_in_single_out(
         )
 
     def annotate_matmul_input1(node: Node):
-        quantization_config_8a8w = get_default_8bit_qnn_ptq_config(
+        quantization_config_8a8w = get_8a8w_qnn_ptq_config(
             act_symmetric=True, act_observer=MinMaxObserver
         )
         while isinstance(node, Node) and node.op == "call_function":

backends/xnnpack/test/ops/linear.py

@@ -497,6 +497,7 @@ def _test_linear(
         which ares then transformed into aten.linear.default by the ConvertToLinear pass.
         """
         for i, _ in enumerate(in_sizes):
+            torch._dynamo.reset()
             in_size = int(in_sizes[i])
             input_size = int(input_sizes[i])
             output_size = int(output_sizes[i])

docs/source/apple-runtime.md

@@ -144,26 +144,26 @@ ExecuTorch initializes its backends and kernels (operators) during app startup b
 Here's an example of a Xcode configuration file (`.xcconfig`):
 
 ```
-OTHER_LDFLAGS[sdk=iphonesimulator*] = $(inherited) \
--force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-ios-release.a \
--force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-ios-release.a \
--force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-ios-release.a \
--force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-ios-release.a
-
-OTHER_LDFLAGS[sdk=iphoneos*] = $(inherited) \
--force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-ios-release.a \
--force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-ios-release.a \
--force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-ios-release.a \
--force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-ios-release.a
-
-OTHER_LDFLAGS[sdk=macos*] = $(inherited) \
--force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-ios-release.a \
--force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-ios-release.a \
--force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-ios-release.a \
--force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-ios-release.a
+ET_PLATFORM[sdk=iphonesimulator*] = simulator
+ET_PLATFORM[sdk=iphoneos*] = ios
+ET_PLATFORM[sdk=macos*] = macos
+
+OTHER_LDFLAGS = $(inherited) \
+    -force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-$(ET_PLATFORM)-release.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-$(ET_PLATFORM)-release.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-$(ET_PLATFORM)-release.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-$(ET_PLATFORM)-release.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-$(ET_PLATFORM)-release.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-$(ET_PLATFORM)-release.a
 ```
 
-Replace `release` with `debug` in library file names for a Debug mode config respectively. You can assign such `.xcconfig` file to your target in Xcode: add it to your project, navigate to the project's Info tab, and select it in the build configuration for Debug and Release modes.
+For a Debug build configuration, replace `release` with `debug` in the library file names. Remember to link against the ExecuTorch runtime (`libexecutorch`) in Debug mode even if other components are built for Release to preserve logs if needed.
+
+You can assign such a config file to your target in Xcode:
+
+1.	Add the `.xcconfig` file to your project.
+2.	Navigate to the project’s Info tab.
+3.	Select the configuration file in the build configurations for Release (or Debug) mode.
 
 ## Runtime API
 

examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj

@@ -806,8 +806,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pytorch/executorch";
 			requirement = {
+				branch = "swiftpm-0.4.0.20241120";
 				kind = branch;
-				branch = "swiftpm-0.4.0.20241114";
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

examples/demo-apps/apple_ios/LLaMA/LLaMA.xcodeproj/project.pbxproj

@@ -0,0 +1,22 @@
+ET_PLATFORM[sdk=iphonesimulator*] = simulator
+ET_PLATFORM[sdk=iphoneos*] = ios
+ET_PLATFORM[sdk=macos*] = macos
+
+OTHER_LDFLAGS = $(inherited) \
+    -force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-$(ET_PLATFORM)-debug.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-$(ET_PLATFORM)-debug.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-$(ET_PLATFORM)-debug.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-$(ET_PLATFORM)-debug.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-$(ET_PLATFORM)-debug.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-$(ET_PLATFORM)-debug.a \
+    -force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-$(ET_PLATFORM)-debug.a \
+    @$(TEMP_DIR)/cmake/linker_flags
+
+// LLaMARunner requires additional dependencies built with CMake in a custom run script phase.
+// Include headers and libraries from $(TEMP_DIR)/cmake for it.
+HEADER_SEARCH_PATHS = $(inherited) \
+    $(SRCROOT)/../../../../.. \
+    $(TEMP_DIR)/cmake/include
+
+LIBRARY_SEARCH_PATHS = $(inherited) \
+    $(TEMP_DIR)/cmake/lib