Handle value and tensor errors as NSErrors keeping the underlying error codes

Differential Revision: D71592464

Pull Request resolved: pytorch#9503

Author: bsoyluoglu

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

@@ -56,7 +56,10 @@ - (nullable instancetype)initWithTensor:(torch::executor::Tensor)tensor error:(N
 {
   if (tensor.scalar_type() != ScalarType::Float) {
     if (error) {
-      *error = [ModelRuntimeValueErrorFactory invalidType:[NSString stringWithFormat:@"torch::executor::ScalarType::%hhd", tensor.scalar_type()] expectedType:@"torch::executor::ScalarType::Float"];
+      *error = [NSError
+        errorWithDomain:@"ExecutorchRuntimeEngine"
+        code:(NSInteger)executorch::runtime::Error::InvalidArgument
+        userInfo: @{NSDebugDescriptionErrorKey: [NSString stringWithFormat:@"Invalid type: torch::executor::ScalarType::%hhd, expected torch::executor::ScalarType::Float", tensor.scalar_type()]}];
     }
     return nil;
   }
@@ -90,9 +93,10 @@ - (nullable ModelRuntimeTensorValueBridgingTuple *)floatRepresentationAndReturnE
   }
 
   if (error) {
-    *error = [ModelRuntimeValueErrorFactory
-              invalidType:[NSString stringWithFormat:@"torch::executor::ScalarType::%hhd", _tensor->scalar_type()]
-              expectedType:@"torch::executor::ScalarType::Float"];
+    *error = [NSError
+        errorWithDomain:@"ExecutorchRuntimeEngine"
+        code:(NSInteger)executorch::runtime::Error::InvalidArgument
+        userInfo: @{NSDebugDescriptionErrorKey: [NSString stringWithFormat:@"Invalid type: torch::executor::ScalarType::%hhd, expected torch::executor::ScalarType::Float", _tensor->scalar_type()]}];
   }
 
   return nil;

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

@@ -5,7 +5,7 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
- 
+
 #import "ExecutorchRuntimeValue.h"
 
 #import <map>
@@ -48,9 +48,10 @@ - (nullable ExecutorchRuntimeTensorValue *)asTensorValueAndReturnError:(NSError
   }
 
   if (error) {
-    *error = [ModelRuntimeValueErrorFactory
-              invalidType:[NSString stringWithFormat:@"Tag::%d", _value.tag]
-              expectedType:@"Tag::Tensor"];
+    *error = [NSError
+      errorWithDomain:@"ExecutorchRuntimeEngine"
+      code:static_cast<uint32_t>(executorch::runtime::Error::InvalidArgument)
+      userInfo: @{NSDebugDescriptionErrorKey: [NSString stringWithFormat:@"Invalid type: Tag::%d, expected Tag::Tensor", _value.tag]}];
   }
   return nil;
 }

extension/apple/ExecutorchRuntimeBridge/ExecutorchRuntimeBridge/__tests__/ExecutorchRuntimeValueTests.mm

@@ -46,7 +46,8 @@ - (void)testTensorValueWithFloatArrayWithError
   NSError *error = nil;
   XCTAssertNil([[ExecutorchRuntimeTensorValue alloc] initWithTensor:*new torch::executor::Tensor(&tensorImpl) error:&error]);
   XCTAssertNotNil(error);
-  XCTAssertEqualObjects([error description], @"Invalid type: torch::executor::ScalarType::3, expected torch::executor::ScalarType::Float");
+  XCTAssertEqual(error.code, static_cast<uint32_t>(executorch::runtime::Error::InvalidArgument));
+  XCTAssertEqualObjects(error.userInfo[NSDebugDescriptionErrorKey], @"Invalid type: torch::executor::ScalarType::3, expected torch::executor::ScalarType::Float");
 }
 
 - (void)testTensorValueWithError
@@ -56,7 +57,8 @@ - (void)testTensorValueWithError
   NSError *error = nil;
   XCTAssertNil([value asTensorValueAndReturnError:&error]);
   XCTAssertNotNil(error);
-  XCTAssertEqualObjects([error description], @"Invalid type: Tag::4, expected Tag::Tensor");
+  XCTAssertEqual(error.code, static_cast<uint32_t>(executorch::runtime::Error::InvalidArgument));
+  XCTAssertEqualObjects(error.userInfo[NSDebugDescriptionErrorKey], @"Invalid type: Tag::4, expected Tag::Tensor");
 }
 
 @end