minor cleanup, changed the configurable threads to aarch64 only

Author: Mateusz Kopciński

apps/llm/android/.kotlin/errors/errors-1754380687676.log

@@ -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 = ["arm64-v8a"]
+  def defaultArchitectures = ["x86_64", "arm64-v8a"]
   if(!value) {
     return defaultArchitectures
   }

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

@@ -33,21 +33,6 @@ set(RN_VERSION_LINK_LIBRARIES
 )
 
 # Dependencies:
-# ------- pthreadpool -------
-add_library(pthreadpool SHARED IMPORTED)
-
-set_target_properties(pthreadpool PROPERTIES
-                      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"
-                      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 -------
 
@@ -56,6 +41,29 @@ add_library(executorch SHARED IMPORTED)
 set_target_properties(executorch PROPERTIES
                       IMPORTED_LOCATION "${LIBS_DIR}/executorch/${ANDROID_ABI}/libexecutorch.so")
 
+                      
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
+  target_compile_definitions(react-native-executorch PRIVATE ARCH_ARM64)
+
+  # ------- pthreadpool -------
+  add_library(pthreadpool SHARED IMPORTED)
+  
+  set_target_properties(pthreadpool PROPERTIES
+                        IMPORTED_LOCATION "${LIBS_DIR}/pthreadpool/${ANDROID_ABI}/libpthreadpool.so"
+                        INTERFACE_INCLUDE_DIRECTORIES "${LIBS_DIR}/../../include/pthreadpool/")
+  
+  # ------- cpuinfo -------
+  add_library(cpuinfo SHARED IMPORTED)
+  
+  set_target_properties(cpuinfo PROPERTIES
+                        IMPORTED_LOCATION "${LIBS_DIR}/cpuinfo/${ANDROID_ABI}/libcpuinfo.so"
+                        INTERFACE_INCLUDE_DIRECTORIES "${LIBS_DIR}/../../include/cpuinfo/")
+  set(EXECUTORCH_LIBS
+    "pthreadpool"
+    "cpuinfo"
+  )
+endif()
+
 # ------- OpenCV -------
 
 set(OPENCV_LIBS 
@@ -86,6 +94,5 @@ target_link_libraries(
   ${OPENCV_LIBS}
   ${OPENCV_THIRD_PARTY_LIBS}
   executorch
-  pthreadpool
-  cpuinfo
+  ${EXECUTORCH_LIBS}
 )

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

@@ -13,7 +13,9 @@
 #include <rnexecutorch/models/speech_to_text/SpeechToText.h>
 #include <rnexecutorch/models/style_transfer/StyleTransfer.h>
 #include <rnexecutorch/models/vertical_ocr/VerticalOCR.h>
-#ifdef __ANDROID__
+
+#ifdef defined(__ANDROID__) && defined(__aarch64__)
+#include <algorithm>
 #include <executorch/extension/threadpool/cpuinfo_utils.h>
 #include <executorch/extension/threadpool/threadpool.h>
 #endif
@@ -87,9 +89,9 @@ void RnExecutorchInstaller::injectJSIBindings(
       RnExecutorchInstaller::loadModel<SpeechToText>(jsiRuntime, jsCallInvoker,
                                                      "loadSpeechToText"));
 
-#ifdef __ANDROID__
-  auto num_of_cores =
-      ::executorch::extension::cpuinfo::get_num_performant_cores();
+#ifdef defined(__ANDROID__) && defined(__aarch64__)
+  auto num_of_cores = std::min(
+      ::executorch::extension::cpuinfo::get_num_performant_cores(), 3u);
   ::executorch::extension::threadpool::get_threadpool()
       ->_unsafe_reset_threadpool(num_of_cores);
   log(LOG_LEVEL::Info, "Configuring xnnpack for ", num_of_cores, "threads");

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

@@ -1,8 +1,6 @@
 #include "LLM.h"
 
 #include <executorch/extension/tensor/tensor.h>
-#include <executorch/extension/threadpool/cpuinfo_utils.h>
-#include <executorch/extension/threadpool/threadpool.h>
 #include <filesystem>
 #include <rnexecutorch/Log.h>
 

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

@@ -7,6 +7,7 @@
  */
 
 #pragma once
+#ifdef defined(__ANDROID__) && defined(__aarch64__)
 
 #include <cpuinfo.h>
 
@@ -22,3 +23,4 @@ namespace torch::executorch::cpuinfo { // DEPRECATED
 // the namespace `torch::executorch` instead of `torch::executor`.
 using ::executorch::extension::cpuinfo::get_num_performant_cores; // DEPRECATED
 } // namespace torch::executorch::cpuinfo
+#endif

…h/third-party/include/cpu-info/cpuinfo.h …ch/third-party/include/cpuinfo/cpuinfo.hpackages/react-native-executorch/third-party/include/cpu-info/cpuinfo.h renamed to packages/react-native-executorch/third-party/include/cpuinfo/cpuinfo.h packages/react-native-executorch/third-party/include/cpu-info/cpuinfo.h renamed to packages/react-native-executorch/third-party/include/cpuinfo/cpuinfo.h

@@ -7,6 +7,7 @@
  */
 
 #pragma once
+#ifdef defined(__ANDROID__) && defined(__aarch64__)
 
 #include <functional>
 #include <memory>
@@ -90,3 +91,4 @@ using ::executorch::extension::threadpool::get_pthreadpool; // DEPRECATED
 using ::executorch::extension::threadpool::get_threadpool;  // DEPRECATED
 using ::executorch::extension::threadpool::ThreadPool;      // DEPRECATED
 } // namespace torch::executorch::threadpool
+#endif