Merge branch 'main' into bmm_conv_docstrings

Author: Sebastian-Larsson

.ci/scripts/setup-samsung-linux-deps.sh

@@ -11,7 +11,7 @@ set -ex
 
 download_ai_lite_core() {
   API_BASE="https://soc-developer.semiconductor.samsung.com/api/v1/resource/ai-litecore/download"
-  API_KEY="kn10SoSY3hkC-9Qny5TqD2mnqVrlupv3krnjLeBt5cY"
+  API_KEY=$SAMSUNG_AI_LITECORE_KEY
 
   VERSION="0.5"
   OS_NAME="Ubuntu 22.04"

.github/scripts/propose_ghstack_orig_pr.py

@@ -86,6 +86,17 @@ def get_pr_stack_from_number(ref: str, repo: Repository) -> List[int]:
     return pr_stack
 
 
+def get_differential_revision(pr, repo: Repository) -> str:
+    body = repo.get_pull(pr.number).body
+    matches = re.findall(r"Differential Revision: .*", body)
+    count = len(matches)
+    if count == 1:
+        # If there's more than one Differential Revision, let's just return empty
+        # so that we can disambiguate manually.
+        return matches[0]
+    return ""
+
+
 def create_prs_for_orig_branch(pr_stack: List[int], repo: Repository):
     # For the first PR, we want to merge to `main` branch, and we will update
     # as we go through the stack
@@ -100,13 +111,15 @@ def create_prs_for_orig_branch(pr_stack: List[int], repo: Repository):
         # The PR we want to create is then "branch_to_merge" <- gh/user/x/orig
         # gh/user/x/orig is the clean diff between gh/user/x/base <- gh/user/x/head
         orig_branch_merge_head = pr.base.ref.replace("base", "orig")
+        differential_revision_text = get_differential_revision(pr, repo)
         bot_metadata = f"""This PR was created by the merge bot to help merge the original PR into the main branch.
 ghstack PR number: https://github.com/pytorch/executorch/pull/{pr.number} by @{pr.user.login}
 ^ Please use this as the source of truth for the PR details, comments, and reviews
 ghstack PR base: https://github.com/pytorch/executorch/tree/{pr.base.ref}
 ghstack PR head: https://github.com/pytorch/executorch/tree/{pr.head.ref}
 Merge bot PR base: https://github.com/pytorch/executorch/tree/{orig_branch_merge_base}
 Merge bot PR head: https://github.com/pytorch/executorch/tree/{orig_branch_merge_head}
+{differential_revision_text}
 @diff-train-skip-merge"""
 
         existing_orig_pr = repo.get_pulls(

.github/workflows/pull.yml

@@ -900,12 +900,14 @@ jobs:
     permissions:
       id-token: write
       contents: read
+    secrets: inherit
     with:
       runner: linux.2xlarge
       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
+      secrets-env: SAMSUNG_AI_LITECORE_KEY
       script: |
         set -ex
 
@@ -917,6 +919,7 @@ jobs:
         PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh --build-tool "cmake"
 
         # Setup Samsung SDK (AI Lite Core) and install enn backend
+        export SAMSUNG_AI_LITECORE_KEY=$SECRET_SAMSUNG_AI_LITECORE_KEY
         source .ci/scripts/setup-samsung-linux-deps.sh
 
         # Test models serially

.github/workflows/test-cuda-builds.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cuda-version: ["12.6", "12.8", "12.9"]
+        cuda-version: ["12.6", "12.8", "13.0"]
 
     name: test-executorch-cuda-build-${{ matrix.cuda-version }}
     uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main

CONTRIBUTING.md

@@ -199,8 +199,7 @@ We use [`lintrunner`](https://pypi.org/project/lintrunner/) to help make sure th
 code follows our standards. Set it up with:
 
 ```
-pip install lintrunner==0.12.7
-pip install lintrunner-adapters==0.12.4
+./install_requirements.sh  # (automatically run by install_executorch.sh)
 lintrunner init
 ```
 

backends/xnnpack/runtime/XNNPACKBackend.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <executorch/runtime/platform/compiler.h>
-
 namespace executorch::backends::xnnpack {
 /// The key for the backend. This is used to register the backend, check
 /// availability, and get/set options.

backends/xnnpack/targets.bzl

@@ -73,3 +73,13 @@ def define_common_targets():
             # @lint-ignore BUCKLINT: Avoid `link_whole=True` (https://fburl.com/avoid-link-whole)
             link_whole = True,
         )
+    
+    runtime.cxx_library(
+        name = "xnnpack_interface",
+        visibility = [
+            "@EXECUTORCH_CLIENTS",
+        ],
+        exported_headers = [
+            "runtime/XNNPACKBackend.h",
+        ],
+    )

exir/passes/memory_planning_pass.py

@@ -287,7 +287,7 @@ def run(
         return PassResult(graph_module, True)
 
     def run_multimethod(self):
-        "Resolve any memory planning done across entry points"
+        """Resolve any memory planning done across entry points, called after run is called on all entry points."""
         if self.share_mutable_buffers:
             arena: int = 0
 

extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecutorchRuntimeException.java

@@ -75,6 +75,7 @@ public class ExecutorchRuntimeException extends RuntimeException {
   }
 
   static class ErrorHelper {
+    private static final boolean ENABLE_READ_LOG_BUFFER = false;
     // Reusable StringBuilder instance
     private static final StringBuilder sb = new StringBuilder();
 
@@ -92,14 +93,15 @@ static String formatMessage(int errorCode, String details) {
             .append("] ")
             .append(baseMessage)
             .append(": ")
-            .append(details)
-            .append("\nDetailed Logs:\n");
-
-        try {
-          String[] logEntries = readLogBuffer(); // JNI call
-          formatLogEntries(sb, logEntries);
-        } catch (Exception e) {
-          sb.append("Failed to retrieve detailed logs: ").append(e.getMessage());
+            .append(details);
+        if (ENABLE_READ_LOG_BUFFER) {
+          try {
+            sb.append("\nDetailed Logs:\n");
+            String[] logEntries = readLogBuffer(); // JNI call
+            formatLogEntries(sb, logEntries);
+          } catch (Exception e) {
+            sb.append("Failed to retrieve detailed logs: ").append(e.getMessage());
+          }
         }
 
         return sb.toString();

extension/android/executorch_android/src/main/java/org/pytorch/executorch/Module.java

@@ -204,10 +204,9 @@ public MethodMetadata getMethodMetadata(String name) {
       throw new RuntimeException("method " + name + "does not exist for this module");
     }
 
-    MethodMetadata methodMetadata =mMethodMetadata.get(name);
+    MethodMetadata methodMetadata = mMethodMetadata.get(name);
     if (methodMetadata != null) {
       methodMetadata.setBackends(getUsedBackends(name));
-
     }
     return methodMetadata;
   }