[Android] Add Java runtime API for registered ops and backends - #11042

Merged
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api
May 22, 2025
Merged

[Android] Add Java runtime API for registered ops and backends#11042
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api

Conversation

@keyprocedure

@keyprocedurekeyprocedure commented May 21, 2025

Copy link
Copy Markdown
Contributor

Summary

Adds a Java runtime API that exposes native methods to query registered operators and backends for debugging.

  • Adds getRegisteredOps() and getRegisteredBackends() native methods
  • Includes instrumentation tests for the runtime API

Fixes#10438

Test plan

  • Unit tests:
./gradlew :executorch_android:test
  • Instrumentation test:
./gradlew :executorch_android:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.pytorch.executorch.RuntimeInstrumentationTest
  • Manual testing:
    Verified Runtime API functionality on an emulator using a sample app. getRegisteredOps() and getRegisteredBackends() successfully returned and displayed all registered ops and backends.

@pytorch-bot

pytorch-botBot commented May 21, 2025

Copy link
Copy Markdown

🔗 Helpful Links

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

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

✅ No Failures

As of commit ea88c6f with merge base 33d4790 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@facebook-github-botfacebook-github-bot 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 May 21, 2025
@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

@pytorchbot label "release notes: none"

@pytorch-botpytorch-botBot added the release notes: none Do not include this in the release notes label May 21, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure sorry I made some updates in the codebase to fix some internal code breakage. Would you mind rebasing this PR against main?

@kirklandsign

Copy link
Copy Markdown
Contributor

Otherwise the PR looks good to me. Have you tested locally?

@keyprocedure
keyprocedureforce-pushed the add-android-runtime-api branch from 6f0a515 to dceb3e2CompareMay 22, 2025 03:30
@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@kirklandsign

Copy link
Copy Markdown
Contributor

A few more places:

srcs= ["jni_layer.cpp", "log.cpp"],

srcs= ["jni_layer.cpp", "log.cpp"],

"jni_layer_llama.cpp",

Could you please add the new JNI file to it?

And here:

runtime.export_file(
name="jni_layer.cpp",
)

export the new file, and add it to

"//xplat/executorch/extension/android/jni:jni_layer.cpp",

Thank you

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

Otherwise the PR looks good to me. Have you tested locally?

I tested the API functionality locally with the instrumentation test I created and manually verified through an emulator. I wasn't able to run the existing instrumentation tests because I didn't have the setup files

@kirklandsign

Copy link
Copy Markdown
Contributor

GH emulator CI passed 😄

And could use help with linter

@kirklandsign

Copy link
Copy Markdown
Contributor

google-java-format_linux-x86-64 -i extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.java

@kirklandsign

Copy link
Copy Markdown
Contributor

and


6 6 | * LICENSE file in the root directory of this source tree.
7 7 | */
8 8 | 9 |+#include <fbjni/fbjni.h>
9 10 | #include <jni.h>
9 |-#include <fbjni/fbjni.h>
11 11 | 12 |+#include <executorch/runtime/backend/interface.h>
12 13 | #include <executorch/runtime/kernel/operator_registry.h>
12 |-#include <executorch/runtime/backend/interface.h>
14 14 | 15 15 | namespace executorch_jni {
16 16 | namespace runtime = ::executorch::ET_RUNTIME_NAMESPACE;
17 17 | 18 18 | class AndroidRuntimeJni : public facebook::jni::JavaClass<AndroidRuntimeJni> {
19 19 | public:
19 |- constexpr static const char* kJavaDescriptor ="Lorg/pytorch/executorch/ExecuTorchRuntime;";
20 |+ constexpr static const char* kJavaDescriptor =
21 |+"Lorg/pytorch/executorch/ExecuTorchRuntime;";
21 22 | 22 23 | static void registerNatives() {
23 24 | javaClassStatic()->registerNatives({
23 |- makeNativeMethod("getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
24 |- makeNativeMethod("getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
25 |+ makeNativeMethod(
26 |+ "getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
27 |+ makeNativeMethod(
28 |+ "getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
26 29 | });
27 30 | }
28 31 | Traceback (most recent call last):
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 102, in <module>
--------------------------------------------------------------------------------
33 36 | auto result = facebook::jni::JArrayClass<jstring>::newArray(kernels.size());
main()
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 98, in main
run_cmd_or_die(f"docker exec -t {container_name} /exec")
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 39, in run_cmd_or_die
raise RuntimeError(f"Command {cmd} failed with exit code {exit_code}")
RuntimeError: Command docker exec -t e81015920d83afd6e56e3dd9ca81cfdee041d74ffde9e4a7ced71ff12ffc333c /exec failed with exit code 1
34 37 | 35 38 | for (size_t i = 0; i < kernels.size(); ++i) {
35 |-auto op = facebook::jni::make_jstring(kernels[i].name_);
36 |-result->setElement(i, op.get());
39 |+auto op = facebook::jni::make_jstring(kernels[i].name_);
40 |+result->setElement(i, op.get());
38 41 | }
39 42 | 40 43 | return result;
--------------------------------------------------------------------------------
47 50 | auto result = facebook::jni::JArrayClass<jstring>::newArray(num_backends);
48 51 | 49 52 | for (int i = 0; i < num_backends; ++i) {
49 |-auto name_result = runtime::get_backend_name(i);
50 |-const char* name = "";
53 |+auto name_result = runtime::get_backend_name(i);
54 |+const char* name = "";
52 55 | 52 |-if (name_result.ok()) {
53 |-name = *name_result;
54 |-}
56 |+if (name_result.ok()) {
57 |+name = *name_result;
58 |+}
56 59 | 56 |-auto backend_str = facebook::jni::make_jstring(name);
57 |-result->setElement(i, backend_str.get());
60 |+auto backend_str = facebook::jni::make_jstring(name);
61 |+result->setElement(i, backend_str.get());
59 62 | }
60 63 | 61 64 | return result;

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

in your last comment with the CI output, is the failure just a formatting issue, or is there a runtime crash?

@kirklandsign

Copy link
Copy Markdown
Contributor

Just formatting issue

@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
facebook-github-bot merged commit 52d7778 into pytorch:mainMay 22, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure code merged

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.release notes: noneDo not include this in the release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Android] Java API for runtime info

3 participants

@keyprocedure@kirklandsign@facebook-github-bot
, '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] Add Java runtime API for registered ops and backends - #11042

Merged
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api
May 22, 2025
Merged

[Android] Add Java runtime API for registered ops and backends#11042
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api

Conversation

@keyprocedure

@keyprocedurekeyprocedure commented May 21, 2025

Copy link
Copy Markdown
Contributor

Summary

Adds a Java runtime API that exposes native methods to query registered operators and backends for debugging.

  • Adds getRegisteredOps() and getRegisteredBackends() native methods
  • Includes instrumentation tests for the runtime API

Fixes#10438

Test plan

  • Unit tests:
./gradlew :executorch_android:test
  • Instrumentation test:
./gradlew :executorch_android:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.pytorch.executorch.RuntimeInstrumentationTest
  • Manual testing:
    Verified Runtime API functionality on an emulator using a sample app. getRegisteredOps() and getRegisteredBackends() successfully returned and displayed all registered ops and backends.

@pytorch-bot

pytorch-botBot commented May 21, 2025

Copy link
Copy Markdown

🔗 Helpful Links

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

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

✅ No Failures

As of commit ea88c6f with merge base 33d4790 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@facebook-github-botfacebook-github-bot 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 May 21, 2025
@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

@pytorchbot label "release notes: none"

@pytorch-botpytorch-botBot added the release notes: none Do not include this in the release notes label May 21, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure sorry I made some updates in the codebase to fix some internal code breakage. Would you mind rebasing this PR against main?

@kirklandsign

Copy link
Copy Markdown
Contributor

Otherwise the PR looks good to me. Have you tested locally?

@keyprocedure
keyprocedureforce-pushed the add-android-runtime-api branch from 6f0a515 to dceb3e2CompareMay 22, 2025 03:30
@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@kirklandsign

Copy link
Copy Markdown
Contributor

A few more places:

srcs= ["jni_layer.cpp", "log.cpp"],

srcs= ["jni_layer.cpp", "log.cpp"],

"jni_layer_llama.cpp",

Could you please add the new JNI file to it?

And here:

runtime.export_file(
name="jni_layer.cpp",
)

export the new file, and add it to

"//xplat/executorch/extension/android/jni:jni_layer.cpp",

Thank you

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

Otherwise the PR looks good to me. Have you tested locally?

I tested the API functionality locally with the instrumentation test I created and manually verified through an emulator. I wasn't able to run the existing instrumentation tests because I didn't have the setup files

@kirklandsign

Copy link
Copy Markdown
Contributor

GH emulator CI passed 😄

And could use help with linter

@kirklandsign

Copy link
Copy Markdown
Contributor

google-java-format_linux-x86-64 -i extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.java

@kirklandsign

Copy link
Copy Markdown
Contributor

and


6 6 | * LICENSE file in the root directory of this source tree.
7 7 | */
8 8 | 9 |+#include <fbjni/fbjni.h>
9 10 | #include <jni.h>
9 |-#include <fbjni/fbjni.h>
11 11 | 12 |+#include <executorch/runtime/backend/interface.h>
12 13 | #include <executorch/runtime/kernel/operator_registry.h>
12 |-#include <executorch/runtime/backend/interface.h>
14 14 | 15 15 | namespace executorch_jni {
16 16 | namespace runtime = ::executorch::ET_RUNTIME_NAMESPACE;
17 17 | 18 18 | class AndroidRuntimeJni : public facebook::jni::JavaClass<AndroidRuntimeJni> {
19 19 | public:
19 |- constexpr static const char* kJavaDescriptor ="Lorg/pytorch/executorch/ExecuTorchRuntime;";
20 |+ constexpr static const char* kJavaDescriptor =
21 |+"Lorg/pytorch/executorch/ExecuTorchRuntime;";
21 22 | 22 23 | static void registerNatives() {
23 24 | javaClassStatic()->registerNatives({
23 |- makeNativeMethod("getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
24 |- makeNativeMethod("getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
25 |+ makeNativeMethod(
26 |+ "getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
27 |+ makeNativeMethod(
28 |+ "getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
26 29 | });
27 30 | }
28 31 | Traceback (most recent call last):
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 102, in <module>
--------------------------------------------------------------------------------
33 36 | auto result = facebook::jni::JArrayClass<jstring>::newArray(kernels.size());
main()
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 98, in main
run_cmd_or_die(f"docker exec -t {container_name} /exec")
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 39, in run_cmd_or_die
raise RuntimeError(f"Command {cmd} failed with exit code {exit_code}")
RuntimeError: Command docker exec -t e81015920d83afd6e56e3dd9ca81cfdee041d74ffde9e4a7ced71ff12ffc333c /exec failed with exit code 1
34 37 | 35 38 | for (size_t i = 0; i < kernels.size(); ++i) {
35 |-auto op = facebook::jni::make_jstring(kernels[i].name_);
36 |-result->setElement(i, op.get());
39 |+auto op = facebook::jni::make_jstring(kernels[i].name_);
40 |+result->setElement(i, op.get());
38 41 | }
39 42 | 40 43 | return result;
--------------------------------------------------------------------------------
47 50 | auto result = facebook::jni::JArrayClass<jstring>::newArray(num_backends);
48 51 | 49 52 | for (int i = 0; i < num_backends; ++i) {
49 |-auto name_result = runtime::get_backend_name(i);
50 |-const char* name = "";
53 |+auto name_result = runtime::get_backend_name(i);
54 |+const char* name = "";
52 55 | 52 |-if (name_result.ok()) {
53 |-name = *name_result;
54 |-}
56 |+if (name_result.ok()) {
57 |+name = *name_result;
58 |+}
56 59 | 56 |-auto backend_str = facebook::jni::make_jstring(name);
57 |-result->setElement(i, backend_str.get());
60 |+auto backend_str = facebook::jni::make_jstring(name);
61 |+result->setElement(i, backend_str.get());
59 62 | }
60 63 | 61 64 | return result;

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

in your last comment with the CI output, is the failure just a formatting issue, or is there a runtime crash?

@kirklandsign

Copy link
Copy Markdown
Contributor

Just formatting issue

@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
facebook-github-bot merged commit 52d7778 into pytorch:mainMay 22, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure code merged

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.release notes: noneDo not include this in the release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Android] Java API for runtime info

3 participants

@keyprocedure@kirklandsign@facebook-github-bot
, '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] Add Java runtime API for registered ops and backends - #11042

Merged
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api
May 22, 2025
Merged

[Android] Add Java runtime API for registered ops and backends#11042
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api

Conversation

@keyprocedure

@keyprocedurekeyprocedure commented May 21, 2025

Copy link
Copy Markdown
Contributor

Summary

Adds a Java runtime API that exposes native methods to query registered operators and backends for debugging.

  • Adds getRegisteredOps() and getRegisteredBackends() native methods
  • Includes instrumentation tests for the runtime API

Fixes#10438

Test plan

  • Unit tests:
./gradlew :executorch_android:test
  • Instrumentation test:
./gradlew :executorch_android:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.pytorch.executorch.RuntimeInstrumentationTest
  • Manual testing:
    Verified Runtime API functionality on an emulator using a sample app. getRegisteredOps() and getRegisteredBackends() successfully returned and displayed all registered ops and backends.

@pytorch-bot

pytorch-botBot commented May 21, 2025

Copy link
Copy Markdown

🔗 Helpful Links

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

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

✅ No Failures

As of commit ea88c6f with merge base 33d4790 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@facebook-github-botfacebook-github-bot 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 May 21, 2025
@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

@pytorchbot label "release notes: none"

@pytorch-botpytorch-botBot added the release notes: none Do not include this in the release notes label May 21, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure sorry I made some updates in the codebase to fix some internal code breakage. Would you mind rebasing this PR against main?

@kirklandsign

Copy link
Copy Markdown
Contributor

Otherwise the PR looks good to me. Have you tested locally?

@keyprocedure
keyprocedureforce-pushed the add-android-runtime-api branch from 6f0a515 to dceb3e2CompareMay 22, 2025 03:30
@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@kirklandsign

Copy link
Copy Markdown
Contributor

A few more places:

srcs= ["jni_layer.cpp", "log.cpp"],

srcs= ["jni_layer.cpp", "log.cpp"],

"jni_layer_llama.cpp",

Could you please add the new JNI file to it?

And here:

runtime.export_file(
name="jni_layer.cpp",
)

export the new file, and add it to

"//xplat/executorch/extension/android/jni:jni_layer.cpp",

Thank you

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

Otherwise the PR looks good to me. Have you tested locally?

I tested the API functionality locally with the instrumentation test I created and manually verified through an emulator. I wasn't able to run the existing instrumentation tests because I didn't have the setup files

@kirklandsign

Copy link
Copy Markdown
Contributor

GH emulator CI passed 😄

And could use help with linter

@kirklandsign

Copy link
Copy Markdown
Contributor

google-java-format_linux-x86-64 -i extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.java

@kirklandsign

Copy link
Copy Markdown
Contributor

and


6 6 | * LICENSE file in the root directory of this source tree.
7 7 | */
8 8 | 9 |+#include <fbjni/fbjni.h>
9 10 | #include <jni.h>
9 |-#include <fbjni/fbjni.h>
11 11 | 12 |+#include <executorch/runtime/backend/interface.h>
12 13 | #include <executorch/runtime/kernel/operator_registry.h>
12 |-#include <executorch/runtime/backend/interface.h>
14 14 | 15 15 | namespace executorch_jni {
16 16 | namespace runtime = ::executorch::ET_RUNTIME_NAMESPACE;
17 17 | 18 18 | class AndroidRuntimeJni : public facebook::jni::JavaClass<AndroidRuntimeJni> {
19 19 | public:
19 |- constexpr static const char* kJavaDescriptor ="Lorg/pytorch/executorch/ExecuTorchRuntime;";
20 |+ constexpr static const char* kJavaDescriptor =
21 |+"Lorg/pytorch/executorch/ExecuTorchRuntime;";
21 22 | 22 23 | static void registerNatives() {
23 24 | javaClassStatic()->registerNatives({
23 |- makeNativeMethod("getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
24 |- makeNativeMethod("getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
25 |+ makeNativeMethod(
26 |+ "getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
27 |+ makeNativeMethod(
28 |+ "getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
26 29 | });
27 30 | }
28 31 | Traceback (most recent call last):
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 102, in <module>
--------------------------------------------------------------------------------
33 36 | auto result = facebook::jni::JArrayClass<jstring>::newArray(kernels.size());
main()
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 98, in main
run_cmd_or_die(f"docker exec -t {container_name} /exec")
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 39, in run_cmd_or_die
raise RuntimeError(f"Command {cmd} failed with exit code {exit_code}")
RuntimeError: Command docker exec -t e81015920d83afd6e56e3dd9ca81cfdee041d74ffde9e4a7ced71ff12ffc333c /exec failed with exit code 1
34 37 | 35 38 | for (size_t i = 0; i < kernels.size(); ++i) {
35 |-auto op = facebook::jni::make_jstring(kernels[i].name_);
36 |-result->setElement(i, op.get());
39 |+auto op = facebook::jni::make_jstring(kernels[i].name_);
40 |+result->setElement(i, op.get());
38 41 | }
39 42 | 40 43 | return result;
--------------------------------------------------------------------------------
47 50 | auto result = facebook::jni::JArrayClass<jstring>::newArray(num_backends);
48 51 | 49 52 | for (int i = 0; i < num_backends; ++i) {
49 |-auto name_result = runtime::get_backend_name(i);
50 |-const char* name = "";
53 |+auto name_result = runtime::get_backend_name(i);
54 |+const char* name = "";
52 55 | 52 |-if (name_result.ok()) {
53 |-name = *name_result;
54 |-}
56 |+if (name_result.ok()) {
57 |+name = *name_result;
58 |+}
56 59 | 56 |-auto backend_str = facebook::jni::make_jstring(name);
57 |-result->setElement(i, backend_str.get());
60 |+auto backend_str = facebook::jni::make_jstring(name);
61 |+result->setElement(i, backend_str.get());
59 62 | }
60 63 | 61 64 | return result;

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

in your last comment with the CI output, is the failure just a formatting issue, or is there a runtime crash?

@kirklandsign

Copy link
Copy Markdown
Contributor

Just formatting issue

@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
facebook-github-bot merged commit 52d7778 into pytorch:mainMay 22, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure code merged

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.release notes: noneDo not include this in the release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Android] Java API for runtime info

3 participants

@keyprocedure@kirklandsign@facebook-github-bot
, '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] Add Java runtime API for registered ops and backends - #11042

Merged
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api
May 22, 2025
Merged

[Android] Add Java runtime API for registered ops and backends#11042
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api

Conversation

@keyprocedure

@keyprocedurekeyprocedure commented May 21, 2025

Copy link
Copy Markdown
Contributor

Summary

Adds a Java runtime API that exposes native methods to query registered operators and backends for debugging.

  • Adds getRegisteredOps() and getRegisteredBackends() native methods
  • Includes instrumentation tests for the runtime API

Fixes#10438

Test plan

  • Unit tests:
./gradlew :executorch_android:test
  • Instrumentation test:
./gradlew :executorch_android:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.pytorch.executorch.RuntimeInstrumentationTest
  • Manual testing:
    Verified Runtime API functionality on an emulator using a sample app. getRegisteredOps() and getRegisteredBackends() successfully returned and displayed all registered ops and backends.

@pytorch-bot

pytorch-botBot commented May 21, 2025

Copy link
Copy Markdown

🔗 Helpful Links

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

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

✅ No Failures

As of commit ea88c6f with merge base 33d4790 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@facebook-github-botfacebook-github-bot 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 May 21, 2025
@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

@pytorchbot label "release notes: none"

@pytorch-botpytorch-botBot added the release notes: none Do not include this in the release notes label May 21, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure sorry I made some updates in the codebase to fix some internal code breakage. Would you mind rebasing this PR against main?

@kirklandsign

Copy link
Copy Markdown
Contributor

Otherwise the PR looks good to me. Have you tested locally?

@keyprocedure
keyprocedureforce-pushed the add-android-runtime-api branch from 6f0a515 to dceb3e2CompareMay 22, 2025 03:30
@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@kirklandsign

Copy link
Copy Markdown
Contributor

A few more places:

srcs= ["jni_layer.cpp", "log.cpp"],

srcs= ["jni_layer.cpp", "log.cpp"],

"jni_layer_llama.cpp",

Could you please add the new JNI file to it?

And here:

runtime.export_file(
name="jni_layer.cpp",
)

export the new file, and add it to

"//xplat/executorch/extension/android/jni:jni_layer.cpp",

Thank you

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

Otherwise the PR looks good to me. Have you tested locally?

I tested the API functionality locally with the instrumentation test I created and manually verified through an emulator. I wasn't able to run the existing instrumentation tests because I didn't have the setup files

@kirklandsign

Copy link
Copy Markdown
Contributor

GH emulator CI passed 😄

And could use help with linter

@kirklandsign

Copy link
Copy Markdown
Contributor

google-java-format_linux-x86-64 -i extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.java

@kirklandsign

Copy link
Copy Markdown
Contributor

and


6 6 | * LICENSE file in the root directory of this source tree.
7 7 | */
8 8 | 9 |+#include <fbjni/fbjni.h>
9 10 | #include <jni.h>
9 |-#include <fbjni/fbjni.h>
11 11 | 12 |+#include <executorch/runtime/backend/interface.h>
12 13 | #include <executorch/runtime/kernel/operator_registry.h>
12 |-#include <executorch/runtime/backend/interface.h>
14 14 | 15 15 | namespace executorch_jni {
16 16 | namespace runtime = ::executorch::ET_RUNTIME_NAMESPACE;
17 17 | 18 18 | class AndroidRuntimeJni : public facebook::jni::JavaClass<AndroidRuntimeJni> {
19 19 | public:
19 |- constexpr static const char* kJavaDescriptor ="Lorg/pytorch/executorch/ExecuTorchRuntime;";
20 |+ constexpr static const char* kJavaDescriptor =
21 |+"Lorg/pytorch/executorch/ExecuTorchRuntime;";
21 22 | 22 23 | static void registerNatives() {
23 24 | javaClassStatic()->registerNatives({
23 |- makeNativeMethod("getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
24 |- makeNativeMethod("getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
25 |+ makeNativeMethod(
26 |+ "getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
27 |+ makeNativeMethod(
28 |+ "getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
26 29 | });
27 30 | }
28 31 | Traceback (most recent call last):
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 102, in <module>
--------------------------------------------------------------------------------
33 36 | auto result = facebook::jni::JArrayClass<jstring>::newArray(kernels.size());
main()
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 98, in main
run_cmd_or_die(f"docker exec -t {container_name} /exec")
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 39, in run_cmd_or_die
raise RuntimeError(f"Command {cmd} failed with exit code {exit_code}")
RuntimeError: Command docker exec -t e81015920d83afd6e56e3dd9ca81cfdee041d74ffde9e4a7ced71ff12ffc333c /exec failed with exit code 1
34 37 | 35 38 | for (size_t i = 0; i < kernels.size(); ++i) {
35 |-auto op = facebook::jni::make_jstring(kernels[i].name_);
36 |-result->setElement(i, op.get());
39 |+auto op = facebook::jni::make_jstring(kernels[i].name_);
40 |+result->setElement(i, op.get());
38 41 | }
39 42 | 40 43 | return result;
--------------------------------------------------------------------------------
47 50 | auto result = facebook::jni::JArrayClass<jstring>::newArray(num_backends);
48 51 | 49 52 | for (int i = 0; i < num_backends; ++i) {
49 |-auto name_result = runtime::get_backend_name(i);
50 |-const char* name = "";
53 |+auto name_result = runtime::get_backend_name(i);
54 |+const char* name = "";
52 55 | 52 |-if (name_result.ok()) {
53 |-name = *name_result;
54 |-}
56 |+if (name_result.ok()) {
57 |+name = *name_result;
58 |+}
56 59 | 56 |-auto backend_str = facebook::jni::make_jstring(name);
57 |-result->setElement(i, backend_str.get());
60 |+auto backend_str = facebook::jni::make_jstring(name);
61 |+result->setElement(i, backend_str.get());
59 62 | }
60 63 | 61 64 | return result;

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

in your last comment with the CI output, is the failure just a formatting issue, or is there a runtime crash?

@kirklandsign

Copy link
Copy Markdown
Contributor

Just formatting issue

@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
facebook-github-bot merged commit 52d7778 into pytorch:mainMay 22, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure code merged

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.release notes: noneDo not include this in the release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Android] Java API for runtime info

3 participants

@keyprocedure@kirklandsign@facebook-github-bot
, '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] Add Java runtime API for registered ops and backends - #11042

Merged
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api
May 22, 2025
Merged

[Android] Add Java runtime API for registered ops and backends#11042
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api

Conversation

@keyprocedure

@keyprocedurekeyprocedure commented May 21, 2025

Copy link
Copy Markdown
Contributor

Summary

Adds a Java runtime API that exposes native methods to query registered operators and backends for debugging.

  • Adds getRegisteredOps() and getRegisteredBackends() native methods
  • Includes instrumentation tests for the runtime API

Fixes#10438

Test plan

  • Unit tests:
./gradlew :executorch_android:test
  • Instrumentation test:
./gradlew :executorch_android:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.pytorch.executorch.RuntimeInstrumentationTest
  • Manual testing:
    Verified Runtime API functionality on an emulator using a sample app. getRegisteredOps() and getRegisteredBackends() successfully returned and displayed all registered ops and backends.

@pytorch-bot

pytorch-botBot commented May 21, 2025

Copy link
Copy Markdown

🔗 Helpful Links

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

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

✅ No Failures

As of commit ea88c6f with merge base 33d4790 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@facebook-github-botfacebook-github-bot 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 May 21, 2025
@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

@pytorchbot label "release notes: none"

@pytorch-botpytorch-botBot added the release notes: none Do not include this in the release notes label May 21, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure sorry I made some updates in the codebase to fix some internal code breakage. Would you mind rebasing this PR against main?

@kirklandsign

Copy link
Copy Markdown
Contributor

Otherwise the PR looks good to me. Have you tested locally?

@keyprocedure
keyprocedureforce-pushed the add-android-runtime-api branch from 6f0a515 to dceb3e2CompareMay 22, 2025 03:30
@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@kirklandsign

Copy link
Copy Markdown
Contributor

A few more places:

srcs= ["jni_layer.cpp", "log.cpp"],

srcs= ["jni_layer.cpp", "log.cpp"],

"jni_layer_llama.cpp",

Could you please add the new JNI file to it?

And here:

runtime.export_file(
name="jni_layer.cpp",
)

export the new file, and add it to

"//xplat/executorch/extension/android/jni:jni_layer.cpp",

Thank you

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

Otherwise the PR looks good to me. Have you tested locally?

I tested the API functionality locally with the instrumentation test I created and manually verified through an emulator. I wasn't able to run the existing instrumentation tests because I didn't have the setup files

@kirklandsign

Copy link
Copy Markdown
Contributor

GH emulator CI passed 😄

And could use help with linter

@kirklandsign

Copy link
Copy Markdown
Contributor

google-java-format_linux-x86-64 -i extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.java

@kirklandsign

Copy link
Copy Markdown
Contributor

and


6 6 | * LICENSE file in the root directory of this source tree.
7 7 | */
8 8 | 9 |+#include <fbjni/fbjni.h>
9 10 | #include <jni.h>
9 |-#include <fbjni/fbjni.h>
11 11 | 12 |+#include <executorch/runtime/backend/interface.h>
12 13 | #include <executorch/runtime/kernel/operator_registry.h>
12 |-#include <executorch/runtime/backend/interface.h>
14 14 | 15 15 | namespace executorch_jni {
16 16 | namespace runtime = ::executorch::ET_RUNTIME_NAMESPACE;
17 17 | 18 18 | class AndroidRuntimeJni : public facebook::jni::JavaClass<AndroidRuntimeJni> {
19 19 | public:
19 |- constexpr static const char* kJavaDescriptor ="Lorg/pytorch/executorch/ExecuTorchRuntime;";
20 |+ constexpr static const char* kJavaDescriptor =
21 |+"Lorg/pytorch/executorch/ExecuTorchRuntime;";
21 22 | 22 23 | static void registerNatives() {
23 24 | javaClassStatic()->registerNatives({
23 |- makeNativeMethod("getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
24 |- makeNativeMethod("getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
25 |+ makeNativeMethod(
26 |+ "getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
27 |+ makeNativeMethod(
28 |+ "getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
26 29 | });
27 30 | }
28 31 | Traceback (most recent call last):
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 102, in <module>
--------------------------------------------------------------------------------
33 36 | auto result = facebook::jni::JArrayClass<jstring>::newArray(kernels.size());
main()
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 98, in main
run_cmd_or_die(f"docker exec -t {container_name} /exec")
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 39, in run_cmd_or_die
raise RuntimeError(f"Command {cmd} failed with exit code {exit_code}")
RuntimeError: Command docker exec -t e81015920d83afd6e56e3dd9ca81cfdee041d74ffde9e4a7ced71ff12ffc333c /exec failed with exit code 1
34 37 | 35 38 | for (size_t i = 0; i < kernels.size(); ++i) {
35 |-auto op = facebook::jni::make_jstring(kernels[i].name_);
36 |-result->setElement(i, op.get());
39 |+auto op = facebook::jni::make_jstring(kernels[i].name_);
40 |+result->setElement(i, op.get());
38 41 | }
39 42 | 40 43 | return result;
--------------------------------------------------------------------------------
47 50 | auto result = facebook::jni::JArrayClass<jstring>::newArray(num_backends);
48 51 | 49 52 | for (int i = 0; i < num_backends; ++i) {
49 |-auto name_result = runtime::get_backend_name(i);
50 |-const char* name = "";
53 |+auto name_result = runtime::get_backend_name(i);
54 |+const char* name = "";
52 55 | 52 |-if (name_result.ok()) {
53 |-name = *name_result;
54 |-}
56 |+if (name_result.ok()) {
57 |+name = *name_result;
58 |+}
56 59 | 56 |-auto backend_str = facebook::jni::make_jstring(name);
57 |-result->setElement(i, backend_str.get());
60 |+auto backend_str = facebook::jni::make_jstring(name);
61 |+result->setElement(i, backend_str.get());
59 62 | }
60 63 | 61 64 | return result;

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

in your last comment with the CI output, is the failure just a formatting issue, or is there a runtime crash?

@kirklandsign

Copy link
Copy Markdown
Contributor

Just formatting issue

@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
facebook-github-bot merged commit 52d7778 into pytorch:mainMay 22, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure code merged

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.release notes: noneDo not include this in the release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Android] Java API for runtime info

3 participants

@keyprocedure@kirklandsign@facebook-github-bot
, '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] Add Java runtime API for registered ops and backends - #11042

Merged
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api
May 22, 2025
Merged

[Android] Add Java runtime API for registered ops and backends#11042
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api

Conversation

@keyprocedure

@keyprocedurekeyprocedure commented May 21, 2025

Copy link
Copy Markdown
Contributor

Summary

Adds a Java runtime API that exposes native methods to query registered operators and backends for debugging.

  • Adds getRegisteredOps() and getRegisteredBackends() native methods
  • Includes instrumentation tests for the runtime API

Fixes#10438

Test plan

  • Unit tests:
./gradlew :executorch_android:test
  • Instrumentation test:
./gradlew :executorch_android:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.pytorch.executorch.RuntimeInstrumentationTest
  • Manual testing:
    Verified Runtime API functionality on an emulator using a sample app. getRegisteredOps() and getRegisteredBackends() successfully returned and displayed all registered ops and backends.

@pytorch-bot

pytorch-botBot commented May 21, 2025

Copy link
Copy Markdown

🔗 Helpful Links

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

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

✅ No Failures

As of commit ea88c6f with merge base 33d4790 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@facebook-github-botfacebook-github-bot 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 May 21, 2025
@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

@pytorchbot label "release notes: none"

@pytorch-botpytorch-botBot added the release notes: none Do not include this in the release notes label May 21, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure sorry I made some updates in the codebase to fix some internal code breakage. Would you mind rebasing this PR against main?

@kirklandsign

Copy link
Copy Markdown
Contributor

Otherwise the PR looks good to me. Have you tested locally?

@keyprocedure
keyprocedureforce-pushed the add-android-runtime-api branch from 6f0a515 to dceb3e2CompareMay 22, 2025 03:30
@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@kirklandsign

Copy link
Copy Markdown
Contributor

A few more places:

srcs= ["jni_layer.cpp", "log.cpp"],

srcs= ["jni_layer.cpp", "log.cpp"],

"jni_layer_llama.cpp",

Could you please add the new JNI file to it?

And here:

runtime.export_file(
name="jni_layer.cpp",
)

export the new file, and add it to

"//xplat/executorch/extension/android/jni:jni_layer.cpp",

Thank you

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

Otherwise the PR looks good to me. Have you tested locally?

I tested the API functionality locally with the instrumentation test I created and manually verified through an emulator. I wasn't able to run the existing instrumentation tests because I didn't have the setup files

@kirklandsign

Copy link
Copy Markdown
Contributor

GH emulator CI passed 😄

And could use help with linter

@kirklandsign

Copy link
Copy Markdown
Contributor

google-java-format_linux-x86-64 -i extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.java

@kirklandsign

Copy link
Copy Markdown
Contributor

and


6 6 | * LICENSE file in the root directory of this source tree.
7 7 | */
8 8 | 9 |+#include <fbjni/fbjni.h>
9 10 | #include <jni.h>
9 |-#include <fbjni/fbjni.h>
11 11 | 12 |+#include <executorch/runtime/backend/interface.h>
12 13 | #include <executorch/runtime/kernel/operator_registry.h>
12 |-#include <executorch/runtime/backend/interface.h>
14 14 | 15 15 | namespace executorch_jni {
16 16 | namespace runtime = ::executorch::ET_RUNTIME_NAMESPACE;
17 17 | 18 18 | class AndroidRuntimeJni : public facebook::jni::JavaClass<AndroidRuntimeJni> {
19 19 | public:
19 |- constexpr static const char* kJavaDescriptor ="Lorg/pytorch/executorch/ExecuTorchRuntime;";
20 |+ constexpr static const char* kJavaDescriptor =
21 |+"Lorg/pytorch/executorch/ExecuTorchRuntime;";
21 22 | 22 23 | static void registerNatives() {
23 24 | javaClassStatic()->registerNatives({
23 |- makeNativeMethod("getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
24 |- makeNativeMethod("getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
25 |+ makeNativeMethod(
26 |+ "getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
27 |+ makeNativeMethod(
28 |+ "getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
26 29 | });
27 30 | }
28 31 | Traceback (most recent call last):
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 102, in <module>
--------------------------------------------------------------------------------
33 36 | auto result = facebook::jni::JArrayClass<jstring>::newArray(kernels.size());
main()
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 98, in main
run_cmd_or_die(f"docker exec -t {container_name} /exec")
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 39, in run_cmd_or_die
raise RuntimeError(f"Command {cmd} failed with exit code {exit_code}")
RuntimeError: Command docker exec -t e81015920d83afd6e56e3dd9ca81cfdee041d74ffde9e4a7ced71ff12ffc333c /exec failed with exit code 1
34 37 | 35 38 | for (size_t i = 0; i < kernels.size(); ++i) {
35 |-auto op = facebook::jni::make_jstring(kernels[i].name_);
36 |-result->setElement(i, op.get());
39 |+auto op = facebook::jni::make_jstring(kernels[i].name_);
40 |+result->setElement(i, op.get());
38 41 | }
39 42 | 40 43 | return result;
--------------------------------------------------------------------------------
47 50 | auto result = facebook::jni::JArrayClass<jstring>::newArray(num_backends);
48 51 | 49 52 | for (int i = 0; i < num_backends; ++i) {
49 |-auto name_result = runtime::get_backend_name(i);
50 |-const char* name = "";
53 |+auto name_result = runtime::get_backend_name(i);
54 |+const char* name = "";
52 55 | 52 |-if (name_result.ok()) {
53 |-name = *name_result;
54 |-}
56 |+if (name_result.ok()) {
57 |+name = *name_result;
58 |+}
56 59 | 56 |-auto backend_str = facebook::jni::make_jstring(name);
57 |-result->setElement(i, backend_str.get());
60 |+auto backend_str = facebook::jni::make_jstring(name);
61 |+result->setElement(i, backend_str.get());
59 62 | }
60 63 | 61 64 | return result;

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

in your last comment with the CI output, is the failure just a formatting issue, or is there a runtime crash?

@kirklandsign

Copy link
Copy Markdown
Contributor

Just formatting issue

@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
facebook-github-bot merged commit 52d7778 into pytorch:mainMay 22, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure code merged

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.release notes: noneDo not include this in the release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Android] Java API for runtime info

3 participants

@keyprocedure@kirklandsign@facebook-github-bot
, '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] Add Java runtime API for registered ops and backends - #11042

Merged
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api
May 22, 2025
Merged

[Android] Add Java runtime API for registered ops and backends#11042
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api

Conversation

@keyprocedure

@keyprocedurekeyprocedure commented May 21, 2025

Copy link
Copy Markdown
Contributor

Summary

Adds a Java runtime API that exposes native methods to query registered operators and backends for debugging.

  • Adds getRegisteredOps() and getRegisteredBackends() native methods
  • Includes instrumentation tests for the runtime API

Fixes#10438

Test plan

  • Unit tests:
./gradlew :executorch_android:test
  • Instrumentation test:
./gradlew :executorch_android:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.pytorch.executorch.RuntimeInstrumentationTest
  • Manual testing:
    Verified Runtime API functionality on an emulator using a sample app. getRegisteredOps() and getRegisteredBackends() successfully returned and displayed all registered ops and backends.

@pytorch-bot

pytorch-botBot commented May 21, 2025

Copy link
Copy Markdown

🔗 Helpful Links

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

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

✅ No Failures

As of commit ea88c6f with merge base 33d4790 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@facebook-github-botfacebook-github-bot 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 May 21, 2025
@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

@pytorchbot label "release notes: none"

@pytorch-botpytorch-botBot added the release notes: none Do not include this in the release notes label May 21, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure sorry I made some updates in the codebase to fix some internal code breakage. Would you mind rebasing this PR against main?

@kirklandsign

Copy link
Copy Markdown
Contributor

Otherwise the PR looks good to me. Have you tested locally?

@keyprocedure
keyprocedureforce-pushed the add-android-runtime-api branch from 6f0a515 to dceb3e2CompareMay 22, 2025 03:30
@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@kirklandsign

Copy link
Copy Markdown
Contributor

A few more places:

srcs= ["jni_layer.cpp", "log.cpp"],

srcs= ["jni_layer.cpp", "log.cpp"],

"jni_layer_llama.cpp",

Could you please add the new JNI file to it?

And here:

runtime.export_file(
name="jni_layer.cpp",
)

export the new file, and add it to

"//xplat/executorch/extension/android/jni:jni_layer.cpp",

Thank you

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

Otherwise the PR looks good to me. Have you tested locally?

I tested the API functionality locally with the instrumentation test I created and manually verified through an emulator. I wasn't able to run the existing instrumentation tests because I didn't have the setup files

@kirklandsign

Copy link
Copy Markdown
Contributor

GH emulator CI passed 😄

And could use help with linter

@kirklandsign

Copy link
Copy Markdown
Contributor

google-java-format_linux-x86-64 -i extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.java

@kirklandsign

Copy link
Copy Markdown
Contributor

and


6 6 | * LICENSE file in the root directory of this source tree.
7 7 | */
8 8 | 9 |+#include <fbjni/fbjni.h>
9 10 | #include <jni.h>
9 |-#include <fbjni/fbjni.h>
11 11 | 12 |+#include <executorch/runtime/backend/interface.h>
12 13 | #include <executorch/runtime/kernel/operator_registry.h>
12 |-#include <executorch/runtime/backend/interface.h>
14 14 | 15 15 | namespace executorch_jni {
16 16 | namespace runtime = ::executorch::ET_RUNTIME_NAMESPACE;
17 17 | 18 18 | class AndroidRuntimeJni : public facebook::jni::JavaClass<AndroidRuntimeJni> {
19 19 | public:
19 |- constexpr static const char* kJavaDescriptor ="Lorg/pytorch/executorch/ExecuTorchRuntime;";
20 |+ constexpr static const char* kJavaDescriptor =
21 |+"Lorg/pytorch/executorch/ExecuTorchRuntime;";
21 22 | 22 23 | static void registerNatives() {
23 24 | javaClassStatic()->registerNatives({
23 |- makeNativeMethod("getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
24 |- makeNativeMethod("getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
25 |+ makeNativeMethod(
26 |+ "getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
27 |+ makeNativeMethod(
28 |+ "getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
26 29 | });
27 30 | }
28 31 | Traceback (most recent call last):
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 102, in <module>
--------------------------------------------------------------------------------
33 36 | auto result = facebook::jni::JArrayClass<jstring>::newArray(kernels.size());
main()
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 98, in main
run_cmd_or_die(f"docker exec -t {container_name} /exec")
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 39, in run_cmd_or_die
raise RuntimeError(f"Command {cmd} failed with exit code {exit_code}")
RuntimeError: Command docker exec -t e81015920d83afd6e56e3dd9ca81cfdee041d74ffde9e4a7ced71ff12ffc333c /exec failed with exit code 1
34 37 | 35 38 | for (size_t i = 0; i < kernels.size(); ++i) {
35 |-auto op = facebook::jni::make_jstring(kernels[i].name_);
36 |-result->setElement(i, op.get());
39 |+auto op = facebook::jni::make_jstring(kernels[i].name_);
40 |+result->setElement(i, op.get());
38 41 | }
39 42 | 40 43 | return result;
--------------------------------------------------------------------------------
47 50 | auto result = facebook::jni::JArrayClass<jstring>::newArray(num_backends);
48 51 | 49 52 | for (int i = 0; i < num_backends; ++i) {
49 |-auto name_result = runtime::get_backend_name(i);
50 |-const char* name = "";
53 |+auto name_result = runtime::get_backend_name(i);
54 |+const char* name = "";
52 55 | 52 |-if (name_result.ok()) {
53 |-name = *name_result;
54 |-}
56 |+if (name_result.ok()) {
57 |+name = *name_result;
58 |+}
56 59 | 56 |-auto backend_str = facebook::jni::make_jstring(name);
57 |-result->setElement(i, backend_str.get());
60 |+auto backend_str = facebook::jni::make_jstring(name);
61 |+result->setElement(i, backend_str.get());
59 62 | }
60 63 | 61 64 | return result;

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

in your last comment with the CI output, is the failure just a formatting issue, or is there a runtime crash?

@kirklandsign

Copy link
Copy Markdown
Contributor

Just formatting issue

@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
facebook-github-bot merged commit 52d7778 into pytorch:mainMay 22, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure code merged

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.release notes: noneDo not include this in the release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Android] Java API for runtime info

3 participants

@keyprocedure@kirklandsign@facebook-github-bot
, '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] Add Java runtime API for registered ops and backends - #11042

Merged
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api
May 22, 2025
Merged

[Android] Add Java runtime API for registered ops and backends#11042
facebook-github-bot merged 5 commits into
pytorch:mainfrom
keyprocedure:add-android-runtime-api

Conversation

@keyprocedure

@keyprocedurekeyprocedure commented May 21, 2025

Copy link
Copy Markdown
Contributor

Summary

Adds a Java runtime API that exposes native methods to query registered operators and backends for debugging.

  • Adds getRegisteredOps() and getRegisteredBackends() native methods
  • Includes instrumentation tests for the runtime API

Fixes#10438

Test plan

  • Unit tests:
./gradlew :executorch_android:test
  • Instrumentation test:
./gradlew :executorch_android:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.pytorch.executorch.RuntimeInstrumentationTest
  • Manual testing:
    Verified Runtime API functionality on an emulator using a sample app. getRegisteredOps() and getRegisteredBackends() successfully returned and displayed all registered ops and backends.

@pytorch-bot

pytorch-botBot commented May 21, 2025

Copy link
Copy Markdown

🔗 Helpful Links

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

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

✅ No Failures

As of commit ea88c6f with merge base 33d4790 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@facebook-github-botfacebook-github-bot 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 May 21, 2025
@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

@pytorchbot label "release notes: none"

@pytorch-botpytorch-botBot added the release notes: none Do not include this in the release notes label May 21, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure sorry I made some updates in the codebase to fix some internal code breakage. Would you mind rebasing this PR against main?

@kirklandsign

Copy link
Copy Markdown
Contributor

Otherwise the PR looks good to me. Have you tested locally?

@keyprocedure
keyprocedureforce-pushed the add-android-runtime-api branch from 6f0a515 to dceb3e2CompareMay 22, 2025 03:30
@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@kirklandsign

Copy link
Copy Markdown
Contributor

A few more places:

srcs= ["jni_layer.cpp", "log.cpp"],

srcs= ["jni_layer.cpp", "log.cpp"],

"jni_layer_llama.cpp",

Could you please add the new JNI file to it?

And here:

runtime.export_file(
name="jni_layer.cpp",
)

export the new file, and add it to

"//xplat/executorch/extension/android/jni:jni_layer.cpp",

Thank you

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

Otherwise the PR looks good to me. Have you tested locally?

I tested the API functionality locally with the instrumentation test I created and manually verified through an emulator. I wasn't able to run the existing instrumentation tests because I didn't have the setup files

@kirklandsign

Copy link
Copy Markdown
Contributor

GH emulator CI passed 😄

And could use help with linter

@kirklandsign

Copy link
Copy Markdown
Contributor

google-java-format_linux-x86-64 -i extension/android/executorch_android/src/main/java/org/pytorch/executorch/ExecuTorchRuntime.java

@kirklandsign

Copy link
Copy Markdown
Contributor

and


6 6 | * LICENSE file in the root directory of this source tree.
7 7 | */
8 8 | 9 |+#include <fbjni/fbjni.h>
9 10 | #include <jni.h>
9 |-#include <fbjni/fbjni.h>
11 11 | 12 |+#include <executorch/runtime/backend/interface.h>
12 13 | #include <executorch/runtime/kernel/operator_registry.h>
12 |-#include <executorch/runtime/backend/interface.h>
14 14 | 15 15 | namespace executorch_jni {
16 16 | namespace runtime = ::executorch::ET_RUNTIME_NAMESPACE;
17 17 | 18 18 | class AndroidRuntimeJni : public facebook::jni::JavaClass<AndroidRuntimeJni> {
19 19 | public:
19 |- constexpr static const char* kJavaDescriptor ="Lorg/pytorch/executorch/ExecuTorchRuntime;";
20 |+ constexpr static const char* kJavaDescriptor =
21 |+"Lorg/pytorch/executorch/ExecuTorchRuntime;";
21 22 | 22 23 | static void registerNatives() {
23 24 | javaClassStatic()->registerNatives({
23 |- makeNativeMethod("getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
24 |- makeNativeMethod("getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
25 |+ makeNativeMethod(
26 |+ "getRegisteredOps", AndroidRuntimeJni::getRegisteredOps),
27 |+ makeNativeMethod(
28 |+ "getRegisteredBackends", AndroidRuntimeJni::getRegisteredBackends),
26 29 | });
27 30 | }
28 31 | Traceback (most recent call last):
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 102, in <module>
--------------------------------------------------------------------------------
33 36 | auto result = facebook::jni::JArrayClass<jstring>::newArray(kernels.size());
main()
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 98, in main
run_cmd_or_die(f"docker exec -t {container_name} /exec")
File "/home/ec2-user/actions-runner/_work/executorch/executorch/test-infra/.github/scripts/run_with_env_secrets.py", line 39, in run_cmd_or_die
raise RuntimeError(f"Command {cmd} failed with exit code {exit_code}")
RuntimeError: Command docker exec -t e81015920d83afd6e56e3dd9ca81cfdee041d74ffde9e4a7ced71ff12ffc333c /exec failed with exit code 1
34 37 | 35 38 | for (size_t i = 0; i < kernels.size(); ++i) {
35 |-auto op = facebook::jni::make_jstring(kernels[i].name_);
36 |-result->setElement(i, op.get());
39 |+auto op = facebook::jni::make_jstring(kernels[i].name_);
40 |+result->setElement(i, op.get());
38 41 | }
39 42 | 40 43 | return result;
--------------------------------------------------------------------------------
47 50 | auto result = facebook::jni::JArrayClass<jstring>::newArray(num_backends);
48 51 | 49 52 | for (int i = 0; i < num_backends; ++i) {
49 |-auto name_result = runtime::get_backend_name(i);
50 |-const char* name = "";
53 |+auto name_result = runtime::get_backend_name(i);
54 |+const char* name = "";
52 55 | 52 |-if (name_result.ok()) {
53 |-name = *name_result;
54 |-}
56 |+if (name_result.ok()) {
57 |+name = *name_result;
58 |+}
56 59 | 56 |-auto backend_str = facebook::jni::make_jstring(name);
57 |-result->setElement(i, backend_str.get());
60 |+auto backend_str = facebook::jni::make_jstring(name);
61 |+result->setElement(i, backend_str.get());
59 62 | }
60 63 | 61 64 | return result;

@keyprocedure

Copy link
Copy Markdown
ContributorAuthor

in your last comment with the CI output, is the failure just a formatting issue, or is there a runtime crash?

@kirklandsign

Copy link
Copy Markdown
Contributor

Just formatting issue

@facebook-github-bot

Copy link
Copy Markdown
Contributor

@kirklandsign has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
facebook-github-bot merged commit 52d7778 into pytorch:mainMay 22, 2025
@kirklandsign

Copy link
Copy Markdown
Contributor

Thank you @keyprocedure code merged

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.release notes: noneDo not include this in the release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Android] Java API for runtime info

3 participants

@keyprocedure@kirklandsign@facebook-github-bot