Merge branch 'main' into fix_logging

Author: metascroy

.ci/docker/ci_commit_pins/pytorch.txt

@@ -1 +1 @@
-7ae0ce6360b6e4f944906502d20da24c04debee5
+59d5cf083b4f860dea76fe8936076177f9367f10

backends/arm/test/models/test_conformer.py

@@ -31,7 +31,7 @@ class TestConformer(unittest.TestCase):
     # .to_executorch step, i.e. after Arm partitioner.
     ops_after_partitioner = {
         "executorch_exir_dialects_edge__ops_aten_max_default": 1,
-        "torch.ops.aten._assert_scalar.default": 10,
+        "torch.ops.aten._assert_scalar.default": 7,
         "torch.ops.aten._local_scalar_dense.default": 1,
     }
 

backends/arm/test/models/test_llama.py

@@ -11,6 +11,7 @@
 import sys
 import unittest
 
+import pytest
 import torch
 
 from executorch.backends.arm.test import common, conftest
@@ -102,7 +103,7 @@ def test_llama_tosa_MI(self):
         llama_model, llama_inputs, llama_meta = self.prepare_model()
 
         if llama_model is None and llama_inputs is None and llama_meta is None:
-            return
+            pytest.skip("Missing model and/or input files")
 
         with torch.no_grad():
             (

examples/arm/README.md

@@ -32,6 +32,16 @@ $ source  executorch/examples/arm/ethos-u-scratch/setup_path.sh
 $ executorch/examples/arm/run.sh --model_name=mv2 --target=ethos-u85-128 [--scratch-dir=same-optional-scratch-dir-as-before]
 ```
 
+### Ethos-U minimal example
+
+See the jupyter notebook `ethos_u_minimal_example.ipynb` for an explained minimal example of the full flow for running a
+PyTorch module on the EthosUDelegate. The notebook runs directly in some IDE:s s.a. VS Code, otherwise it can be run in
+your browser using
+```
+pip install jupyter
+jupyter notebook ethos_u_minimal_example.ipynb
+```
+
 ### Online Tutorial
 
 We also have a [tutorial](https://pytorch.org/executorch/stable/executorch-arm-delegate-tutorial.html) explaining the steps performed in these

examples/arm/ethos-u-setup/core_platform/0002-Move-input_data_sec-to-NOLOAD-area.patch

@@ -0,0 +1,72 @@
+From 23712ff626db16793d428dddcb530f9e5faaa073 Mon Sep 17 00:00:00 2001
+From: Adrian Lundell <[email protected]>
+Date: Thu, 3 Apr 2025 14:25:52 +0200
+Subject: [PATCH] Move input_data_sec to NOLOAD area
+
+---
+ targets/corstone-300/platform.ld | 10 ++++++++--
+ targets/corstone-320/platform.ld |  8 ++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/targets/corstone-300/platform.ld b/targets/corstone-300/platform.ld
+index 1733509..3ccce64 100644
+--- a/targets/corstone-300/platform.ld
++++ b/targets/corstone-300/platform.ld
+@@ -272,13 +272,12 @@ SECTIONS
+     *(.bss.tensor_arena)
+ #endif
+
+-    . = ALIGN(4);
+-    *(input_data_sec)
+     . = ALIGN(16);
+ #if (ETHOSU_MODEL == 1)
+     *(network_model_sec)
+ #endif
+     * (expected_output_data_sec)
++    . = ALIGN(16);
+     * (sec_command_stream, sec_weight_data, sec_input_data)
+     *(.got*)
+     *(.rodata*)
+@@ -287,6 +286,13 @@ SECTIONS
+     . = ALIGN(4);
+   } > DDR :rom_dram
+
++  .ddr_noload (NOLOAD) :
++  {
++    . = ALIGN(16);
++    *(input_data_sec)
++    . = ALIGN(16);
++  } > DDR :null
++
+   __eddr_data = ALIGN (4) ;
+   .sram.data : {
+     __sram_data_start__ = .;
+diff --git a/targets/corstone-320/platform.ld b/targets/corstone-320/platform.ld
+index c8261c0..9b7e071 100644
+--- a/targets/corstone-320/platform.ld
++++ b/targets/corstone-320/platform.ld
+@@ -268,8 +268,6 @@ SECTIONS
+     *(network_model_sec)
+ #endif
+
+-    . = ALIGN(4);
+-    *(input_data_sec)
+     *(expected_output_data_sec)
+     *(output_data_sec)
+
+@@ -279,6 +277,12 @@ SECTIONS
+     __etext = .;
+   } > DDR :rom_dram
+
++  .ddr_noload (NOLOAD) :
++  {
++    . = ALIGN(16);
++    *(input_data_sec)
++  } > DDR :null
++
+   .bss :
+   {
+     . = ALIGN(4);
+--
+2.43.0
+