Update

[ghstack-poisoned]

Author: manuelcandales

.ci/docker/requirements-ci.txt

@@ -1,7 +1,7 @@
 mpmath==1.3.0
 numpy>=2.0.0; python_version >= '3.10'
 PyYAML==6.0.1
-ruamel.yaml==0.17.32
+ruamel.yaml==0.18.15
 sympy==1.12
 timm==0.6.13
 tomli==2.0.1

.ci/scripts/test_llama_lora.sh

@@ -55,7 +55,7 @@ cmake_build_llama_runner
 # Constants.
 RUNTIME_ARGS="--tokenizer_path=${DOWNLOADED_PATH}/tokenizer.model --temperature=0 --seq_len=20 --warmup=1"
 PROMPT="What happens if you eat watermelon seeds?"
-EXPECTED_PREFIX="What happens if you eat watermelon seeds? Watermelon seeds are a good source of vitamin C,"
+EXPECTED_PREFIX="What happens if you eat watermelon seeds? Watermelon seeds are a good source of vitamin C and"
 
 # Export LoRA PTE file.
 MODEL_NAME="llama_3_2_1B_lora"

.githooks/pre-commit

@@ -1,22 +1,24 @@
 #!/usr/bin/env bash
 
-# Pre-commit hook to automatically update PyTorch commit pin when torch_pin.py changes
+# Pre-commit hook to automatically update PyTorch commit pin and sync c10 directories when torch_pin.py changes
 
 # Check if torch_pin.py is being committed
 if git diff --cached --name-only | grep -q "^torch_pin.py$"; then
     echo "🔍 Detected changes to torch_pin.py"
-    echo "📝 Updating PyTorch commit pin..."
+    echo "📝 Updating PyTorch commit pin and syncing c10 directories..."
 
-    # Run the update script
+    # Run the update script (which now also syncs c10 directories)
     if python .github/scripts/update_pytorch_pin.py; then
-        # Check if pytorch.txt was modified
+        # Stage any modified files (pytorch.txt and grafted c10 files)
         if ! git diff --quiet .ci/docker/ci_commit_pins/pytorch.txt; then
-            echo "✅ PyTorch commit pin updated successfully"
-            # Stage the updated file
             git add .ci/docker/ci_commit_pins/pytorch.txt
             echo "📌 Staged .ci/docker/ci_commit_pins/pytorch.txt"
-        else
-            echo "ℹ️  PyTorch commit pin unchanged"
+        fi
+
+        # Stage any grafted c10 files
+        if ! git diff --quiet runtime/core/portable_type/c10/; then
+            git add runtime/core/portable_type/c10/
+            echo "📌 Staged grafted c10 files"
         fi
     else
         echo "❌ Failed to update PyTorch commit pin"

.github/scripts/update_pytorch_pin.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 
+import base64
+import hashlib
 import json
 import re
 import sys
 import urllib.request
-from datetime import datetime
+from pathlib import Path
 
 
 def parse_nightly_version(nightly_version):
@@ -53,7 +55,7 @@ def get_commit_hash_for_nightly(date_str):
         Commit hash string
     """
     api_url = "https://api.github.com/repos/pytorch/pytorch/commits"
-    params = f"?sha=nightly&per_page=100"
+    params = f"?sha=nightly&per_page=50"
     url = api_url + params
 
     req = urllib.request.Request(url)
@@ -74,14 +76,21 @@ def get_commit_hash_for_nightly(date_str):
         commit_msg = commit.get("commit", {}).get("message", "")
         # Check if the first line of commit message matches
         first_line = commit_msg.split("\n")[0].strip()
-        if first_line == target_title or first_line.startswith(f"{date_str} nightly"):
-            return commit["sha"]
+        if first_line.startswith(f"{date_str} nightly"):
+            return extract_hash_from_title(first_line)
 
     raise ValueError(
         f"Could not find commit with title matching '{target_title}' in nightly branch"
     )
 
 
+def extract_hash_from_title(title):
+    match = re.search(r"\(([0-9a-fA-F]{7,40})\)", title)
+    if not match:
+        raise ValueError(f"Could not extract commit hash from title '{title}'")
+    return match.group(1)
+
+
 def update_pytorch_pin(commit_hash):
     """
     Update .ci/docker/ci_commit_pins/pytorch.txt with the new commit hash.
@@ -95,6 +104,144 @@ def update_pytorch_pin(commit_hash):
     print(f"Updated {pin_file} with commit hash: {commit_hash}")
 
 
+def should_skip_file(filename):
+    """
+    Check if a file should be skipped during sync (build files).
+
+    Args:
+        filename: Base filename to check
+
+    Returns:
+        True if file should be skipped
+    """
+    skip_files = {"BUCK", "CMakeLists.txt", "TARGETS", "targets.bzl"}
+    return filename in skip_files
+
+
+def fetch_file_content(commit_hash, file_path):
+    """
+    Fetch file content from GitHub API.
+
+    Args:
+        commit_hash: Commit hash to fetch from
+        file_path: File path in the repository
+
+    Returns:
+        File content as bytes
+    """
+    api_url = f"https://api.github.com/repos/pytorch/pytorch/contents/{file_path}?ref={commit_hash}"
+
+    req = urllib.request.Request(api_url)
+    req.add_header("Accept", "application/vnd.github.v3+json")
+    req.add_header("User-Agent", "ExecuTorch-Bot")
+
+    try:
+        with urllib.request.urlopen(req) as response:
+            data = json.loads(response.read().decode())
+            # Content is base64 encoded
+            content = base64.b64decode(data["content"])
+            return content
+    except urllib.request.HTTPError as e:
+        print(f"Error fetching file {file_path}: {e}", file=sys.stderr)
+        raise
+
+
+def sync_directory(et_dir, pt_path, commit_hash):
+    """
+    Sync files from PyTorch to ExecuTorch using GitHub API.
+    Only syncs files that already exist in ExecuTorch - does not add new files.
+
+    Args:
+        et_dir: ExecuTorch directory path
+        pt_path: PyTorch directory path in the repository (e.g., "c10")
+        commit_hash: Commit hash to fetch from
+
+    Returns:
+        Number of files grafted
+    """
+    files_grafted = 0
+    print(f"Checking {et_dir} vs pytorch/{pt_path}...")
+
+    if not et_dir.exists():
+        print(f"Warning: ExecuTorch directory {et_dir} does not exist, skipping")
+        return 0
+
+    # Loop through files in ExecuTorch directory
+    for et_file in et_dir.rglob("*"):
+        if not et_file.is_file():
+            continue
+
+        # Skip build files
+        if should_skip_file(et_file.name):
+            continue
+
+        # Construct corresponding path in PyTorch
+        rel_path = et_file.relative_to(et_dir)
+        pt_file_path = f"{pt_path}/{rel_path}".replace("\\", "/")
+
+        # Fetch content from PyTorch and compare
+        try:
+            pt_content = fetch_file_content(commit_hash, pt_file_path)
+            et_content = et_file.read_bytes()
+
+            if pt_content != et_content:
+                print(f"⚠️  Difference detected in {rel_path}")
+                print(f"📋 Grafting from PyTorch commit {commit_hash}...")
+
+                et_file.write_bytes(pt_content)
+                print(f"✅ Grafted {et_file}")
+                files_grafted += 1
+        except urllib.request.HTTPError as e:
+            if e.code != 404:  # It's ok to have more files in ET than pytorch/pytorch.
+                print(f"Error fetching {rel_path} from PyTorch: {e}")
+        except Exception as e:
+            print(f"Error syncing {rel_path}: {e}")
+            continue
+
+    return files_grafted
+
+
+def sync_c10_directories(commit_hash):
+    """
+    Sync c10 and torch/headeronly directories from PyTorch to ExecuTorch using GitHub API.
+
+    Args:
+        commit_hash: PyTorch commit hash to sync from
+
+    Returns:
+        Total number of files grafted
+    """
+    print("\n🔄 Syncing c10 directories from PyTorch via GitHub API...")
+
+    # Get repository root
+    repo_root = Path.cwd()
+
+    # Define directory pairs to sync (from check_c10_sync.sh)
+    # Format: (executorch_dir, pytorch_path_in_repo)
+    dir_pairs = [
+        (
+            repo_root / "runtime/core/portable_type/c10/c10",
+            "c10",
+        ),
+        (
+            repo_root / "runtime/core/portable_type/c10/torch/headeronly",
+            "torch/headeronly",
+        ),
+    ]
+
+    total_grafted = 0
+    for et_dir, pt_path in dir_pairs:
+        files_grafted = sync_directory(et_dir, pt_path, commit_hash)
+        total_grafted += files_grafted
+
+    if total_grafted > 0:
+        print(f"\n✅ Successfully grafted {total_grafted} file(s) from PyTorch")
+    else:
+        print("\n✅ No differences found - c10 is in sync")
+
+    return total_grafted
+
+
 def main():
     try:
         # Read NIGHTLY_VERSION from torch_pin.py
@@ -112,7 +259,12 @@ def main():
         # Update the pin file
         update_pytorch_pin(commit_hash)
 
-        print("Successfully updated PyTorch commit pin!")
+        # Sync c10 directories from PyTorch
+        sync_c10_directories(commit_hash)
+
+        print(
+            "\n✅ Successfully updated PyTorch commit pin and synced c10 directories!"
+        )
 
     except Exception as e:
         print(f"Error: {e}", file=sys.stderr)

.github/workflows/pull.yml

@@ -892,6 +892,7 @@ jobs:
         # Install test requirements
         pip install -r backends/nxp/requirements-tests-pypi.txt
         pip install -r backends/nxp/requirements-tests-eiq.txt
+        PYTHON_EXECUTABLE=python bash examples/nxp/setup.sh
 
         # Run pytest
         PYTHON_EXECUTABLE=python bash backends/nxp/run_unittests.sh

backends/aoti/CMakeLists.txt

@@ -26,7 +26,7 @@ include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
 find_package_torch()
 
 # Common AOTI functionality - combines all AOTI common components
-set(_aoti_common_sources aoti_model_container.cpp common_shims.cpp)
+set(_aoti_common_sources common_shims.cpp)
 add_library(aoti_common STATIC ${_aoti_common_sources})
 target_include_directories(
   aoti_common

backends/aoti/aoti_model_container.h renamed to backends/aoti/aoti_delegate_handle.h

@@ -60,36 +60,17 @@ using AOTInductorModelContainerRunFunc = AOTIRuntimeError (*)(
     AOTInductorStreamHandle stream_handle,
     AOTIProxyExecutorHandle proxy_executor_handle);
 
-// Global function pointers (will be loaded dynamically)
-extern AOTInductorModelContainerCreateWithDeviceFunc
-    AOTInductorModelContainerCreateWithDevice;
-extern AOTInductorModelContainerDeleteFunc AOTInductorModelContainerDelete;
-extern AOTInductorModelContainerGetNumInputsFunc
-    AOTInductorModelContainerGetNumInputs;
-extern AOTInductorModelContainerGetNumOutputsFunc
-    AOTInductorModelContainerGetNumOutputs;
-extern AOTInductorModelContainerRunFunc AOTInductorModelContainerRun;
-
 // Retrieves the name of an input tensor by index from the AOTI model container.
-// Needed by Metal backend
 using AOTInductorModelContainerGetInputNameFunc = AOTIRuntimeError (*)(
     AOTInductorModelContainerHandle container_handle,
     size_t input_idx,
     const char** input_name);
 
 // Retrieves the number of constants from the AOTI model container.
-// Needed by Metal backend
 using AOTInductorModelContainerGetNumConstantsFunc = AOTIRuntimeError (*)(
     AOTInductorModelContainerHandle container_handle,
     size_t* num_constants);
 
-// Global function pointers (will be loaded dynamically).
-// Needed by Metal backend
-extern AOTInductorModelContainerGetInputNameFunc
-    AOTInductorModelContainerGetInputName;
-extern AOTInductorModelContainerGetNumConstantsFunc
-    AOTInductorModelContainerGetNumConstants;
-
 } // extern "C"
 
 // AOTI Delegate Handle structure
@@ -99,6 +80,13 @@ struct AOTIDelegateHandle {
   AOTInductorModelContainerHandle container_handle;
   void* cuda_stream; // cudaStream_t stored as void* to avoid CUDA header
                      // dependency
+
+  // Function pointers specific to this handle's shared library
+  AOTInductorModelContainerCreateWithDeviceFunc create_with_device;
+  AOTInductorModelContainerDeleteFunc delete_container;
+  AOTInductorModelContainerGetNumInputsFunc get_num_inputs;
+  AOTInductorModelContainerGetNumOutputsFunc get_num_outputs;
+  AOTInductorModelContainerRunFunc run;
 };
 
 } // namespace aoti

backends/aoti/aoti_model_container.cpp

@@ -0,0 +1,17 @@
+load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
+
+oncall("executorch")
+
+runtime.python_library(
+    name = "passes",
+    srcs = [
+      "replace_view_copy_with_view.py",
+    ],
+    visibility = [
+        "//executorch/...",
+    ],
+    deps = [
+        "//caffe2:torch",
+        "//executorch/exir:pass_base",
+    ],
+)