-
Notifications
You must be signed in to change notification settings - Fork 29
Add whisper and parakeet to build list #211
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
1f520f1
Add Parakeet demo Android app based on Whisper demo
kirklandsign a777abd
Add ExecuTorch AAR download instructions to Parakeet README
kirklandsign 624c84b
Remove unused
kirklandsign f9b1b3e
Allow using local AAR
kirklandsign a7ce8d7
Add Whisper and Parakeet to Android build workflow
kirklandsign dfce255
Fix matrix context not available in job-level if condition
kirklandsign 5695b7d
Add missing JUnit test dependency to Parakeet and Whisper apps
kirklandsign d72b1ea
Hold to record
kirklandsign dd0c964
Clean up whisper stuff
kirklandsign f2fde90
Merge branch 'parakeet' into asr-build
kirklandsign d3ce4a6
Merge remote-tracking branch 'origin/main' into asr-build
kirklandsign baad8f0
Fix build
kirklandsign 9d89d87
PR
kirklandsign 0ed3f8a
Merge remote-tracking branch 'origin/main' into asr-build
kirklandsign f690fed
Merge remote-tracking branch 'origin/main' into asr-build
kirklandsign File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -97,30 +97,6 @@ protected void onCreate(Bundle savedInstanceState) { | |
| } | ||
| } | ||
|
Comment on lines
80
to
98
|
||
|
|
||
| @Override | ||
| protected void onDestroy() { | ||
| super.onDestroy(); | ||
|
|
||
| // Clean up the detection pipeline | ||
| if (detectionPipeline != null) { | ||
| detectionPipeline.close(); | ||
| detectionPipeline = null; | ||
| } | ||
|
|
||
| Log.d(TAG, "BirdDetectionActivity destroyed"); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onPause() { | ||
| super.onPause(); | ||
|
|
||
| // Optional: Release resources when app goes to background | ||
| if (detectionPipeline != null) { | ||
| detectionPipeline.close(); | ||
| detectionPipeline = null; | ||
| } | ||
| } | ||
|
|
||
| private void initializeViews() { | ||
| previewView = findViewById(R.id.previewView); | ||
| overlayImageView = findViewById(R.id.overlayImageView); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -154,22 +154,19 @@ private void loadBirdSpeciesNames(Context context) throws IOException { | |
| public List<BirdDetection> detectBirds(Bitmap bitmap) { | ||
| List<BirdDetection> results = new ArrayList<>(); | ||
| frameCounter++; | ||
|
|
||
| Tensor yoloInput = null; | ||
| EValue[] yoloOutputs = null; | ||
|
|
||
|
|
||
| try { | ||
| // Cleanup old detection history every 30 frames | ||
| if (frameCounter % 30 == 0) { | ||
| cleanupOldDetections(); | ||
| } | ||
| yoloInput = preprocessForYolo(bitmap); | ||
|
|
||
| Tensor yoloInput = preprocessForYolo(bitmap); | ||
| if (yoloInput == null) { | ||
| return results; | ||
| } | ||
| yoloOutputs = yoloModule.forward(EValue.from(yoloInput)); | ||
|
|
||
| EValue[] yoloOutputs = yoloModule.forward(EValue.from(yoloInput)); | ||
| if (yoloOutputs == null || yoloOutputs.length == 0) { | ||
| return results; | ||
|
||
| } | ||
|
|
@@ -240,29 +237,8 @@ public List<BirdDetection> detectBirds(Bitmap bitmap) { | |
|
|
||
| } catch (Exception e) { | ||
| Log.e(TAG, "Error in detectBirds", e); | ||
| } finally { | ||
| // CRITICAL: Release tensors to prevent memory leak | ||
| if (yoloInput != null) { | ||
| try { | ||
| yoloInput.close(); | ||
| } catch (Exception e) { | ||
| Log.e(TAG, "Error closing yoloInput", e); | ||
| } | ||
| } | ||
|
|
||
| if (yoloOutputs != null) { | ||
| for (EValue output : yoloOutputs) { | ||
| if (output != null) { | ||
| try { | ||
| output.close(); | ||
| } catch (Exception e) { | ||
| Log.e(TAG, "Error closing output", e); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return results; | ||
| } | ||
|
|
||
|
|
@@ -596,19 +572,15 @@ private Tensor preprocessForClassifier(Bitmap bitmap) { | |
| } | ||
| } | ||
|
|
||
| private String[] classifyBird(Bitmap bitmap, RectF boundingBox) throws Exception { | ||
| Bitmap croppedBird = cropBitmap(bitmap, boundingBox); | ||
| if (croppedBird == null) { | ||
| return new String[]{"Bird", "0.5"}; | ||
| } | ||
|
|
||
| Tensor classifierInput = preprocessForClassifier(croppedBird); | ||
| private String classifyBird(Bitmap croppedBitmap) throws Exception { | ||
| Tensor classifierInput = preprocessForClassifier(croppedBitmap); | ||
| if (classifierInput == null) { | ||
| return new String[]{"Bird", "0.5"}; | ||
| return "Bird"; | ||
| } | ||
|
|
||
| EValue[] classifierOutputs = classifierModule.forward(EValue.from(classifierInput)); | ||
| return parseClassifierOutput(classifierOutputs); | ||
| String[] result = parseClassifierOutput(classifierOutputs); | ||
| return result[0]; | ||
|
||
| } | ||
|
|
||
| private String[] parseClassifierOutput(EValue[] outputs) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 0 additions & 5 deletions
5
whisper/android/WhisperApp/app/src/main/res/values/themes.xml
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
whisper/android/WhisperApp/app/src/main/res/xml/backup_rules.xml
This file was deleted.
Oops, something went wrong.
19 changes: 0 additions & 19 deletions
19
whisper/android/WhisperApp/app/src/main/res/xml/data_extraction_rules.xml
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The matrix marks Whisper/Parakeet as
require_aar: trueand then conditionally skips checkout/JDK/Gradle/build steps wheninputs.local_aaris not provided. This yields matrix jobs that do no work but still succeed, which can hide build regressions. Prefer a job-levelif:(or matrixexclude) to skip those entries entirely, or removerequire_aarif the Maven dependency fallback is sufficient.