Merge branch 'main' into build-tools

Author: kirklandsign

.ci/docker/build.sh

@@ -48,6 +48,7 @@ case "${IMAGE_NAME}" in
   executorch-ubuntu-22.04-mediatek-sdk)
     MEDIATEK_SDK=yes
     CLANG_VERSION=12
+    ANDROID_NDK_VERSION=r27b
     ;;
   executorch-ubuntu-22.04-clang12-android)
     LINTRUNNER=""

build/test_ios_ci.sh renamed to .ci/scripts/test_ios_ci.sh

@@ -14,7 +14,7 @@ on:
       - build/build_apple_frameworks.sh
       - build/build_apple_llm_demo.sh
       - build/create_frameworks.sh
-      - build/test_ios_ci.sh
+      - .ci/scripts/test_ios_ci.sh
       - examples/demo-apps/apple_ios/**
       - extension/apple/**
       - extension/benchmark/apple/**
@@ -75,7 +75,7 @@ jobs:
 
         # Build and test iOS Demo App
         PYTHON_EXECUTABLE=python ${CONDA_RUN} --no-capture-output \
-        build/test_ios_ci.sh "${ARTIFACTS_DIR_NAME}"
+        .ci/scripts/test_ios_ci.sh "${ARTIFACTS_DIR_NAME}"
 
   # Upload the test demo app to S3
   upload-demo-ios:

.github/workflows/apple.yml

@@ -5,6 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 import ctypes
+import hashlib
 
 from typing import cast, Dict, List, Optional, Tuple
 
@@ -34,7 +35,6 @@
     check_or_raise,
     get_input_node,
     get_param_tensor,
-    get_tensor_name,
     is_param_node,
     PERM_NCHW_TO_NHWC,
 )
@@ -576,15 +576,19 @@ def get_serialized_buffer_index(
         if quant_params is not None and quant_params.is_qc4w:
             const_val = self.convert_to_qc4w(const_val)
 
-        array_type = ctypes.c_char * const_val.untyped_storage().nbytes()
+        size = const_val.untyped_storage().nbytes()
+        array_type = ctypes.c_char * size
         array = ctypes.cast(
             const_val.untyped_storage().data_ptr(),
             ctypes.POINTER(array_type),
         ).contents
 
-        named_key = get_tensor_name(self.exported_program, get_attr_node)
-        if named_key == "":
-            raise ValueError(f"Tensor from node: {get_attr_node} has no name")
+        check_or_raise(
+            size > 0,
+            f"Serializing constant data node {tensor} but tensor value has no bytes",
+        )
+        sha256_hash = hashlib.sha256(bytes(array))
+        named_key = sha256_hash.hexdigest()
 
         size = const_val.untyped_storage().nbytes()
         xnn_graph.constant_data.append(

backends/xnnpack/operators/node_visitor.py

@@ -15,6 +15,8 @@ def define_common_targets():
         deps = [
             "//executorch/devtools/etdump:etdump_flatcc",
             "//executorch/devtools/etdump:etdump_schema_flatcc",
+            "//executorch/devtools/etdump/data_sinks:file_data_sink",
+            "//executorch/extension/testing_util:temp_file",
             "//executorch/runtime/platform:platform",
             "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
         ],

devtools/etdump/tests/targets.bzl

@@ -1224,6 +1224,10 @@ def find_total_for_module(self, module_name: str) -> float:
         total = 0.0
         for block in self.event_blocks:
             for event in block.events:
+                # Skip OPERATOR_CALL events to avoid double-counting and exclude framework tax
+                if event.event_name == "OPERATOR_CALL":
+                    continue
+
                 module_hierarchy = event.module_hierarchy.values()
                 for hierarchy in module_hierarchy:
                     if not hierarchy:

devtools/inspector/_inspector.py

@@ -10,11 +10,11 @@
  #import <executorch/extension/module/module.h>
  #import <executorch/runtime/core/evalue.h>
 #endif
-#import <ModelRunnerDataKit/ModelRunnerDataKit-Swift.h>
+#import <RuntimeBridgingCore/RuntimeBridgingCore-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ExecutorchRuntimeTensorValue : NSObject <ModelRuntimeTensorValueBridging>
+@interface ExecutorchRuntimeTensorValue : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
@@ -28,6 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (torch::executor::Tensor)backedValue;
 #endif
 
+#pragma mark - 
+- (ModelRuntimeTensorValueBridgingTuple * _Nullable)floatRepresentationAndReturnError:(NSError * _Nullable * _Nullable)error SWIFT_WARN_UNUSED_RESULT;
+
 @end
 
 NS_ASSUME_NONNULL_END

extension/apple/ExecutorchRuntime/ExecutorchRuntime/ExecutorchRuntime.swift

@@ -11,13 +11,13 @@
  #import <executorch/runtime/core/evalue.h>
 #endif
 
-#import <ModelRunnerDataKit/ModelRunnerDataKit-Swift.h>
+#import <RuntimeBridgingCore/RuntimeBridgingCore-Swift.h>
 
 #import "ExecutorchRuntimeTensorValue.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ExecutorchRuntimeValue : NSObject <ModelRuntimeValueBridging>
+@interface ExecutorchRuntimeValue : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
@@ -29,6 +29,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (torch::executor::EValue)getBackedValue;
 #endif
 
+#pragma mark -
+- (ExecutorchRuntimeTensorValue *_Nullable)asTensorValueAndReturnError:(NSError * _Nullable * _Nullable)error SWIFT_WARN_UNUSED_RESULT;
+
 @end
 
 NS_ASSUME_NONNULL_END

extension/apple/ExecutorchRuntime/ExecutorchRuntime/__tests__/ExecutorchRuntimeTests.swift

@@ -41,15 +41,7 @@ - (instancetype)initWithTensor:(ExecutorchRuntimeTensorValue *)tensorValue
   return self;
 }
 
-- (nullable NSString *)stringValueAndReturnError:(NSError * _Nullable * _Nullable)error
-{
-  if (error) {
-    *error = [ModelRuntimeValueErrorFactory unsupportedType:@"ExecutorchRuntimeValue doesn't support strings"];
-  }
-  return nil;
-}
-
-- (nullable id<ModelRuntimeTensorValueBridging>)tensorValueAndReturnError:(NSError * _Nullable * _Nullable)error
+- (nullable ExecutorchRuntimeTensorValue *)asTensorValueAndReturnError:(NSError * _Nullable * _Nullable)error
 {
   if (_value.isTensor()) {
     return [[ExecutorchRuntimeTensorValue alloc] initWithTensor:_value.toTensor() error:error];
@@ -68,12 +60,4 @@ - (EValue)getBackedValue
   return _value;
 }
 
-- (NSArray<id<ModelRuntimeValueBridging>> *)arrayValueAndReturnError:(NSError * _Nullable * _Nullable)error
-{
-  if (error) {
-    *error = [ModelRuntimeValueErrorFactory unsupportedType:@"EValue doesn't support arrays"];
-  }
-  return nil;
-}
-
 @end

extension/apple/ExecutorchRuntimeBridge/ExecutorchRuntimeBridge/Exported/Data/ExecutorchRuntimeTensorValue.h

@@ -51,7 +51,7 @@ - (void)testValidModel
   XCTAssertEqual(output.count, 1);
   NSError *tensorValueError = nil;
   NSError *floatRepresentationError = nil;
-  const auto resultTensorValue = [[output.firstObject tensorValueAndReturnError:&tensorValueError]
+  const auto resultTensorValue = [[output.firstObject asTensorValueAndReturnError:&tensorValueError]
                                   floatRepresentationAndReturnError:&floatRepresentationError];
 
   XCTAssertNil(tensorValueError);

extension/apple/ExecutorchRuntimeBridge/ExecutorchRuntimeBridge/Exported/Data/ExecutorchRuntimeValue.h

@@ -9,7 +9,6 @@
 #import <XCTest/XCTest.h>
 
 #import <ExecutorchRuntimeBridge/ExecutorchRuntimeValue.h>
-#import <ModelRunnerDataKit/ModelRunnerDataKit-Swift.h>
 #import <executorch/extension/module/module.h>
 
 using torch::executor::EValue;
@@ -21,16 +20,6 @@ @interface ExecutorchRuntimeValueTests : XCTestCase
 
 @implementation ExecutorchRuntimeValueTests
 
-- (void)testStringValueWithError
-{
-  ExecutorchRuntimeValue *value = [[ExecutorchRuntimeValue alloc] initWithEValue:EValue((int64_t)1)];
-  XCTAssertNil([value stringValueAndReturnError:nil]);
-  NSError *error = nil;
-  XCTAssertNil([value stringValueAndReturnError:&error]);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects([error description], @"Unsupported type: ExecutorchRuntimeValue doesn't support strings");
-}
-
 - (void)testTensorValue
 {
   NSMutableArray *data = [NSMutableArray new];
@@ -63,9 +52,9 @@ - (void)testTensorValueWithFloatArrayWithError
 - (void)testTensorValueWithError
 {
   ExecutorchRuntimeValue *value = [[ExecutorchRuntimeValue alloc] initWithEValue:EValue((int64_t)1)];
-  XCTAssertNil([value tensorValueAndReturnError:nil]);
+  XCTAssertNil([value asTensorValueAndReturnError:nil]);
   NSError *error = nil;
-  XCTAssertNil([value tensorValueAndReturnError:&error]);
+  XCTAssertNil([value asTensorValueAndReturnError:&error]);
   XCTAssertNotNil(error);
   XCTAssertEqualObjects([error description], @"Invalid type: Tag::4, expected Tag::Tensor");
 }