Remove EXECUTORCH_BUILD_LLAMA_JNI cmake flag

[jathu]

Summary

I think EXECUTORCH_BUILD_LLAMA_JNI is redundant. If we are building for Android (assumed true under extension/android) and with EXECUTORCH_BUILD_EXTENSION_LLM, then it implies we want the JNI bindings!

There is a C++ def EXECUTORCH_BUILD_LLAMA_JNI that does some registration:

executorch/extension/android/jni/jni_layer.cpp

Lines 488 to 493 in 31ba959

	#ifdef EXECUTORCH_BUILD_LLAMA_JNI
	extern void register_natives_for_llm();
	#else
	// No op if we don't build LLM
	void register_natives_for_llm() {}
	#endif

However, we turn them on for both BUCK:

executorch/extension/android/jni/BUCK

Lines 72 to 82 in 31ba959

	non_fbcode_target(_kind = fb_android_cxx_library,
	name = "executorch_llama_jni",
	srcs = [
	"jni_layer.cpp",
	"jni_layer_llama.cpp",
	"jni_layer_runtime.cpp",
	],
	allow_jni_merging = False,
	compiler_flags = ET_JNI_COMPILER_FLAGS + [
	"-DEXECUTORCH_BUILD_LLAMA_JNI",
	],

And cmake:

executorch/extension/android/CMakeLists.txt

Lines 148 to 151 in b5f950b

	if(EXECUTORCH_BUILD_LLAMA_JNI)
	target_sources(executorch_jni PRIVATE jni/jni_layer_llama.cpp jni/log.cpp)
	list(APPEND link_libraries llama_runner llava_runner)
	target_compile_definitions(executorch_jni PUBLIC EXECUTORCH_BUILD_LLAMA_JNI=1)

Test plan

CI

cc @larryliu0820 @mergennachin @cccclai @helunwencser @jackzhxng

[pytorch-bot]

🔗 Helpful Links

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

• 📄 Preview Python docs built from this PR

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

❌ 3 New Failures, 4 Unrelated Failures

As of commit c3651af with merge base abd6eff ():

NEW FAILURES - The following jobs have failed:

• pull / android / build-llm-demo / linux-job (gh)
  RuntimeError: Command docker exec -t 53acd6ff28f3860d578f250d8ae8411c091a0a6f58d7fdac99512966ea25796e /exec failed with exit code 1
• pull / test-eval_llama-mmlu-linux / linux-job (gh)
  RuntimeError: Command docker exec -t 67bb3a043ee9b367962c840bb0b666b5ca1b317eed5bb5c55a84b0bb78b27efc /exec failed with exit code 1
• trunk / test-models-macos (llama3_2_vision_encoder, portable) / macos-job (gh)
  Library not loaded: @rpath/liblz4.1.dylib

BROKEN TRUNK - The following jobs failed but were present on the merge base:

👉 Rebase onto the `viable/strict` branch to avoid these failures

• Apple / build-benchmark-app / macos-job (gh) (trunk failure)
  RuntimeError: Command bash /Users/runner/work/_temp/exec_script failed with exit code 65
• pull / unittest / linux / linux-job (gh) (trunk failure)
  examples/models/llama/tests/test_ring_attention.py::TestRingAttention::test_sliding_window_attention
• pull / unittest-editable / linux / linux-job (gh) (trunk failure)
  examples/models/llama/tests/test_ring_attention.py::TestRingAttention::test_sliding_window_attention
• trunk / unittest-release / linux / linux-job (gh) (trunk failure)
  examples/models/llama/tests/test_ring_attention.py::TestRingAttention::test_sliding_window_attention

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

[GregoryComer]

Makes sense. Thanks for spotting and cleaning this up.

[larryliu0820]

I think this is a good change. cc @kirklandsign