Remove protocols and make executorch runtime bridge standalone

Differential Revision: D71420184

Pull Request resolved: #9398

Author: bsoyluoglu

extension/apple/ExecutorchRuntime/ExecutorchRuntime/ExecutorchRuntime.swift

@@ -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/__tests__/ExecutorchRuntimeTests.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/ExecutorchRuntimeBridge/ExecutorchRuntimeBridge/Exported/Data/ExecutorchRuntimeTensorValue.h

@@ -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/ExecutorchRuntimeValue.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.mm

@@ -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");
 }