chore: improve error handling, make getAllInputshapes accept a methodName param

Author: chmjkb

packages/react-native-executorch/common/rnexecutorch/models/BaseModel.cpp

@@ -28,22 +28,25 @@ BaseModel::BaseModel(const std::string &modelSource,
   memorySizeLowerBound = std::filesystem::file_size(modelPath);
 }
 
-std::vector<std::vector<int32_t>> BaseModel::getAllInputShapes() {
-    if (!module) {
+std::vector<std::vector<int32_t>>
+BaseModel::getAllInputShapes(std::string methodName) {
+  if (!module) {
     throw std::runtime_error("getInputShape called on unloaded model");
   }
-  auto method_meta = module->method_meta("forward");
+  auto method_meta = module->method_meta(methodName);
 
   if (!method_meta.ok()) {
-    throw std::runtime_error("Failed to load forward");
+    throw std::runtime_error("Failed to load method: " + methodName);
   }
   std::vector<std::vector<int32_t>> output;
   std::size_t numInputs = method_meta->num_inputs();
   output.reserve(numInputs);
   for (std::size_t input = 0; input < numInputs; ++input) {
     auto input_meta = method_meta->input_tensor_meta(input);
     if (!input_meta.ok()) {
-      throw std::runtime_error("Failed to load forward input");
+      throw std::runtime_error(
+          "Failed to load input no: " + std::to_string(input) + " for method " +
+          methodName);
     }
     auto shape = input_meta->sizes();
     output.emplace_back(std::vector<int32_t>(shape.begin(), shape.end()));
@@ -55,11 +58,4 @@ std::size_t BaseModel::getMemoryLowerBound() { return memorySizeLowerBound; }
 
 void BaseModel::unload() { module.reset(nullptr); }
 
-Result<std::vector<EValue>> BaseModel::forwardET(const EValue &input_value) {
-  if (!module) {
-    throw std::runtime_error("Forward called on unloaded model");
-  }
-  return module->forward(input_value);
-}
-
 } // namespace rnexecutorch

packages/react-native-executorch/common/rnexecutorch/models/BaseModel.h

@@ -6,6 +6,8 @@
 #include <ReactCommon/CallInvoker.h>
 #include <executorch/extension/module/module.h>
 #include <jsi/jsi.h>
+#include <rnexecutorch/jsi/OwningArrayBuffer.h>
+#include <rnexecutorch/utils/JsiTensorView.h>
 
 namespace rnexecutorch {
 using namespace facebook;
@@ -17,10 +19,16 @@ class BaseModel {
             std::shared_ptr<react::CallInvoker> callInvoker);
   std::size_t getMemoryLowerBound();
   void unload();
-  std::vector<std::vector<int32_t>> getAllInputShapes();
+  std::vector<std::vector<int32_t>>
+  getAllInputShapes(std::string methodName = "forward");
+  std::vector<std::shared_ptr<OwningArrayBuffer>>
+  forward(std::vector<JsiTensorView> tensorViewVec);
 
 protected:
-  Result<std::vector<EValue>> forwardET(const EValue &input_value);
+  // TODO: NEED TO CHANGE THE CONCEPT TO MATCH THE EXACT SIGNATURE OF THE SECOND
+  // FORWARD SO ITS NOT AMBIGUOUS
+  Result<std::vector<EValue>> forward(const EValue &input_value);
+  Result<std::vector<EValue>> forward(const std::vector<EValue> &input_value);
   // If possible, models should not use the JS runtime to keep JSI internals
   // away from logic, however, sometimes this would incur too big of a penalty
   // (unnecessary copies instead of working on JS memory). In this case