Merge origin/main into yolo-download

Author: kirklandsign

.github/workflows/android-build.yml

@@ -7,6 +7,7 @@
 name: Android Build
 
 on:
+  pull_request:
   schedule:
     # Run nightly at midnight UTC
     - cron: '0 0 * * *'
@@ -35,38 +36,49 @@ jobs:
             path: mv3/android/MV3Demo
           - name: YoloDemo
             path: Yolo/android
+          - name: WhisperDemo
+            path: whisper/android/WhisperApp
+            require_aar: true
+          - name: ParakeetDemo
+            path: parakeet/android/ParakeetApp
+            require_aar: true
 
 
     name: Build ${{ matrix.name }}
     steps:
       - name: Checkout repository
+        if: ${{ !matrix.require_aar || inputs.local_aar }}
         uses: actions/checkout@v4
 
       - name: Set up JDK 17
+        if: ${{ !matrix.require_aar || inputs.local_aar }}
         uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
 
       - name: Setup Gradle
+        if: ${{ !matrix.require_aar || inputs.local_aar }}
         uses: gradle/actions/setup-gradle@v4
 
       - name: Download local AAR
-        if: ${{ inputs.local_aar && (matrix.name == 'LlamaDemo' || matrix.name == 'YoloDemo') }}
+        if: ${{ inputs.local_aar && (matrix.name == 'LlamaDemo' || matrix.name == 'YoloDemo' || matrix.name == 'WhisperDemo' || matrix.name == 'ParakeetDemo') }}
         run: |
           mkdir -p ${{ matrix.path }}/app/libs
           curl -fL -o ${{ matrix.path }}/app/libs/executorch.aar "${{ inputs.local_aar }}"
 
       - name: Build with Gradle
+        if: ${{ !matrix.require_aar || inputs.local_aar }}
         working-directory: ${{ matrix.path }}
         run: |
-          if [ -n "${{ inputs.local_aar }}" ] && ([ "${{ matrix.name }}" == "LlamaDemo" ] || [ "${{ matrix.name }}" == "YoloDemo" ]); then
+          if [ -n "${{ inputs.local_aar }}" ] && ([ "${{ matrix.name }}" == "LlamaDemo" ] || [ "${{ matrix.name }}" == "YoloDemo" ] || [ "${{ matrix.name }}" == "WhisperDemo" ] || [ "${{ matrix.name }}" == "ParakeetDemo" ]); then
             ./gradlew build --no-daemon -PuseLocalAar=true
           else
             ./gradlew build --no-daemon
           fi
 
       - name: Rename APKs with demo name
+        if: ${{ !matrix.require_aar || inputs.local_aar }}
         working-directory: ${{ matrix.path }}/app/build/outputs/apk/
         run: |
           find . -name "*.apk" -type f -print0 | while IFS= read -r -d '' apk; do
@@ -78,6 +90,7 @@ jobs:
           done
 
       - name: Upload build artifacts
+        if: ${{ !matrix.require_aar || inputs.local_aar }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }}-apk

.gitignore

@@ -13,26 +13,27 @@ build/
 *.pte
 *.ptd
 
+# DMG files (should be distributed via GitHub Releases)
+*.dmg
+*.dmg.*
+
 # Xcode
 xcuserdata/
 .build/
 .swiftpm/
 *.xcworkspace/
 *.xcframework/
-*.iml
 
+# Android / IntelliJ
+*.iml
 .gradle
-/local.properties
-./idea
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
+.idea/
+local.properties
 /captures
 .externalNativeBuild
 .cxx
-local.properties
 *.aar
+
+node_modules/
+__pycache__/
+.cursor/

.gitmodules

@@ -3,7 +3,3 @@
 	url = https://github.com/pytorch/executorch.git
 	branch = release/1.0
 
-[submodule "program-data-separation/cpp/executorch"]
-	path = program-data-separation/cpp/executorch
-	url = https://github.com/pytorch/executorch.git
-	branch = main

LICENSE

@@ -2,7 +2,7 @@ BSD License
 
 For "ExecuTorch" software
 
-Copyright (c) Meta Platforms, Inc. and affiliates.
+Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

Yolo/android/README.md

@@ -14,31 +14,62 @@ Bird Detection Feature: Uses a two-stage pipeline where YOLO (COCO class 14) det
 Install dependencies
 
 ```
-pip install transformers torch pillow executorch
-Download EfficientNet bird classifier
-python -c "
-from transformers import AutoImageProcessor, AutoModelForImageClassification
-import torch
-model_name = 'dennisjooo/Birds-Classifier-EfficientNetB2'
-processor = AutoImageProcessor.from_pretrained(model_name)
-model = AutoModelForImageClassification.from_pretrained(model_name)
-model.save_pretrained('./bird_classifier_model')
-processor.save_pretrained('./bird_classifier_model')
-print('Bird classifier downloaded')
+import torch                                                                                                                                  
+from transformers import AutoModelForImageClassification  
+from torch.export import export                                                                                                               
+from executorch.exir import to_edge_transform_and_lower   
+from executorch.backends.xnnpack.partition.xnnpack_partitioner import XnnpackPartitioner
+
+# Download and load model
+model = AutoModelForImageClassification.from_pretrained("chriamue/bird-species-classifier")
+model.eval()
+
+# Export to ExecuTorch
+example_input = torch.randn(1, 3, 224, 224)
+exported_program = export(model, (example_input,))
+edge_program = to_edge_transform_and_lower(
+    exported_program,
+    partitioner=[XnnpackPartitioner()]
+)
+et_program = edge_program.to_executorch()
+
+# Save as .pte file
+with open("bird_classifier.pte", "wb") as f:
+    et_program.write_to_file(f)
+print("Bird classifier converted to bird_classifier.pte")
+
+Run it from a regular terminal (not Claude Code) to avoid the proxy block:
+
+cd /home/sidart/executorch
+python convert_bird_classifier.py
 "
 ```
 
-### YOLO Detection Model
+##  Detection Model
+
+The app supports both v8 and v26 and automatically detects which version you're using based on the model output format.
 
-Install YOLOv8
+Install Ultralytics:
 
 ```
 pip install ultralytics
-Download YOLO model
+```
+
+### Download  model
+
+#### Option 1: v8 
 python -c "
-from ultralytics import YOLO
-model = YOLO('yolov8n.pt') # nano version for mobile
-print('YOLO model downloaded')
+from ultralytics import 
+model = ('v8n.pt') # nano version for mobile
+print('v8 model downloaded')
+"
+```
+
+#### Option 2: v26 (Recommended - Faster & More Accurate)
+python -c "
+from ultralytics import 
+model = ('26n.pt')  # nano version for mobile
+print('v26 model downloaded')
 "
 ```
 
@@ -76,31 +107,38 @@ print("Bird classifier converted to bird_classifier.pte")
 ### Convert YOLO Model
 
 convert_yolo.py
+This script works for both YOLOv8 and YOLOv26 - just change the model filename.
 
 ```
 from ultralytics import YOLO
 import torch
 from torch.export import export
 from executorch.exir import to_edge_transform_and_lower
 from executorch.backends.xnnpack.partition.xnnpack_partitioner import XnnpackPartitioner
-Load YOLO model
-yolo = YOLO('yolov8n.pt')
+
+# Load YOLO model
+# Use 'yolov8n.pt' for YOLOv8 OR 'yolo26n.pt' for YOLOv26
+yolo = YOLO('yolo26n.pt')  # Recommended: YOLOv26 for better performance
 pytorch_model = yolo.model
 pytorch_model.eval()
-Export to ExecuTorch
+
+# Export to ExecuTorch
 example_input = torch.randn(1, 3, 640, 640)
 exported_program = export(pytorch_model, (example_input,))
 edge_program = to_edge_transform_and_lower(
-exported_program,
-partitioner=[XnnpackPartitioner()]
+    exported_program,
+    partitioner=[XnnpackPartitioner()]
 )
 et_program = edge_program.to_executorch()
-Save as .pte file
+
+# Save as .pte file
 with open("yolo_detector.pte", "wb") as f:
-et_program.write_to_file(f)
+    et_program.write_to_file(f)
 print("YOLO model converted to yolo_detector.pte")
 ```
 
+#### Auto-Detection: The app automatically detects which YOLO version you're using (v8 or v26) based on the model's output format. No code changes needed when switching between versions!
+
 ### Generate Bird Species Names
 
 extract_species_names.py

Yolo/android/app/build.gradle.kts

@@ -7,78 +7,80 @@
  */
 
 plugins {
-  id("com.android.application")
-  id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
 }
 
 val qnnVersion: String? = project.findProperty("qnnVersion") as? String
 val useLocalAar: Boolean? = (project.findProperty("useLocalAar") as? String)?.toBoolean()
 
 android {
-  namespace = "com.example.executorchyolodemo"
-  compileSdk = 34
+    namespace = "com.example.executorchyolodemo"
+    compileSdk = 35
 
-  defaultConfig {
-    applicationId = "com.example.executorchyolodemo"
-    minSdk = 28
-    targetSdk = 33
-    versionCode = 1
-    versionName = "1.0"
+    defaultConfig {
+        applicationId = "com.example.executorchyolodemo"
+        minSdk = 28
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
 
-    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    vectorDrawables { useSupportLibrary = true }
-    externalNativeBuild { cmake { cppFlags += "" } }
-  }
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables { useSupportLibrary = true }
+        externalNativeBuild { cmake { cppFlags += "" } }
+    }
 
-  buildTypes {
-    release {
-      isMinifyEnabled = false
-      proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
     }
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-  }
-  kotlinOptions { jvmTarget = "1.8" }
-  buildFeatures { compose = true }
-  composeOptions { kotlinCompilerExtensionVersion = "1.5.14" }
-  packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
+    buildFeatures {
+        compose = true
+    }
+    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
 dependencies {
-  implementation("androidx.core:core-ktx:1.9.0")
-  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-  implementation("androidx.activity:activity-compose:1.7.0")
-  implementation(platform("androidx.compose:compose-bom:2023.03.00"))
-  implementation("androidx.compose.ui:ui")
-  implementation("androidx.compose.ui:ui-graphics")
-  implementation("androidx.compose.ui:ui-tooling-preview")
-  implementation("androidx.compose.material3:material3")
-  implementation("androidx.appcompat:appcompat:1.6.1")
-  implementation("androidx.camera:camera-core:1.3.0-rc02")
-  implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha12")
-  implementation("com.facebook.fbjni:fbjni:0.5.1")
-  implementation("com.google.code.gson:gson:2.8.6")
-  if (useLocalAar == true) {
-    implementation(files("libs/executorch.aar"))
-  } else {
-    implementation("org.pytorch:executorch-android:1.1.0")
-  }
-
-  implementation("com.google.android.material:material:1.12.0")
-  implementation("androidx.activity:activity:1.9.0")
-  implementation("org.json:json:20250107")
-  testImplementation("junit:junit:4.13.2")
-  androidTestImplementation("androidx.test.ext:junit:1.1.5")
-  androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-  androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
-  androidTestImplementation("androidx.compose.ui:ui-test-junit4")
-  debugImplementation("androidx.compose.ui:ui-tooling")
-  debugImplementation("androidx.compose.ui:ui-test-manifest")
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.material3)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation("androidx.constraintlayout:constraintlayout:2.2.0")
+    implementation("com.facebook.fbjni:fbjni:0.5.1")
+    implementation("com.google.code.gson:gson:2.10.1")
+    if (useLocalAar == true) {
+        implementation(files("libs/executorch.aar"))
+    } else {
+        implementation("org.pytorch:executorch-android:1.1.0")
+    }
+    implementation("androidx.activity:activity:1.9.0")
+    implementation("org.json:json:20250107")
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
 
-  implementation ("androidx.camera:camera-camera2:1.3.0")
-  implementation ("androidx.camera:camera-lifecycle:1.3.0")
-  implementation ("androidx.camera:camera-view:1.3.0")
-  implementation ("com.google.code.gson:gson:2.10.1")
+    implementation(libs.androidx.camera.core)
+    implementation(libs.androidx.camera.camera2)
+    implementation(libs.androidx.camera.lifecycle)
+    implementation(libs.androidx.camera.view)
 }