Rename jni layer cpp files#17380
Conversation
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/17380
Note: Links to docs will display an error until the docs builds have been completed. ❗ 1 Active SEVsThere are 1 currently active SEVs. If your PR is affected, please view them below: ❌ 3 New Failures, 2 Unrelated FailuresAs of commit e89106e with merge base 89e6416 ( NEW FAILURES - The following jobs have failed:
BROKEN TRUNK - The following jobs failed but were present on the merge base:👉 Rebase onto the `viable/strict` branch to avoid these failures
This comment was automatically generated by Dr. CI and updates every 15 minutes. |
This PR needs a
|
There was a problem hiding this comment.
Pull request overview
This PR renames the Android JNI C++ entrypoints to better align file names with their Java counterparts (per #10890), and updates build-system references accordingly.
Changes:
- Renamed the core JNI source file reference from
jni_layer.cpptojni_module.cppacross Buck/CMake. - Renamed the LLM JNI source file reference from
jni_layer_llama.cpptojni_llm_module.cppacross Buck/CMake. - Updated internal references/comments to reflect the new filenames.
Reviewed changes
Copilot reviewed 4 out of 6 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| extension/android/jni/selective_jni.buck.bzl | Updates selective JNI target to point at jni_module.cpp. |
| extension/android/jni/jni_module.cpp | New/renamed core JNI implementation file. |
| extension/android/jni/jni_llm_module.cpp | New/renamed LLM JNI implementation file. |
| extension/android/jni/jni_layer_training.cpp | Updates comment referencing the renamed core JNI file. |
| extension/android/jni/BUCK | Updates Buck build targets to use renamed JNI sources and export the new filename. |
| extension/android/CMakeLists.txt | Updates CMake sources list to use renamed JNI sources. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
8c01cd5 to
92a927d
Compare
|
@kirklandsign has imported this pull request. If you are a Meta employee, you can view this in D93154524. |
|
is there something i should work on? @kirklandsign |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 4 out of 6 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
Could you please fix the lint error? |
|
Hi @mohammed-saalim, thanks for the PR. Please do address the errors and fixes suggested in the lint runner and submit for review again. Thanks! |
76ae0e6 to
223231b
Compare
|
can u check now pls? |
|
Hi @mohammed-saalim also there is a merge conflict |
223231b to
bc02639
Compare
|
Hi @kirklandsign @nil-is-all, sorry for the delay! I've addressed the feedback:
Ready for re-review when you get a chance. Thanks! |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 4 out of 6 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@mohammed-saalim sorry new merge conflicts |
|
@mohammed-saalim, sorry to ping again, could you look at the merge conflicts and let us know again? |
Renamed JNI layer files to better align with their Java counterparts: - jni_layer.cpp -> jni_module.cpp - jni_layer_llama.cpp -> jni_llm_module.cpp Updated all references in build files (CMakeLists.txt, BUCK, selective_jni.buck.bzl) and comments to reflect the new names. Fixes pytorch#10890
cdd6eef to
c02da57
Compare
|
Hey @kirklandsign @nil-is-all, apologies for the delay! Rebased onto latest main, no conflicts now. Ready for re-review. Thanks for your patience! Lemme know if u need something else |
Summary
Renamed JNI layer files to better align with their Java counterparts, improving the name mapping between JNI and Java layers as suggested in #10890.
Changes
jni_layer.cpp→jni_module.cppjni_layer_llama.cpp→jni_llm_module.cppextension/android/CMakeLists.txtextension/android/jni/BUCKextension/android/jni/selective_jni.buck.bzlextension/android/jni/jni_layer_training.cppTesting
git mvFixes #10890
cc @kirklandsign @cbilgin