wip

Author: chmjkb

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/style_transfer/StyleTransfer.h>
 
@@ -19,5 +20,10 @@ void RnExecutorchInstaller::injectJSIBindings(
       *jsiRuntime, "loadStyleTransfer",
       RnExecutorchInstaller::loadModel<StyleTransfer>(jsiRuntime, jsCallInvoker,
                                                       "loadStyleTransfer"));
+
+  jsiRuntime->global().setProperty(
+      *jsiRuntime, "loadExecutorchModule",
+      RnExecutorchInstaller::loadModel<ExecutorchModule>(
+          jsiRuntime, jsCallInvoker, "loadExecutorchModule"));
 }
 } // namespace rnexecutorch

common/rnexecutorch/bindings/ExecutorchModule.cpp

@@ -2,6 +2,7 @@
 
 #include <fmt/core.h>
 #include <rnexecutorch/Log.h>
+#include <unordered_set>
 
 namespace rnexecutorch {
 
@@ -20,24 +21,28 @@ ExecutorchModule::ExecutorchModule(const std::string &modelSource,
   }
 }
 
+std::unordered_set<std::string> ExecutorchModule::methodNames() {
+  auto result = module->method_names();
+  if (!result.ok()) {
+    throw std::runtime_error("Failed to get method_names!");
+  }
+  return result.get();
+}
+
+bool ExecutorchModule::isLoaded() { return module->is_loaded(); }
+
 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(
-        fmt::format("Failed to load method with name {}", method_name));
+    throw std::runtime_error("Failed to load method");
   }
 
-  std::vector<int32_t> input_shape;
   auto input_meta = method_meta->input_tensor_meta(index);
   if (!input_meta.ok()) {
-    throw std::runtime_error(
-        fmt::format("Failed to load forward input {}", index));
-  }
-
-  for (auto size : input_meta->sizes()) {
-    input_shape.push_back(size);
+    throw std::runtime_error("Failed to load input for given method");
   }
-  return input_shape;
+  auto shape = input_meta->sizes();
+  return std::vector<int32_t>(shape.begin(), shape.end());
 }
 } // namespace rnexecutorch

common/rnexecutorch/bindings/ExecutorchModule.h

@@ -13,6 +13,8 @@ class ExecutorchModule {
   ExecutorchModule(const std::string &modelSource,
                    facebook::jsi::Runtime *runtime);
   std::vector<int32_t> getInputShape(std::string method_name, int index);
+  std::unordered_set<std::string> methodNames();
+  bool isLoaded();
 
 protected:
   std::unique_ptr<executorch::extension::Module> module;

common/rnexecutorch/host_objects/JsiConversions.h

@@ -2,6 +2,7 @@
 
 #include <jsi/jsi.h>
 #include <type_traits>
+#include <unordered_set>
 
 namespace rnexecutorch::jsiconversion {
 
@@ -11,6 +12,11 @@ using namespace facebook;
 
 template <typename T> T getValue(const jsi::Value &val, jsi::Runtime &runtime);
 
+template <>
+inline int getValue<int>(const jsi::Value &val, jsi::Runtime &runtime) {
+  return val.asNumber();
+}
+
 template <>
 inline double getValue<double>(const jsi::Value &val, jsi::Runtime &runtime) {
   return val.asNumber();
@@ -58,6 +64,26 @@ inline jsi::Value getJsiValue(jsi::Object &&value, jsi::Runtime &runtime) {
   return jsi::Value(std::move(value));
 }
 
+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::unordered_set<std::string> &uset,
+                              jsi::Runtime &runtime) {
+  jsi::Array array(runtime, uset.size());
+  size_t idx = 0;
+  for (const auto &str : uset) {
+    array.setValueAtIndex(runtime, idx++,
+                          jsi::String::createFromAscii(runtime, str));
+  }
+  return jsi::Value(runtime, array);
+}
+
 inline jsi::Value getJsiValue(const std::string &str, jsi::Runtime &runtime) {
   return jsi::String::createFromAscii(runtime, str);
 }

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,28 @@ 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"));
+    }
+
+    if constexpr (HasMethodNames<Model>) {
+      addFunctions(JSI_EXPORT_FUNCTION(ModelHostObject<Model>,
+                                       promiseHostFunction<&Model::methodNames>,
+                                       "methodNames"));
+    }
+
+    if constexpr (HasIsLoaded<Model>) {
+      addFunctions(JSI_EXPORT_FUNCTION(ModelHostObject<Model>,
+                                       promiseHostFunction<&Model::isLoaded>,
+                                       "isLoaded"));
+    }
   }
 
   // A generic host function that resolves a promise with a result of a

common/rnexecutorch/models/BaseModel.h

@@ -11,6 +11,7 @@ class BaseModel {
 public:
   BaseModel(const std::string &modelSource, facebook::jsi::Runtime *runtime);
   std::vector<std::vector<int32_t>> getInputShape();
+  std::vector<int32_t> getInputShape(std::string method_name, int index);
 
 protected:
   std::unique_ptr<executorch::extension::Module> module;

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

examples/computer-vision/ios/Podfile.lock

@@ -43,7 +43,7 @@ PODS:
   - hermes-engine (0.76.9):
     - hermes-engine/Pre-built (= 0.76.9)
   - hermes-engine/Pre-built (0.76.9)
-  - opencv-rne (0.1.0)
+  - opencv-rne (4.11.0)
   - RCT-Folly (2024.10.14.00):
     - boost
     - DoubleConversion
@@ -1322,11 +1322,11 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-executorch (0.3.2):
+  - react-native-executorch (0.3.1):
     - DoubleConversion
     - glog
     - hermes-engine
-    - opencv-rne (~> 0.1.0)
+    - opencv-rne (~> 4.11.0)
     - RCT-Folly (= 2024.10.14.00)
     - RCTRequired
     - RCTTypeSafety
@@ -1343,6 +1343,7 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
+    - sqlite3
     - Yoga
   - react-native-image-picker (7.2.3):
     - DoubleConversion
@@ -1857,6 +1858,9 @@ PODS:
     - ReactCommon/turbomodule/core
     - Yoga
   - SocketRocket (0.7.1)
+  - sqlite3 (3.49.2):
+    - sqlite3/common (= 3.49.2)
+  - sqlite3/common (3.49.2)
   - Yoga (0.0.0)
 
 DEPENDENCIES:
@@ -1944,6 +1948,7 @@ SPEC REPOS:
   trunk:
     - opencv-rne
     - SocketRocket
+    - sqlite3
 
 EXTERNAL SOURCES:
   boost:
@@ -2117,7 +2122,7 @@ SPEC CHECKSUMS:
   fmt: 01b82d4ca6470831d1cc0852a1af644be019e8f6
   glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
   hermes-engine: 9e868dc7be781364296d6ee2f56d0c1a9ef0bb11
-  opencv-rne: 63e933ae2373fc91351f9a348dc46c3f523c2d3f
+  opencv-rne: 2305807573b6e29c8c87e3416ab096d09047a7a0
   RCT-Folly: ea9d9256ba7f9322ef911169a9f696e5857b9e17
   RCTDeprecation: ebe712bb05077934b16c6bf25228bdec34b64f83
   RCTRequired: ca91e5dd26b64f577b528044c962baf171c6b716
@@ -2147,7 +2152,7 @@ SPEC CHECKSUMS:
   React-logger: c4052eb941cca9a097ef01b59543a656dc088559
   React-Mapbuffer: 33546a3ebefbccb8770c33a1f8a5554fa96a54de
   React-microtasksnativemodule: d80ff86c8902872d397d9622f1a97aadcc12cead
-  react-native-executorch: 63ab47d8a0c602a4dee0acb36f6e8d9891ad357f
+  react-native-executorch: 0375510055856a3854e4128afc5db8126615254f
   react-native-image-picker: dbc35687199a8bf89514e09b6b105557f9f63162
   react-native-safe-area-context: cd916088cac5300c3266876218377518987b995e
   react-native-skia: 9b4e1185bdc0d4e7e6488c5419b5643cc456dd2e
@@ -2181,6 +2186,7 @@ SPEC CHECKSUMS:
   RNReanimated: 2e5069649cbab2c946652d3b97589b2ae0526220
   RNSVG: b889dc9c1948eeea0576a16cc405c91c37a12c19
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
+  sqlite3: 3c950dc86011117c307eb0b28c4a7bb449dce9f1
   Yoga: feb4910aba9742cfedc059e2b2902e22ffe9954a
 
 PODFILE CHECKSUM: d2d76566c3147849493ab633854730a1f661227b

examples/computer-vision/package.json

@@ -17,7 +17,7 @@
     "metro-config": "^0.81.0",
     "react": "18.3.1",
     "react-native": "0.76.9",
-    "react-native-executorch": "^0.3.2",
+    "react-native-executorch": "/Users/jakubchmura/Desktop/SWM_AI/react-native-executorch/react-native-executorch-0.3.1-test2404.tgz",
     "react-native-image-picker": "^7.2.2",
     "react-native-loading-spinner-overlay": "^3.0.1",
     "react-native-reanimated": "~3.16.1",

examples/computer-vision/screens/StyleTransferScreen.tsx

@@ -4,8 +4,10 @@ import { getImage } from '../utils';
 import {
   useStyleTransfer,
   STYLE_TRANSFER_CANDY,
+  NewExecutorchModule,
 } from 'react-native-executorch';
 import { View, StyleSheet, Image } from 'react-native';
+import { useEffect } from 'react';
 
 export const StyleTransferScreen = ({
   imageUri,
@@ -18,6 +20,23 @@ export const StyleTransferScreen = ({
     modelSource: STYLE_TRANSFER_CANDY,
   });
 
+  useEffect(() => {
+    console.log('asdad');
+    const loadModel = async () => {
+      try {
+        const model = new NewExecutorchModule();
+        await model.load(STYLE_TRANSFER_CANDY);
+        console.log(await model.getInputShape('forward', 0));
+        console.log(await model.methodNames());
+        console.log(await model.isLoaded());
+      } catch (e) {
+        console.error('Error loading model:', e);
+      }
+    };
+
+    loadModel();
+  }, []);
+
   const handleCameraPress = async (isCamera: boolean) => {
     const image = await getImage(isCamera);
     const uri = image?.uri;
@@ -30,7 +49,7 @@ export const StyleTransferScreen = ({
     if (imageUri) {
       try {
         const output = await model.forward(imageUri);
-        setImageUri(output);
+        setImageUri(output as string);
       } catch (e) {
         console.error(e);
       }