wip

chmjkb · chmjkb · commit 9fa5c9f15a6c · 2025-06-04T16:05:20.000+02:00
diff --git a/packages/react-native-executorch/common/rnexecutorch/RnExecutorchInstaller.cpp b/packages/react-native-executorch/common/rnexecutorch/RnExecutorchInstaller.cpp
@@ -1,5 +1,6 @@
 #include "RnExecutorchInstaller.h"
 
+#include <rnexecutorch/bindings/ExecutorchModule.h>
 #include <rnexecutorch/host_objects/JsiConversions.h>
 #include <rnexecutorch/models/image_segmentation/ImageSegmentation.h>
 #include <rnexecutorch/models/style_transfer/StyleTransfer.h>
@@ -25,5 +26,10 @@ void RnExecutorchInstaller::injectJSIBindings(
       *jsiRuntime, "loadImageSegmentation",
       RnExecutorchInstaller::loadModel<ImageSegmentation>(
           jsiRuntime, jsCallInvoker, "loadImageSegmentation"));
+
+  jsiRuntime->global().setProperty(
+      *jsiRuntime, "loadExecutorchModule",
+      RnExecutorchInstaller::loadModel<ExecutorchModule>(
+          jsiRuntime, jsCallInvoker, "loadExecutorchModule"));
 }
 } // namespace rnexecutorch
diff --git a/packages/react-native-executorch/common/rnexecutorch/bindings/ExecutorchModule.cpp b/packages/react-native-executorch/common/rnexecutorch/bindings/ExecutorchModule.cpp
@@ -0,0 +1,44 @@
+#include "ExecutorchModule.h"
+
+#include <rnexecutorch/Log.h>
+#include <sstream>
+
+namespace rnexecutorch {
+
+using ::executorch::extension::Module;
+using ::executorch::runtime::Error;
+using namespace facebook;
+
+ExecutorchModule::ExecutorchModule(
+    const std::string &modelSource,
+    std::shared_ptr<react::CallInvoker> callInvoker)
+    : module(std::make_unique<Module>(
+          modelSource, Module::LoadMode::MmapUseMlockIgnoreErrors)),
+      callInvoker(callInvoker) {
+  Error loadError = module->load();
+  if (loadError != Error::Ok) {
+    throw std::runtime_error("Couldn't load the model, error: " +
+                             std::to_string(static_cast<uint32_t>(loadError)));
+  }
+}
+
+std::vector<int32_t> ExecutorchModule::getInputShape(std::string method_name,
+                                                     int index) {
+  auto method_meta = module->method_meta(method_name);
+  if (!method_meta.ok()) {
+    throw std::runtime_error("Failed to load method with name " + method_name);
+  }
+
+  std::vector<int32_t> input_shape;
+  auto input_meta = method_meta->input_tensor_meta(index);
+  if (!input_meta.ok()) {
+    throw std::runtime_error("Failed to load forward input " +
+                             std::to_string(index));
+  }
+
+  for (auto size : input_meta->sizes()) {
+    input_shape.push_back(size);
+  }
+  return input_shape;
+}
+} // namespace rnexecutorch
diff --git a/packages/react-native-executorch/common/rnexecutorch/bindings/ExecutorchModule.h b/packages/react-native-executorch/common/rnexecutorch/bindings/ExecutorchModule.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <string>
+
+#include <ReactCommon/CallInvoker.h>
+#include <executorch/extension/module/module.h>
+#include <jsi/jsi.h>
+
+namespace rnexecutorch {
+
+class ExecutorchModule {
+public:
+  ExecutorchModule(const std::string &modelSource,
+                   std::shared_ptr<facebook::react::CallInvoker> callInvoker);
+  std::vector<int32_t> getInputShape(std::string method_name, int index);
+
+protected:
+  std::unique_ptr<executorch::extension::Module> module;
+  std::shared_ptr<facebook::react::CallInvoker> callInvoker;
+};
+
+} // namespace rnexecutorch
diff --git a/packages/react-native-executorch/common/rnexecutorch/host_objects/JsiConversions.h b/packages/react-native-executorch/common/rnexecutorch/host_objects/JsiConversions.h
@@ -18,6 +18,11 @@ inline double getValue<double>(const jsi::Value &val, jsi::Runtime &runtime) {
   return val.asNumber();
 }
 
+template <>
+inline int getValue<int>(const jsi::Value &val, jsi::Runtime &runtime) {
+  return val.asNumber();
+}
+
 template <>
 inline bool getValue<bool>(const jsi::Value &val, jsi::Runtime &runtime) {
   return val.asBool();
@@ -74,6 +79,15 @@ inline jsi::Value getJsiValue(std::shared_ptr<jsi::Object> valuePtr,
   return std::move(*valuePtr);
 }
 
+inline jsi::Value getJsiValue(const std::vector<int32_t> &vec,
+                              jsi::Runtime &runtime) {
+  jsi::Array array(runtime, vec.size());
+  for (size_t i = 0; i < vec.size(); i++) {
+    array.setValueAtIndex(runtime, i, jsi::Value(static_cast<int>(vec[i])));
+  }
+  return jsi::Value(runtime, array);
+}
+
 inline jsi::Value getJsiValue(const std::string &str, jsi::Runtime &runtime) {
   return jsi::String::createFromAscii(runtime, str);
 }
diff --git a/packages/react-native-executorch/common/rnexecutorch/host_objects/ModelHostObject.h b/packages/react-native-executorch/common/rnexecutorch/host_objects/ModelHostObject.h
@@ -11,6 +11,7 @@
 #include <rnexecutorch/host_objects/JsiConversions.h>
 #include <rnexecutorch/jsi/JsiHostObject.h>
 #include <rnexecutorch/jsi/Promise.h>
+#include <rnexecutorch/utils/TypeConstraints.h>
 
 namespace rnexecutorch {
 
@@ -19,9 +20,16 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
   explicit ModelHostObject(const std::shared_ptr<Model> &model,
                            std::shared_ptr<react::CallInvoker> callInvoker)
       : model(model), callInvoker(callInvoker) {
-    addFunctions(JSI_EXPORT_FUNCTION(ModelHostObject<Model>,
-                                     promiseHostFunction<&Model::forward>,
-                                     "forward"));
+    if constexpr (HasForward<Model>) {
+      addFunctions(JSI_EXPORT_FUNCTION(ModelHostObject<Model>,
+                                       promiseHostFunction<&Model::forward>,
+                                       "forward"));
+    }
+    if constexpr (HasGetInputShape<Model>) {
+      addFunctions(JSI_EXPORT_FUNCTION(
+          ModelHostObject<Model>, promiseHostFunction<&Model::getInputShape>,
+          "getInputShape"));
+    }
   }
 
   // A generic host function that resolves a promise with a result of a
diff --git a/packages/react-native-executorch/common/rnexecutorch/models/BaseModel.cpp b/packages/react-native-executorch/common/rnexecutorch/models/BaseModel.cpp
@@ -20,7 +20,7 @@ BaseModel::BaseModel(const std::string &modelSource,
   }
 }
 
-std::vector<std::vector<int32_t>> BaseModel::getInputShape() {
+std::vector<std::vector<int32_t>> BaseModel::getAllInputShapes() {
   auto method_meta = module->method_meta("forward");
 
   if (!method_meta.ok()) {
diff --git a/packages/react-native-executorch/common/rnexecutorch/models/BaseModel.h b/packages/react-native-executorch/common/rnexecutorch/models/BaseModel.h
@@ -13,7 +13,7 @@ class BaseModel {
 public:
   BaseModel(const std::string &modelSource,
             std::shared_ptr<react::CallInvoker> callInvoker);
-  std::vector<std::vector<int32_t>> getInputShape();
+  std::vector<std::vector<int32_t>> getAllInputShapes();
 
 protected:
   std::unique_ptr<executorch::extension::Module> module;
diff --git a/packages/react-native-executorch/common/rnexecutorch/models/image_segmentation/ImageSegmentation.cpp b/packages/react-native-executorch/common/rnexecutorch/models/image_segmentation/ImageSegmentation.cpp
@@ -15,7 +15,7 @@ ImageSegmentation::ImageSegmentation(
     const std::string &modelSource,
     std::shared_ptr<react::CallInvoker> callInvoker)
     : BaseModel(modelSource, callInvoker) {
-  auto inputTensors = getInputShape();
+  auto inputTensors = getAllInputShapes();
   if (inputTensors.size() == 0) {
     throw std::runtime_error("Model seems to not take any input tensors.");
   }
@@ -58,9 +58,9 @@ ImageSegmentation::preprocess(const std::string &imageSource) {
   cv::resize(input, input, modelImageSize);
 
   std::vector<float> inputVector = imageprocessing::colorMatToVector(input);
-  return {
-      executorch::extension::make_tensor_ptr(getInputShape()[0], inputVector),
-      inputSize};
+  return {executorch::extension::make_tensor_ptr(getAllInputShapes()[0],
+                                                 inputVector),
+          inputSize};
 }
 
 std::shared_ptr<jsi::Object> ImageSegmentation::postprocess(
diff --git a/packages/react-native-executorch/common/rnexecutorch/models/style_transfer/StyleTransfer.cpp b/packages/react-native-executorch/common/rnexecutorch/models/style_transfer/StyleTransfer.cpp
@@ -17,7 +17,7 @@ using executorch::runtime::Error;
 StyleTransfer::StyleTransfer(const std::string &modelSource,
                              std::shared_ptr<react::CallInvoker> callInvoker)
     : BaseModel(modelSource, callInvoker) {
-  auto inputTensors = getInputShape();
+  auto inputTensors = getAllInputShapes();
   if (inputTensors.size() == 0) {
     throw std::runtime_error("Model seems to not take any input tensors.");
   }
@@ -40,7 +40,7 @@ StyleTransfer::preprocess(const std::string &imageSource) {
   auto originalSize = image.size();
   cv::resize(image, image, modelImageSize);
 
-  return {imageprocessing::getTensorFromMatrix(getInputShape()[0], image),
+  return {imageprocessing::getTensorFromMatrix(getAllInputShapes()[0], image),
           originalSize};
 }
 
diff --git a/packages/react-native-executorch/common/rnexecutorch/utils/TypeConstraints.h b/packages/react-native-executorch/common/rnexecutorch/utils/TypeConstraints.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <concepts>
+
+namespace rnexecutorch {
+template <typename T>
+concept HasForward = requires(T t) {
+  { &T::forward };
+};
+
+template <typename T>
+concept HasMethodNames = requires(T t) {
+  { &T::methodNames };
+};
+
+template <typename T>
+concept HasGetInputShape = requires(T t) {
+  { &T::getInputShape };
+};
+
+template <typename T>
+concept HasIsLoaded = requires(T t) {
+  { &T::isLoaded };
+};
+} // namespace rnexecutorch
diff --git a/packages/react-native-executorch/src/index.tsx b/packages/react-native-executorch/src/index.tsx
@@ -6,6 +6,7 @@ import { ETInstallerNativeModule } from './native/RnExecutorchModules';
 declare global {
   var loadStyleTransfer: (source: string) => Promise<any>;
   var loadImageSegmentation: (source: string) => Promise<any>;
+  var loadExecutorchModule: (source: string) => any;
 }
 // eslint-disable no-var
 
diff --git a/packages/react-native-executorch/src/modules/general/NewExecutorchModule.ts b/packages/react-native-executorch/src/modules/general/NewExecutorchModule.ts
@@ -0,0 +1,26 @@
+import { ETError, getError } from '../../Error';
+import { ETModuleNativeModule } from '../../native/RnExecutorchModules';
+import { ResourceSource } from '../../types/common';
+import { ETInput } from '../../types/common';
+import { getTypeIdentifier } from '../../types/common';
+import { BaseModule } from '../BaseModule';
+
+export class NewExecutorchModule {
+  private nativeModule;
+
+  constructor(modelSource: ResourceSource) {
+    this.nativeModule = global.loadExecutorchModule(modelSource as string);
+  }
+
+  static async forward() {
+    throw Error('Not yet implemented!');
+  }
+
+  static async getInputShape(methodName: string, index: number) {
+    this.nativeModule.getInputShape();
+  }
+
+  static async loadForward() {
+    await this.loadMethod('forward');
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ BaseModel::BaseModel(const std::string &modelSource,`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-std::vector<std::vector<int32_t>> BaseModel::getInputShape() {`
	`23`	`+std::vector<std::vector<int32_t>> BaseModel::getAllInputShapes() {`
`24`	`24`	`auto method_meta = module->method_meta("forward");`
`25`	`25`
`26`	`26`	`if (!method_meta.ok()) {`