Skip to content

Add Vulkan executor runner to Android JNIs #2563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add Vulkan executor runner to Android JNIs #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0548c45
Add Vulkan executor runner to Android JNIs
SS-JIA Mar 21, 2024
71a83fd
Update on "Add Vulkan executor runner to Android JNIs"
SS-JIA Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions backends/vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,9 @@ if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*iOS\.cmake$")
target_compile_options(vulkan_executor_runner PUBLIC ${VULKAN_CXX_FLAGS})

add_library(vulkan_executor_runner_lib STATIC ${VULKAN_RUNNER_SRCS})
target_link_libraries(vulkan_executor_runner_lib ${_executor_runner_libs}
vulkan_schema vulkan_backend)
target_link_libraries(
vulkan_executor_runner_lib ${_executor_runner_libs} vulkan_schema
vulkan_backend vulkan_api_lib ${VULKAN_STANDARD_OPS_LIBS})
target_compile_options(vulkan_executor_runner_lib PUBLIC ${VULKAN_CXX_FLAGS})
endif()

Expand Down
43 changes: 26 additions & 17 deletions extension/android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.


cmake_minimum_required(VERSION 3.19)

project(executorch_jni)
Expand All @@ -14,22 +13,32 @@ include(${EXECUTORCH_ROOT}/build/Utils.cmake)

set(_common_include_directories ${EXECUTORCH_ROOT}/..)

add_subdirectory(
${EXECUTORCH_ROOT}/examples/third-party/fbjni
${CMAKE_CURRENT_BINARY_DIR}/third-party/fbjni)
add_subdirectory(${EXECUTORCH_ROOT}/examples/third-party/fbjni
${CMAKE_CURRENT_BINARY_DIR}/third-party/fbjni)

if(CMAKE_TOOLCHAIN_ANDROID)
add_library(executorch_jni SHARED jni/jni_layer.cpp)
target_link_libraries(executorch_jni extension_data_loader
extension_module xnn_executor_runner_lib fbjni)
if(EXECUTORCH_BUILD_QNN)
target_link_libraries(executorch_jni qnn_executorch_backend)
endif()
target_compile_options(executorch_jni PUBLIC ${_common_compile_options})

add_library(executorch_llama_jni SHARED jni/jni_layer_llama.cpp)
target_link_libraries(executorch_llama_jni fbjni llama_runner
xnn_executor_runner_lib)
target_compile_options(executorch_llama_jni PUBLIC
${_common_compile_options})
add_library(executorch_jni SHARED jni/jni_layer.cpp)
target_link_libraries(executorch_jni extension_data_loader extension_module
fbjni)
if(EXECUTORCH_BUILD_QNN)
target_link_libraries(executorch_jni qnn_executorch_backend)
endif()
if(EXECUTORCH_BUILD_XNNPACK)
target_link_libraries(executorch_jni xnn_executor_runner_lib)
endif()
if(EXECUTORCH_BUILD_VULKAN)
target_link_libraries(executorch_jni vulkan_executor_runner_lib)
endif()
target_compile_options(executorch_jni PUBLIC ${_common_compile_options})

add_library(executorch_llama_jni SHARED jni/jni_layer_llama.cpp)
target_link_libraries(executorch_llama_jni fbjni llama_runner)
if(EXECUTORCH_BUILD_XNNPACK)
target_link_libraries(executorch_llama_jni xnn_executor_runner_lib)
endif()
if(EXECUTORCH_BUILD_VULKAN)
target_link_libraries(executorch_llama_jni vulkan_executor_runner_lib)
endif()

target_compile_options(executorch_llama_jni PUBLIC ${_common_compile_options})
endif()