cleaned up jitpack and build for android, added dynamic threadpool settings

Author: Mateusz Kopciński

packages/react-native-executorch/android/build.gradle

@@ -25,7 +25,7 @@ def reactNativeArchitectures() {
   def value = rootProject.getProperties().get("reactNativeArchitectures")
   // react-native-executorch supports only these architectures. This is due to
   // Executorch not supporting anything else.
-  def defaultArchitectures = ["x86_64", "arm64-v8a"]
+  def defaultArchitectures = ["arm64-v8a"]
   if(!value) {
     return defaultArchitectures
   }
@@ -110,12 +110,6 @@ android {
     }
   }
 
-  packagingOptions {
-    excludes = [
-      "**/libexecutorch.so"
-    ]
-  }
-
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
@@ -173,7 +167,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation 'com.facebook.fbjni:fbjni:0.6.0'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation("com.github.software-mansion:react-native-executorch:main-SNAPSHOT")
+  implementation files('libs/classes.jar')
   implementation 'org.opencv:opencv:4.10.0'
   implementation("com.squareup.okhttp3:okhttp:4.9.2")
 }

packages/react-native-executorch/android/src/main/cpp/CMakeLists.txt

@@ -37,14 +37,16 @@ set(RN_VERSION_LINK_LIBRARIES
 add_library(pthreadpool SHARED IMPORTED)
 
 set_target_properties(pthreadpool PROPERTIES
-                      IMPORTED_LOCATION "${LIBS_DIR}/pthreadpool/${ANDROID_ABI}/libpthreadpool.so")
+                      IMPORTED_LOCATION "${LIBS_DIR}/pthreadpool/${ANDROID_ABI}/libpthreadpool.so"
+                      INTERFACE_INCLUDE_DIRECTORIES "${LIBS_DIR}/../../include/pthreadpool/")
                       # INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../third-party/executorch/backends/xnnpack/third-party/pthreadpool/include")
 
 # ------- cpuinfo -------
 add_library(cpuinfo SHARED IMPORTED)
 
 set_target_properties(cpuinfo PROPERTIES
-                      IMPORTED_LOCATION "${LIBS_DIR}/cpuinfo/${ANDROID_ABI}/libcpuinfo.so")
+                      IMPORTED_LOCATION "${LIBS_DIR}/cpuinfo/${ANDROID_ABI}/libcpuinfo.so"
+                      INTERFACE_INCLUDE_DIRECTORIES "${LIBS_DIR}/../../include/cpu-info/")
                       # INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../third-party/executorch/backends/xnnpack/third-party/cpuinfo/include")
 
 # ------- Executorch -------

packages/react-native-executorch/common/rnexecutorch/RnExecutorchInstaller.cpp

@@ -1,5 +1,6 @@
 #include "RnExecutorchInstaller.h"
 
+#include <rnexecutorch/Log.h>
 #include <rnexecutorch/TokenizerModule.h>
 #include <rnexecutorch/host_objects/JsiConversions.h>
 #include <rnexecutorch/models/classification/Classification.h>
@@ -12,6 +13,10 @@
 #include <rnexecutorch/models/speech_to_text/SpeechToText.h>
 #include <rnexecutorch/models/style_transfer/StyleTransfer.h>
 #include <rnexecutorch/models/vertical_ocr/VerticalOCR.h>
+#ifdef __ANDROID__
+#include <executorch/extension/threadpool/cpuinfo_utils.h>
+#include <executorch/extension/threadpool/threadpool.h>
+#endif
 
 namespace rnexecutorch {
 
@@ -65,10 +70,6 @@ void RnExecutorchInstaller::injectJSIBindings(
       RnExecutorchInstaller::loadModel<TextEmbeddings>(
           jsiRuntime, jsCallInvoker, "loadTextEmbeddings"));
 
-  jsiRuntime->global().setProperty(
-      *jsiRuntime, "loadSpeechToText",
-      RnExecutorchInstaller::loadModel<SpeechToText>(jsiRuntime, jsCallInvoker,
-                                                     "loadSpeechToText"));
   jsiRuntime->global().setProperty(*jsiRuntime, "loadLLM",
                                    RnExecutorchInstaller::loadModel<LLM>(
                                        jsiRuntime, jsCallInvoker, "loadLLM"));
@@ -80,5 +81,19 @@ void RnExecutorchInstaller::injectJSIBindings(
       *jsiRuntime, "loadVerticalOCR",
       RnExecutorchInstaller::loadModel<VerticalOCR>(jsiRuntime, jsCallInvoker,
                                                     "loadVerticalOCR"));
+
+  jsiRuntime->global().setProperty(
+      *jsiRuntime, "loadSpeechToText",
+      RnExecutorchInstaller::loadModel<SpeechToText>(jsiRuntime, jsCallInvoker,
+                                                     "loadSpeechToText"));
+
+#ifdef __ANDROID__
+  auto num_of_cores =
+      ::executorch::extension::cpuinfo::get_num_performant_cores();
+  ::executorch::extension::threadpool::get_threadpool()
+      ->_unsafe_reset_threadpool(num_of_cores);
+  log(LOG_LEVEL::Info, "Configuring xnnpack for ", num_of_cores, "threads");
+#endif
 }
+
 } // namespace rnexecutorch

packages/react-native-executorch/common/rnexecutorch/models/llm/LLM.cpp

@@ -16,13 +16,6 @@ LLM::LLM(const std::string &modelSource, const std::string &tokenizerSource,
     : runner(std::make_unique<example::Runner>(modelSource, tokenizerSource)),
       callInvoker(callInvoker) {
 
-  auto num_of_cores =
-      ::executorch::extension::cpuinfo::get_num_performant_cores();
-  log(LOG_LEVEL::Error, "num_of_cores", num_of_cores);
-
-  log(LOG_LEVEL::Error, "_unsafe_reset_threadpool",
-      ::executorch::extension::threadpool::get_threadpool()
-          ->_unsafe_reset_threadpool(num_of_cores));
   auto loadResult = runner->load();
   if (loadResult != Error::Ok) {
     throw std::runtime_error("Failed to load LLM runner, error code: " +