Revert "Fix QNN_CONTEXT format mappings and ALOGD fallback for Genie integration"

This reverts commit c30b3cd.

Author: sanchitmonga22

examples/android/RunAnywhereAI/app/build.gradle.kts

@@ -221,7 +221,7 @@ dependencies {
     implementation(project(":runanywhere-core-onnx")) // ~30MB - STT, TTS, VAD
     // RAG pipeline is now part of the core SDK (not a separate module)
     // Genie: closed-source AAR from private repo (or mavenLocal for dev)
-    implementation("com.runanywhere.sdk:runanywhere-genie-android:0.2.0-SNAPSHOT")
+    implementation("com.runanywhere.sdk:runanywhere-genie-android:0.1.5-SNAPSHOT")
 
     // AndroidX Core & Lifecycle
     implementation(libs.androidx.core.ktx)

sdk/runanywhere-commons/src/features/llm/rac_llm_service.cpp

@@ -17,7 +17,7 @@
 #include <android/log.h>
 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, "RAC_LLM_SVC", __VA_ARGS__)
 #else
-#define ALOGD(...) do { fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); } while(0)
+#define ALOGD(...) fprintf(stderr, __VA_ARGS__)
 #endif
 
 #include "rac/core/rac_core.h"

sdk/runanywhere-commons/src/infrastructure/model_management/model_assignment.cpp

@@ -220,8 +220,6 @@ static std::vector<rac_model_info_t*> parse_models_json(const char* json_str, si
             model->format = RAC_MODEL_FORMAT_BIN;
         else if (format == "coreml" || format == "mlmodelc" || format == "mlpackage")
             model->format = RAC_MODEL_FORMAT_COREML;
-        else if (format == "qnn_context" || format == "qnn")
-            model->format = RAC_MODEL_FORMAT_QNN_CONTEXT;
         else
             model->format = RAC_MODEL_FORMAT_UNKNOWN;
 

sdk/runanywhere-commons/src/infrastructure/model_management/model_types.cpp

@@ -403,9 +403,6 @@ rac_bool_t rac_model_detect_framework_from_format(rac_model_format_t format,
         case RAC_MODEL_FORMAT_BIN:
             *out_framework = RAC_FRAMEWORK_FLUID_AUDIO;
             return RAC_TRUE;
-        case RAC_MODEL_FORMAT_QNN_CONTEXT:
-            *out_framework = RAC_FRAMEWORK_GENIE;
-            return RAC_TRUE;
         default:
             return RAC_FALSE;
     }

sdk/runanywhere-commons/src/infrastructure/registry/service_registry.cpp

@@ -23,7 +23,7 @@
 #include <android/log.h>
 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, "RAC_SVC_REG", __VA_ARGS__)
 #else
-#define ALOGD(...) do { fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); } while(0)
+#define ALOGD(...) fprintf(stderr, __VA_ARGS__)
 #endif
 
 #include "rac/core/rac_core.h"

sdk/runanywhere-kotlin/src/commonMain/kotlin/com/runanywhere/sdk/public/extensions/Models/ModelTypes.kt

@@ -45,7 +45,6 @@ enum class ModelFormat(
     ORT("ort"),
     GGUF("gguf"),
     BIN("bin"),
-    QNN_CONTEXT("qnn_context"),
     UNKNOWN("unknown"),
 }
 

sdk/runanywhere-kotlin/src/jvmAndroidMain/kotlin/com/runanywhere/sdk/foundation/bridge/extensions/CppBridgeModelRegistry.kt

@@ -79,7 +79,6 @@ object CppBridgeModelRegistry {
         const val ORT = 3 // RAC_MODEL_FORMAT_ORT
         const val BIN = 4 // RAC_MODEL_FORMAT_BIN
         const val COREML = 5 // RAC_MODEL_FORMAT_COREML
-        const val QNN_CONTEXT = 5 // RAC_MODEL_FORMAT_QNN_CONTEXT (same C++ value; COREML is 4 in C++)
         const val TFLITE = 6 // RAC_MODEL_FORMAT_TFLITE
     }
 

sdk/runanywhere-kotlin/src/jvmAndroidMain/kotlin/com/runanywhere/sdk/public/extensions/RunAnywhere+ModelManagement.jvmAndroid.kt

@@ -92,7 +92,6 @@ internal actual fun registerModelInternal(modelInfo: ModelInfo) {
                         ModelFormat.GGUF -> CppBridgeModelRegistry.ModelFormat.GGUF
                         ModelFormat.ONNX -> CppBridgeModelRegistry.ModelFormat.ONNX
                         ModelFormat.ORT -> CppBridgeModelRegistry.ModelFormat.ORT
-                        ModelFormat.QNN_CONTEXT -> CppBridgeModelRegistry.ModelFormat.QNN_CONTEXT
                         else -> CppBridgeModelRegistry.ModelFormat.UNKNOWN
                     },
                 // CRITICAL: Map InferenceFramework to C++ framework constant
@@ -296,7 +295,6 @@ private fun bridgeModelToPublic(bridge: CppBridgeModelRegistry.ModelInfo): Model
                 CppBridgeModelRegistry.ModelFormat.GGUF -> ModelFormat.GGUF
                 CppBridgeModelRegistry.ModelFormat.ONNX -> ModelFormat.ONNX
                 CppBridgeModelRegistry.ModelFormat.ORT -> ModelFormat.ORT
-                CppBridgeModelRegistry.ModelFormat.QNN_CONTEXT -> ModelFormat.QNN_CONTEXT
                 else -> ModelFormat.UNKNOWN
             },
         framework =
@@ -1348,7 +1346,6 @@ private fun parseModelAssignmentsJson(json: String): List<ModelInfo> {
                                 1 -> ModelFormat.GGUF
                                 2 -> ModelFormat.ONNX
                                 3 -> ModelFormat.ORT
-                                5 -> ModelFormat.QNN_CONTEXT
                                 else -> ModelFormat.UNKNOWN
                             },
                         framework =

sdk/runanywhere-kotlin/src/jvmAndroidMain/kotlin/com/runanywhere/sdk/public/extensions/RunAnywhere+Storage.jvmAndroid.kt

@@ -231,7 +231,6 @@ private fun convertToModelStorageMetrics(
             CppBridgeModelRegistry.ModelFormat.ONNX -> ModelFormat.ONNX
             CppBridgeModelRegistry.ModelFormat.ORT -> ModelFormat.ORT
             CppBridgeModelRegistry.ModelFormat.BIN -> ModelFormat.BIN
-            CppBridgeModelRegistry.ModelFormat.QNN_CONTEXT -> ModelFormat.QNN_CONTEXT
             else -> ModelFormat.UNKNOWN
         }