@novastera-oss/llamarn 0.1.3-beta.2 → 0.1.3-beta.4

package/android/CMakeLists.txt

@@ -90,6 +90,24 @@ target_compile_definitions(RNLlamaCpp PRIVATE
     -DGGML_OPENCL=1      # Enable OpenCL backend support for dynamic loading
 )
 
+# Conditionally enable GPU backends only if they're actually available
+if(VULKAN_BACKEND_AVAILABLE)
+    # Don't enable Vulkan on Android - causes crashes during auto-initialization
+    # target_compile_definitions(common PRIVATE -DGGML_VULKAN=1)
+    # target_compile_definitions(RNLlamaCpp PRIVATE -DGGML_VULKAN=1)
+    message(STATUS "Vulkan backend support disabled on Android to prevent crashes")
+else()
+    message(STATUS "Vulkan backend support disabled - library not available")
+endif()
+
+if(OPENCL_BACKEND_AVAILABLE)
+    target_compile_definitions(common PRIVATE -DGGML_OPENCL=1)
+    target_compile_definitions(RNLlamaCpp PRIVATE -DGGML_OPENCL=1)
+    message(STATUS "OpenCL backend support enabled for dynamic loading")
+else()
+    message(STATUS "OpenCL backend support disabled - library not available")
+endif()
+
 # Include directories
 target_include_directories(common PRIVATE
     ${CPP_DIR}
@@ -161,12 +179,16 @@ add_custom_command(TARGET RNLlamaCpp POST_BUILD
 
 # Also copy any optional GPU libraries if they exist
 if(EXISTS ${JNI_LIBS_DIR}/${ANDROID_ABI}/libggml-vulkan.so)
-    add_custom_command(TARGET RNLlamaCpp POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            ${JNI_LIBS_DIR}/${ANDROID_ABI}/libggml-vulkan.so
-            $<TARGET_FILE_DIR:RNLlamaCpp>/libggml-vulkan.so
-        COMMENT "Copying Vulkan library to build output directory"
-    )
+    # Don't copy Vulkan backend on Android - it crashes on emulators during auto-initialization
+    # Even with n_gpu_layers=0, llama.cpp tries to initialize all available backends
+    # and the Android emulator Vulkan driver is broken
+    message(STATUS "Skipping Vulkan backend copy to prevent emulator crashes")
+    # add_custom_command(TARGET RNLlamaCpp POST_BUILD
+    #     COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    #         ${JNI_LIBS_DIR}/${ANDROID_ABI}/libggml-vulkan.so
+    #         $<TARGET_FILE_DIR:RNLlamaCpp>/libggml-vulkan.so
+    #     COMMENT "Copying Vulkan library to build output directory"
+    # )
 endif()
 
 if(EXISTS ${JNI_LIBS_DIR}/${ANDROID_ABI}/libggml-opencl.so)

package/cpp/PureCppImpl.cpp

@@ -235,11 +235,38 @@ jsi::Value PureCppImpl::initLlama(jsi::Runtime &runtime, jsi::Object options) {
     }
 
     // Initialize using common_init_from_params
-    common_init_result result = common_init_from_params(params);
-
-    // Check if initialization was successful
-    if (!result.model || !result.context) {
-      throw std::runtime_error("Failed to initialize model and context");
+    common_init_result result;
+    
+    try {
+      result = common_init_from_params(params);
+      
+      // Check if initialization was successful
+      if (!result.model || !result.context) {
+        throw std::runtime_error("Failed to initialize model and context");
+      }
+    } catch (const std::exception& e) {
+      // If we were trying to use GPU and got a Vulkan/shader error, retry with CPU-only
+      if (params.n_gpu_layers > 0) {
+        // Other GPU error, still try CPU fallback
+        fprintf(stderr, "GPU initialization failed (%s), retrying with CPU-only\n", e.what());
+        
+        params.n_gpu_layers = 0;
+        
+        try {
+          result = common_init_from_params(params);
+          
+          if (!result.model || !result.context) {
+            throw std::runtime_error("Failed to initialize model and context even with CPU-only mode");
+          }
+          
+          fprintf(stderr, "Successfully recovered with CPU-only mode after GPU failure\n");
+        } catch (const std::exception& cpu_e) {
+          throw std::runtime_error(std::string("Model initialization failed: ") + cpu_e.what());
+        }
+      } else {
+        // Was already CPU-only, re-throw the original error
+        throw std::runtime_error(std::string("Model initialization failed: ") + e.what());
+      }
     }
 
     // Create and initialize rn_llama_context

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novastera-oss/llamarn",
-  "version": "0.1.3-beta.2",
+  "version": "0.1.3-beta.4",
   "description": "An attempt at a pure cpp turbo module library",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",