Android: consistent error types across all modules - #19099

Merged
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni
Apr 25, 2026
Merged

Android: consistent error types across all modules#19099
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni

Conversation

@psiddh

Copy link
Copy Markdown
Contributor

TrainingModule: implement Closeable, replace Log.e + silent empty returns with IllegalStateException throws. Add checkNotDestroyed() guard on all public methods.

SGD: throw IllegalStateException instead of bare RuntimeException when optimizer is destroyed.

AsrModule: throw ExecutorchRuntimeException instead of bare RuntimeException on transcription failure.

ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException instead of bare RuntimeException, with descriptive message.

JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor bodies in try-catch so C++ exceptions become ExecutorchRuntimeException instead of generic RuntimeException.

This commit was authored with the help of Claude.

TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed()
guard on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException
when optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 23, 2026 22:36
@pytorch-bot

pytorch-botBot commented Apr 23, 2026

Copy link
Copy Markdown

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/19099

Note: Links to docs will display an error until the docs builds have been completed.

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

✅ You can merge normally! (4 Unrelated Failures)

As of commit 1d00327 with merge base cb94506 (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@meta-clameta-claBot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 23, 2026
@github-actions

Copy link
Copy Markdown

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Native creation failure now throws ExecutorchRuntimeException with
INTERNAL error code, consistent with all other modules.
This commit was authored with the help of Claude.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns Android-side error handling by replacing generic/implicit failures with consistent, typed exceptions across Java/Kotlin and JNI layers.

Changes:

  • Wrap JNI HybridClass constructors to convert C++ exceptions into ExecutorchRuntimeException.
  • Update training APIs to implement Closeable, add destroyed-guards, and replace silent failures/logging with IllegalStateException.
  • Standardize exception types/messages across modules (IllegalStateException, IllegalArgumentException, ExecutorchRuntimeException).

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
extension/android/jni/jni_layer_llama.cppWrap LLM JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/jni/jni_layer.cppWrap Module JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/TrainingModule.javaImplement Closeable, add destroyed guard, and replace log+empty-return with exceptions.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/SGD.javaThrow IllegalStateException when optimizer is destroyed.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/asr/AsrModule.ktThrow ExecutorchRuntimeException on transcription failure.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.javaThrow IllegalArgumentException with more descriptive message on invalid file paths.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp
Comment threadextension/android/jni/jni_layer_llama.cpp
- Fix clang-format indentation in jni_layer_llama.cpp constructor
- Add throw; after throwExecutorchException in both JNI constructors
to ensure construction fails deterministically
- Use import for ExecutorchRuntimeException in AsrModule.kt
- Fix validateFilePath Javadoc to document IllegalArgumentException
- Split validateFilePath into specific error messages (does not exist,
is not a file, is not readable)
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 00:09

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer_llama.cpp
JNI constructors now catch all native exceptions, not just std::exception.
Fix redundant fully-qualified ExecutorchRuntimeException.INTERNAL in
AsrModule.kt.
This commit was authored with the help of Claude.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 06:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

CopilotAI review requested due to automatic review settings April 24, 2026 20:58

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp Outdated
Comment threadextension/android/jni/jni_layer_llama.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 22:12

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

JniException takes a jthrowable, not a string. throwExecutorchException
already throws via fbjni at the JNI boundary — no need to rethrow.
This commit was authored with the help of Claude.
@psiddh
psiddh merged commit 7e2ff8a into pytorch:mainApr 25, 2026
167 of 171 checks passed
JacobSzwejbka added a commit that referenced this pull request Apr 26, 2026
## Summary
Reverts the following Android PRs:
- #19099 — Android: consistent error types across all modules
- #19124 — Android: Module implements Closeable
- #19092 — Android: improve error diagnostics for LlmModule and
exceptions
- #19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 5, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed() guard
on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException when
optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
…ch#19028 (pytorch#19133)
## Summary
Reverts the following Android PRs:
- pytorch#19099 — Android: consistent error types across all modules
- pytorch#19124 — Android: Module implements Closeable
- pytorch#19092 — Android: improve error diagnostics for LlmModule and
exceptions
- pytorch#19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@psiddh@GregoryComer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Android: consistent error types across all modules - #19099

Merged
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni
Apr 25, 2026
Merged

Android: consistent error types across all modules#19099
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni

Conversation

@psiddh

Copy link
Copy Markdown
Contributor

TrainingModule: implement Closeable, replace Log.e + silent empty returns with IllegalStateException throws. Add checkNotDestroyed() guard on all public methods.

SGD: throw IllegalStateException instead of bare RuntimeException when optimizer is destroyed.

AsrModule: throw ExecutorchRuntimeException instead of bare RuntimeException on transcription failure.

ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException instead of bare RuntimeException, with descriptive message.

JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor bodies in try-catch so C++ exceptions become ExecutorchRuntimeException instead of generic RuntimeException.

This commit was authored with the help of Claude.

TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed()
guard on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException
when optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 23, 2026 22:36
@pytorch-bot

pytorch-botBot commented Apr 23, 2026

Copy link
Copy Markdown

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/19099

Note: Links to docs will display an error until the docs builds have been completed.

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

✅ You can merge normally! (4 Unrelated Failures)

As of commit 1d00327 with merge base cb94506 (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@meta-clameta-claBot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 23, 2026
@github-actions

Copy link
Copy Markdown

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Native creation failure now throws ExecutorchRuntimeException with
INTERNAL error code, consistent with all other modules.
This commit was authored with the help of Claude.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns Android-side error handling by replacing generic/implicit failures with consistent, typed exceptions across Java/Kotlin and JNI layers.

Changes:

  • Wrap JNI HybridClass constructors to convert C++ exceptions into ExecutorchRuntimeException.
  • Update training APIs to implement Closeable, add destroyed-guards, and replace silent failures/logging with IllegalStateException.
  • Standardize exception types/messages across modules (IllegalStateException, IllegalArgumentException, ExecutorchRuntimeException).

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
extension/android/jni/jni_layer_llama.cppWrap LLM JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/jni/jni_layer.cppWrap Module JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/TrainingModule.javaImplement Closeable, add destroyed guard, and replace log+empty-return with exceptions.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/SGD.javaThrow IllegalStateException when optimizer is destroyed.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/asr/AsrModule.ktThrow ExecutorchRuntimeException on transcription failure.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.javaThrow IllegalArgumentException with more descriptive message on invalid file paths.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp
Comment threadextension/android/jni/jni_layer_llama.cpp
- Fix clang-format indentation in jni_layer_llama.cpp constructor
- Add throw; after throwExecutorchException in both JNI constructors
to ensure construction fails deterministically
- Use import for ExecutorchRuntimeException in AsrModule.kt
- Fix validateFilePath Javadoc to document IllegalArgumentException
- Split validateFilePath into specific error messages (does not exist,
is not a file, is not readable)
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 00:09

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer_llama.cpp
JNI constructors now catch all native exceptions, not just std::exception.
Fix redundant fully-qualified ExecutorchRuntimeException.INTERNAL in
AsrModule.kt.
This commit was authored with the help of Claude.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 06:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

CopilotAI review requested due to automatic review settings April 24, 2026 20:58

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp Outdated
Comment threadextension/android/jni/jni_layer_llama.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 22:12

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

JniException takes a jthrowable, not a string. throwExecutorchException
already throws via fbjni at the JNI boundary — no need to rethrow.
This commit was authored with the help of Claude.
@psiddh
psiddh merged commit 7e2ff8a into pytorch:mainApr 25, 2026
167 of 171 checks passed
JacobSzwejbka added a commit that referenced this pull request Apr 26, 2026
## Summary
Reverts the following Android PRs:
- #19099 — Android: consistent error types across all modules
- #19124 — Android: Module implements Closeable
- #19092 — Android: improve error diagnostics for LlmModule and
exceptions
- #19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 5, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed() guard
on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException when
optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
…ch#19028 (pytorch#19133)
## Summary
Reverts the following Android PRs:
- pytorch#19099 — Android: consistent error types across all modules
- pytorch#19124 — Android: Module implements Closeable
- pytorch#19092 — Android: improve error diagnostics for LlmModule and
exceptions
- pytorch#19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@psiddh@GregoryComer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Android: consistent error types across all modules - #19099

Merged
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni
Apr 25, 2026
Merged

Android: consistent error types across all modules#19099
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni

Conversation

@psiddh

Copy link
Copy Markdown
Contributor

TrainingModule: implement Closeable, replace Log.e + silent empty returns with IllegalStateException throws. Add checkNotDestroyed() guard on all public methods.

SGD: throw IllegalStateException instead of bare RuntimeException when optimizer is destroyed.

AsrModule: throw ExecutorchRuntimeException instead of bare RuntimeException on transcription failure.

ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException instead of bare RuntimeException, with descriptive message.

JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor bodies in try-catch so C++ exceptions become ExecutorchRuntimeException instead of generic RuntimeException.

This commit was authored with the help of Claude.

TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed()
guard on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException
when optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 23, 2026 22:36
@pytorch-bot

pytorch-botBot commented Apr 23, 2026

Copy link
Copy Markdown

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/19099

Note: Links to docs will display an error until the docs builds have been completed.

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

✅ You can merge normally! (4 Unrelated Failures)

As of commit 1d00327 with merge base cb94506 (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@meta-clameta-claBot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 23, 2026
@github-actions

Copy link
Copy Markdown

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Native creation failure now throws ExecutorchRuntimeException with
INTERNAL error code, consistent with all other modules.
This commit was authored with the help of Claude.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns Android-side error handling by replacing generic/implicit failures with consistent, typed exceptions across Java/Kotlin and JNI layers.

Changes:

  • Wrap JNI HybridClass constructors to convert C++ exceptions into ExecutorchRuntimeException.
  • Update training APIs to implement Closeable, add destroyed-guards, and replace silent failures/logging with IllegalStateException.
  • Standardize exception types/messages across modules (IllegalStateException, IllegalArgumentException, ExecutorchRuntimeException).

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
extension/android/jni/jni_layer_llama.cppWrap LLM JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/jni/jni_layer.cppWrap Module JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/TrainingModule.javaImplement Closeable, add destroyed guard, and replace log+empty-return with exceptions.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/SGD.javaThrow IllegalStateException when optimizer is destroyed.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/asr/AsrModule.ktThrow ExecutorchRuntimeException on transcription failure.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.javaThrow IllegalArgumentException with more descriptive message on invalid file paths.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp
Comment threadextension/android/jni/jni_layer_llama.cpp
- Fix clang-format indentation in jni_layer_llama.cpp constructor
- Add throw; after throwExecutorchException in both JNI constructors
to ensure construction fails deterministically
- Use import for ExecutorchRuntimeException in AsrModule.kt
- Fix validateFilePath Javadoc to document IllegalArgumentException
- Split validateFilePath into specific error messages (does not exist,
is not a file, is not readable)
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 00:09

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer_llama.cpp
JNI constructors now catch all native exceptions, not just std::exception.
Fix redundant fully-qualified ExecutorchRuntimeException.INTERNAL in
AsrModule.kt.
This commit was authored with the help of Claude.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 06:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

CopilotAI review requested due to automatic review settings April 24, 2026 20:58

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp Outdated
Comment threadextension/android/jni/jni_layer_llama.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 22:12

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

JniException takes a jthrowable, not a string. throwExecutorchException
already throws via fbjni at the JNI boundary — no need to rethrow.
This commit was authored with the help of Claude.
@psiddh
psiddh merged commit 7e2ff8a into pytorch:mainApr 25, 2026
167 of 171 checks passed
JacobSzwejbka added a commit that referenced this pull request Apr 26, 2026
## Summary
Reverts the following Android PRs:
- #19099 — Android: consistent error types across all modules
- #19124 — Android: Module implements Closeable
- #19092 — Android: improve error diagnostics for LlmModule and
exceptions
- #19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 5, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed() guard
on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException when
optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
…ch#19028 (pytorch#19133)
## Summary
Reverts the following Android PRs:
- pytorch#19099 — Android: consistent error types across all modules
- pytorch#19124 — Android: Module implements Closeable
- pytorch#19092 — Android: improve error diagnostics for LlmModule and
exceptions
- pytorch#19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@psiddh@GregoryComer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Android: consistent error types across all modules - #19099

Merged
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni
Apr 25, 2026
Merged

Android: consistent error types across all modules#19099
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni

Conversation

@psiddh

Copy link
Copy Markdown
Contributor

TrainingModule: implement Closeable, replace Log.e + silent empty returns with IllegalStateException throws. Add checkNotDestroyed() guard on all public methods.

SGD: throw IllegalStateException instead of bare RuntimeException when optimizer is destroyed.

AsrModule: throw ExecutorchRuntimeException instead of bare RuntimeException on transcription failure.

ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException instead of bare RuntimeException, with descriptive message.

JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor bodies in try-catch so C++ exceptions become ExecutorchRuntimeException instead of generic RuntimeException.

This commit was authored with the help of Claude.

TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed()
guard on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException
when optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 23, 2026 22:36
@pytorch-bot

pytorch-botBot commented Apr 23, 2026

Copy link
Copy Markdown

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/19099

Note: Links to docs will display an error until the docs builds have been completed.

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

✅ You can merge normally! (4 Unrelated Failures)

As of commit 1d00327 with merge base cb94506 (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@meta-clameta-claBot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 23, 2026
@github-actions

Copy link
Copy Markdown

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Native creation failure now throws ExecutorchRuntimeException with
INTERNAL error code, consistent with all other modules.
This commit was authored with the help of Claude.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns Android-side error handling by replacing generic/implicit failures with consistent, typed exceptions across Java/Kotlin and JNI layers.

Changes:

  • Wrap JNI HybridClass constructors to convert C++ exceptions into ExecutorchRuntimeException.
  • Update training APIs to implement Closeable, add destroyed-guards, and replace silent failures/logging with IllegalStateException.
  • Standardize exception types/messages across modules (IllegalStateException, IllegalArgumentException, ExecutorchRuntimeException).

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
extension/android/jni/jni_layer_llama.cppWrap LLM JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/jni/jni_layer.cppWrap Module JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/TrainingModule.javaImplement Closeable, add destroyed guard, and replace log+empty-return with exceptions.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/SGD.javaThrow IllegalStateException when optimizer is destroyed.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/asr/AsrModule.ktThrow ExecutorchRuntimeException on transcription failure.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.javaThrow IllegalArgumentException with more descriptive message on invalid file paths.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp
Comment threadextension/android/jni/jni_layer_llama.cpp
- Fix clang-format indentation in jni_layer_llama.cpp constructor
- Add throw; after throwExecutorchException in both JNI constructors
to ensure construction fails deterministically
- Use import for ExecutorchRuntimeException in AsrModule.kt
- Fix validateFilePath Javadoc to document IllegalArgumentException
- Split validateFilePath into specific error messages (does not exist,
is not a file, is not readable)
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 00:09

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer_llama.cpp
JNI constructors now catch all native exceptions, not just std::exception.
Fix redundant fully-qualified ExecutorchRuntimeException.INTERNAL in
AsrModule.kt.
This commit was authored with the help of Claude.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 06:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

CopilotAI review requested due to automatic review settings April 24, 2026 20:58

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp Outdated
Comment threadextension/android/jni/jni_layer_llama.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 22:12

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

JniException takes a jthrowable, not a string. throwExecutorchException
already throws via fbjni at the JNI boundary — no need to rethrow.
This commit was authored with the help of Claude.
@psiddh
psiddh merged commit 7e2ff8a into pytorch:mainApr 25, 2026
167 of 171 checks passed
JacobSzwejbka added a commit that referenced this pull request Apr 26, 2026
## Summary
Reverts the following Android PRs:
- #19099 — Android: consistent error types across all modules
- #19124 — Android: Module implements Closeable
- #19092 — Android: improve error diagnostics for LlmModule and
exceptions
- #19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 5, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed() guard
on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException when
optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
…ch#19028 (pytorch#19133)
## Summary
Reverts the following Android PRs:
- pytorch#19099 — Android: consistent error types across all modules
- pytorch#19124 — Android: Module implements Closeable
- pytorch#19092 — Android: improve error diagnostics for LlmModule and
exceptions
- pytorch#19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@psiddh@GregoryComer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Android: consistent error types across all modules - #19099

Merged
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni
Apr 25, 2026
Merged

Android: consistent error types across all modules#19099
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni

Conversation

@psiddh

Copy link
Copy Markdown
Contributor

TrainingModule: implement Closeable, replace Log.e + silent empty returns with IllegalStateException throws. Add checkNotDestroyed() guard on all public methods.

SGD: throw IllegalStateException instead of bare RuntimeException when optimizer is destroyed.

AsrModule: throw ExecutorchRuntimeException instead of bare RuntimeException on transcription failure.

ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException instead of bare RuntimeException, with descriptive message.

JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor bodies in try-catch so C++ exceptions become ExecutorchRuntimeException instead of generic RuntimeException.

This commit was authored with the help of Claude.

TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed()
guard on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException
when optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 23, 2026 22:36
@pytorch-bot

pytorch-botBot commented Apr 23, 2026

Copy link
Copy Markdown

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/19099

Note: Links to docs will display an error until the docs builds have been completed.

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

✅ You can merge normally! (4 Unrelated Failures)

As of commit 1d00327 with merge base cb94506 (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@meta-clameta-claBot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 23, 2026
@github-actions

Copy link
Copy Markdown

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Native creation failure now throws ExecutorchRuntimeException with
INTERNAL error code, consistent with all other modules.
This commit was authored with the help of Claude.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns Android-side error handling by replacing generic/implicit failures with consistent, typed exceptions across Java/Kotlin and JNI layers.

Changes:

  • Wrap JNI HybridClass constructors to convert C++ exceptions into ExecutorchRuntimeException.
  • Update training APIs to implement Closeable, add destroyed-guards, and replace silent failures/logging with IllegalStateException.
  • Standardize exception types/messages across modules (IllegalStateException, IllegalArgumentException, ExecutorchRuntimeException).

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
extension/android/jni/jni_layer_llama.cppWrap LLM JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/jni/jni_layer.cppWrap Module JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/TrainingModule.javaImplement Closeable, add destroyed guard, and replace log+empty-return with exceptions.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/SGD.javaThrow IllegalStateException when optimizer is destroyed.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/asr/AsrModule.ktThrow ExecutorchRuntimeException on transcription failure.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.javaThrow IllegalArgumentException with more descriptive message on invalid file paths.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp
Comment threadextension/android/jni/jni_layer_llama.cpp
- Fix clang-format indentation in jni_layer_llama.cpp constructor
- Add throw; after throwExecutorchException in both JNI constructors
to ensure construction fails deterministically
- Use import for ExecutorchRuntimeException in AsrModule.kt
- Fix validateFilePath Javadoc to document IllegalArgumentException
- Split validateFilePath into specific error messages (does not exist,
is not a file, is not readable)
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 00:09

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer_llama.cpp
JNI constructors now catch all native exceptions, not just std::exception.
Fix redundant fully-qualified ExecutorchRuntimeException.INTERNAL in
AsrModule.kt.
This commit was authored with the help of Claude.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 06:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

CopilotAI review requested due to automatic review settings April 24, 2026 20:58

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp Outdated
Comment threadextension/android/jni/jni_layer_llama.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 22:12

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

JniException takes a jthrowable, not a string. throwExecutorchException
already throws via fbjni at the JNI boundary — no need to rethrow.
This commit was authored with the help of Claude.
@psiddh
psiddh merged commit 7e2ff8a into pytorch:mainApr 25, 2026
167 of 171 checks passed
JacobSzwejbka added a commit that referenced this pull request Apr 26, 2026
## Summary
Reverts the following Android PRs:
- #19099 — Android: consistent error types across all modules
- #19124 — Android: Module implements Closeable
- #19092 — Android: improve error diagnostics for LlmModule and
exceptions
- #19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 5, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed() guard
on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException when
optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
…ch#19028 (pytorch#19133)
## Summary
Reverts the following Android PRs:
- pytorch#19099 — Android: consistent error types across all modules
- pytorch#19124 — Android: Module implements Closeable
- pytorch#19092 — Android: improve error diagnostics for LlmModule and
exceptions
- pytorch#19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@psiddh@GregoryComer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Android: consistent error types across all modules - #19099

Merged
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni
Apr 25, 2026
Merged

Android: consistent error types across all modules#19099
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni

Conversation

@psiddh

Copy link
Copy Markdown
Contributor

TrainingModule: implement Closeable, replace Log.e + silent empty returns with IllegalStateException throws. Add checkNotDestroyed() guard on all public methods.

SGD: throw IllegalStateException instead of bare RuntimeException when optimizer is destroyed.

AsrModule: throw ExecutorchRuntimeException instead of bare RuntimeException on transcription failure.

ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException instead of bare RuntimeException, with descriptive message.

JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor bodies in try-catch so C++ exceptions become ExecutorchRuntimeException instead of generic RuntimeException.

This commit was authored with the help of Claude.

TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed()
guard on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException
when optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 23, 2026 22:36
@pytorch-bot

pytorch-botBot commented Apr 23, 2026

Copy link
Copy Markdown

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/19099

Note: Links to docs will display an error until the docs builds have been completed.

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

✅ You can merge normally! (4 Unrelated Failures)

As of commit 1d00327 with merge base cb94506 (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@meta-clameta-claBot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 23, 2026
@github-actions

Copy link
Copy Markdown

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Native creation failure now throws ExecutorchRuntimeException with
INTERNAL error code, consistent with all other modules.
This commit was authored with the help of Claude.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns Android-side error handling by replacing generic/implicit failures with consistent, typed exceptions across Java/Kotlin and JNI layers.

Changes:

  • Wrap JNI HybridClass constructors to convert C++ exceptions into ExecutorchRuntimeException.
  • Update training APIs to implement Closeable, add destroyed-guards, and replace silent failures/logging with IllegalStateException.
  • Standardize exception types/messages across modules (IllegalStateException, IllegalArgumentException, ExecutorchRuntimeException).

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
extension/android/jni/jni_layer_llama.cppWrap LLM JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/jni/jni_layer.cppWrap Module JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/TrainingModule.javaImplement Closeable, add destroyed guard, and replace log+empty-return with exceptions.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/SGD.javaThrow IllegalStateException when optimizer is destroyed.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/asr/AsrModule.ktThrow ExecutorchRuntimeException on transcription failure.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.javaThrow IllegalArgumentException with more descriptive message on invalid file paths.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp
Comment threadextension/android/jni/jni_layer_llama.cpp
- Fix clang-format indentation in jni_layer_llama.cpp constructor
- Add throw; after throwExecutorchException in both JNI constructors
to ensure construction fails deterministically
- Use import for ExecutorchRuntimeException in AsrModule.kt
- Fix validateFilePath Javadoc to document IllegalArgumentException
- Split validateFilePath into specific error messages (does not exist,
is not a file, is not readable)
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 00:09

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer_llama.cpp
JNI constructors now catch all native exceptions, not just std::exception.
Fix redundant fully-qualified ExecutorchRuntimeException.INTERNAL in
AsrModule.kt.
This commit was authored with the help of Claude.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 06:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

CopilotAI review requested due to automatic review settings April 24, 2026 20:58

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp Outdated
Comment threadextension/android/jni/jni_layer_llama.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 22:12

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

JniException takes a jthrowable, not a string. throwExecutorchException
already throws via fbjni at the JNI boundary — no need to rethrow.
This commit was authored with the help of Claude.
@psiddh
psiddh merged commit 7e2ff8a into pytorch:mainApr 25, 2026
167 of 171 checks passed
JacobSzwejbka added a commit that referenced this pull request Apr 26, 2026
## Summary
Reverts the following Android PRs:
- #19099 — Android: consistent error types across all modules
- #19124 — Android: Module implements Closeable
- #19092 — Android: improve error diagnostics for LlmModule and
exceptions
- #19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 5, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed() guard
on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException when
optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
…ch#19028 (pytorch#19133)
## Summary
Reverts the following Android PRs:
- pytorch#19099 — Android: consistent error types across all modules
- pytorch#19124 — Android: Module implements Closeable
- pytorch#19092 — Android: improve error diagnostics for LlmModule and
exceptions
- pytorch#19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@psiddh@GregoryComer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Android: consistent error types across all modules - #19099

Merged
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni
Apr 25, 2026
Merged

Android: consistent error types across all modules#19099
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni

Conversation

@psiddh

Copy link
Copy Markdown
Contributor

TrainingModule: implement Closeable, replace Log.e + silent empty returns with IllegalStateException throws. Add checkNotDestroyed() guard on all public methods.

SGD: throw IllegalStateException instead of bare RuntimeException when optimizer is destroyed.

AsrModule: throw ExecutorchRuntimeException instead of bare RuntimeException on transcription failure.

ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException instead of bare RuntimeException, with descriptive message.

JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor bodies in try-catch so C++ exceptions become ExecutorchRuntimeException instead of generic RuntimeException.

This commit was authored with the help of Claude.

TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed()
guard on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException
when optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 23, 2026 22:36
@pytorch-bot

pytorch-botBot commented Apr 23, 2026

Copy link
Copy Markdown

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/19099

Note: Links to docs will display an error until the docs builds have been completed.

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

✅ You can merge normally! (4 Unrelated Failures)

As of commit 1d00327 with merge base cb94506 (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@meta-clameta-claBot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 23, 2026
@github-actions

Copy link
Copy Markdown

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Native creation failure now throws ExecutorchRuntimeException with
INTERNAL error code, consistent with all other modules.
This commit was authored with the help of Claude.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns Android-side error handling by replacing generic/implicit failures with consistent, typed exceptions across Java/Kotlin and JNI layers.

Changes:

  • Wrap JNI HybridClass constructors to convert C++ exceptions into ExecutorchRuntimeException.
  • Update training APIs to implement Closeable, add destroyed-guards, and replace silent failures/logging with IllegalStateException.
  • Standardize exception types/messages across modules (IllegalStateException, IllegalArgumentException, ExecutorchRuntimeException).

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
extension/android/jni/jni_layer_llama.cppWrap LLM JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/jni/jni_layer.cppWrap Module JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/TrainingModule.javaImplement Closeable, add destroyed guard, and replace log+empty-return with exceptions.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/SGD.javaThrow IllegalStateException when optimizer is destroyed.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/asr/AsrModule.ktThrow ExecutorchRuntimeException on transcription failure.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.javaThrow IllegalArgumentException with more descriptive message on invalid file paths.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp
Comment threadextension/android/jni/jni_layer_llama.cpp
- Fix clang-format indentation in jni_layer_llama.cpp constructor
- Add throw; after throwExecutorchException in both JNI constructors
to ensure construction fails deterministically
- Use import for ExecutorchRuntimeException in AsrModule.kt
- Fix validateFilePath Javadoc to document IllegalArgumentException
- Split validateFilePath into specific error messages (does not exist,
is not a file, is not readable)
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 00:09

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer_llama.cpp
JNI constructors now catch all native exceptions, not just std::exception.
Fix redundant fully-qualified ExecutorchRuntimeException.INTERNAL in
AsrModule.kt.
This commit was authored with the help of Claude.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 06:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

CopilotAI review requested due to automatic review settings April 24, 2026 20:58

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp Outdated
Comment threadextension/android/jni/jni_layer_llama.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 22:12

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

JniException takes a jthrowable, not a string. throwExecutorchException
already throws via fbjni at the JNI boundary — no need to rethrow.
This commit was authored with the help of Claude.
@psiddh
psiddh merged commit 7e2ff8a into pytorch:mainApr 25, 2026
167 of 171 checks passed
JacobSzwejbka added a commit that referenced this pull request Apr 26, 2026
## Summary
Reverts the following Android PRs:
- #19099 — Android: consistent error types across all modules
- #19124 — Android: Module implements Closeable
- #19092 — Android: improve error diagnostics for LlmModule and
exceptions
- #19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 5, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed() guard
on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException when
optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
…ch#19028 (pytorch#19133)
## Summary
Reverts the following Android PRs:
- pytorch#19099 — Android: consistent error types across all modules
- pytorch#19124 — Android: Module implements Closeable
- pytorch#19092 — Android: improve error diagnostics for LlmModule and
exceptions
- pytorch#19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@psiddh@GregoryComer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Android: consistent error types across all modules - #19099

Merged
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni
Apr 25, 2026
Merged

Android: consistent error types across all modules#19099
psiddh merged 10 commits into
pytorch:mainfrom
psiddh:error-consistency-training-jni

Conversation

@psiddh

Copy link
Copy Markdown
Contributor

TrainingModule: implement Closeable, replace Log.e + silent empty returns with IllegalStateException throws. Add checkNotDestroyed() guard on all public methods.

SGD: throw IllegalStateException instead of bare RuntimeException when optimizer is destroyed.

AsrModule: throw ExecutorchRuntimeException instead of bare RuntimeException on transcription failure.

ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException instead of bare RuntimeException, with descriptive message.

JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor bodies in try-catch so C++ exceptions become ExecutorchRuntimeException instead of generic RuntimeException.

This commit was authored with the help of Claude.

TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed()
guard on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException
when optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 23, 2026 22:36
@pytorch-bot

pytorch-botBot commented Apr 23, 2026

Copy link
Copy Markdown

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/19099

Note: Links to docs will display an error until the docs builds have been completed.

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

✅ You can merge normally! (4 Unrelated Failures)

As of commit 1d00327 with merge base cb94506 (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@meta-clameta-claBot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 23, 2026
@github-actions

Copy link
Copy Markdown

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Native creation failure now throws ExecutorchRuntimeException with
INTERNAL error code, consistent with all other modules.
This commit was authored with the help of Claude.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns Android-side error handling by replacing generic/implicit failures with consistent, typed exceptions across Java/Kotlin and JNI layers.

Changes:

  • Wrap JNI HybridClass constructors to convert C++ exceptions into ExecutorchRuntimeException.
  • Update training APIs to implement Closeable, add destroyed-guards, and replace silent failures/logging with IllegalStateException.
  • Standardize exception types/messages across modules (IllegalStateException, IllegalArgumentException, ExecutorchRuntimeException).

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
extension/android/jni/jni_layer_llama.cppWrap LLM JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/jni/jni_layer.cppWrap Module JNI constructor in try/catch and translate failures to ExecutorchRuntimeException.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/TrainingModule.javaImplement Closeable, add destroyed guard, and replace log+empty-return with exceptions.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/training/SGD.javaThrow IllegalStateException when optimizer is destroyed.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/extension/asr/AsrModule.ktThrow ExecutorchRuntimeException on transcription failure.
extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.javaThrow IllegalArgumentException with more descriptive message on invalid file paths.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp
Comment threadextension/android/jni/jni_layer_llama.cpp
- Fix clang-format indentation in jni_layer_llama.cpp constructor
- Add throw; after throwExecutorchException in both JNI constructors
to ensure construction fails deterministically
- Use import for ExecutorchRuntimeException in AsrModule.kt
- Fix validateFilePath Javadoc to document IllegalArgumentException
- Split validateFilePath into specific error messages (does not exist,
is not a file, is not readable)
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 00:09

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer_llama.cpp
JNI constructors now catch all native exceptions, not just std::exception.
Fix redundant fully-qualified ExecutorchRuntimeException.INTERNAL in
AsrModule.kt.
This commit was authored with the help of Claude.
This commit was authored with the help of Claude.
CopilotAI review requested due to automatic review settings April 24, 2026 06:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

CopilotAI review requested due to automatic review settings April 24, 2026 20:58

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadextension/android/jni/jni_layer.cpp Outdated
Comment threadextension/android/jni/jni_layer_llama.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 22:12

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

JniException takes a jthrowable, not a string. throwExecutorchException
already throws via fbjni at the JNI boundary — no need to rethrow.
This commit was authored with the help of Claude.
@psiddh
psiddh merged commit 7e2ff8a into pytorch:mainApr 25, 2026
167 of 171 checks passed
JacobSzwejbka added a commit that referenced this pull request Apr 26, 2026
## Summary
Reverts the following Android PRs:
- #19099 — Android: consistent error types across all modules
- #19124 — Android: Module implements Closeable
- #19092 — Android: improve error diagnostics for LlmModule and
exceptions
- #19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request Apr 30, 2026
…t coverage
Combines all previously reverted Android improvement PRs (pytorch#18669,
pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle
tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of
returning status codes or logging silently. Module.loadMethod()
throws ExecutorchRuntimeException on failure. LlmModule.generate()
and load() throw on error. Native methods renamed with "Native"
suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement
Closeable for try-with-resources. LlmModule adds ReentrantLock
to serialize access to non-thread-safe native state. stop()
remains lock-free (C++ atomic flag). TrainingModule replaces
Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws
IllegalArgumentException. SGD throws IllegalStateException.
AsrModule throws ExecutorchRuntimeException. Cause-chaining
constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in
try-catch to surface native initialization failures.
LlmModule.load() uses throwExecutorchException with diagnostic
detail. All @DoNotStrip annotations preserved on JNI-called
methods; new @DoNotStrip added to renamed private native methods
(generateNative, resetContextNative, loadNative).
Tests: fix 4 @ignored Module tests by providing required input
tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule
use-after-close and idempotent-close tests. Fix ModelRunner crash
on loadMethod failure.
This PR was authored with the help of Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 5, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
TrainingModule: implement Closeable, replace Log.e + silent empty
returns with IllegalStateException throws. Add checkNotDestroyed() guard
on all public methods.
SGD: throw IllegalStateException instead of bare RuntimeException when
optimizer is destroyed.
AsrModule: throw ExecutorchRuntimeException instead of bare
RuntimeException on transcription failure.
ExecuTorchRuntime.validateFilePath: throw IllegalArgumentException
instead of bare RuntimeException, with descriptive message.
JNI constructors: wrap ExecuTorchJni and ExecuTorchLlmJni constructor
bodies in try-catch so C++ exceptions become ExecutorchRuntimeException
instead of generic RuntimeException.
This commit was authored with the help of Claude.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
zeel2104 pushed a commit to zeel2104/executorch that referenced this pull request May 5, 2026
…ch#19028 (pytorch#19133)
## Summary
Reverts the following Android PRs:
- pytorch#19099 — Android: consistent error types across all modules
- pytorch#19124 — Android: Module implements Closeable
- pytorch#19092 — Android: improve error diagnostics for LlmModule and
exceptions
- pytorch#19028 — Ignored Module tests: provide required input tensor
Authored with Claude.
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag). TrainingModule replaces Log.e silent failures with IllegalStateException.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods; new DoNotStrip added to renamed private native methods (generateNative, resetContextNative, loadNative).
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 12, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
psiddh added a commit to psiddh/executorch that referenced this pull request May 13, 2026
…t coverage (pytorch#19229)
Summary:
Combines all previously reverted Android improvement PRs (pytorch#18669, pytorch#19012, pytorch#19028, pytorch#19092, pytorch#19099, pytorch#19124) plus new Module lifecycle tests into a single atomic change.
Error reporting: all sync errors throw exceptions instead of returning status codes or logging silently. Module.loadMethod() throws ExecutorchRuntimeException on failure. LlmModule.generate() and load() throw on error. Native methods renamed with "Native" suffix; public wrappers check status and throw.
Lifecycle: Module, LlmModule, and TrainingModule implement Closeable for try-with-resources. LlmModule adds ReentrantLock to serialize access to non-thread-safe native state. stop() remains lock-free (C++ atomic flag) with volatile mDestroyed guard to prevent use-after-close. TrainingModule replaces Log.e silent failures with IllegalStateException.
Thread safety: LlmModule adds checkNotReentrant() guard to all lock-acquiring public methods, preventing callbacks from re-entering module methods and corrupting native state. TrainingModule.mDestroyed made volatile for cross-thread visibility.
Error consistency: ExecuTorchRuntime.validateFilePath throws IllegalArgumentException. SGD throws IllegalStateException. AsrModule throws ExecutorchRuntimeException. Cause-chaining constructor added to ExecutorchRuntimeException.
JNI safety: Module and LlmModule constructors wrapped in try-catch to surface native initialization failures. LlmModule.load() uses throwExecutorchException with diagnostic detail. All DoNotStrip annotations preserved on JNI-called methods. std::move added for etdump_gen unique_ptr in profiling build path. LlmModelRunner generate path wrapped in try-catch to prevent HandlerThread death.
Test Plan:
fix 4 Ignored Module tests by providing required input tensor. Add 13 new lifecycle/API coverage tests. Add LlmModule use-after-close and idempotent close tests. Add @after tearDown to LlmModuleInstrumentationTest to prevent native resource leaks. Remove dead testMethodMetadata test. Fix testNonPteFile cleanup with assertThrows + finally.
This diff updates callers of Module.loadMethod() to use try/catch instead of checking the return code, calling destroy() on failure.
Co-authored-by: Claude <noreply@anthropic.com>
Reviewed By: kirklandsign
Differential Revision: D103233465
Pulled By: psiddh
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@psiddh@GregoryComer