thek0tyara/llama-cpp-turboquant
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Updated example to not use native activity anymore

Browse source
This commit is contained in:
Alejandro Saucedo 2020-10-03 18:27:39 +01:00
parent ba70a4c666
commit a73f82e191
23 changed files with 321 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/CMakeLists.txt
View file

@ -29,19 +29,19 @@ file(GLOB kompute_CPP
)
if(KOMPUTE_OPT_ANDOID_BUILD)
set(ANDROID_APP_GLUE_DIR ${ANDROID_NDK}/sources/android/native_app_glue)
#set(ANDROID_APP_GLUE_DIR ${ANDROID_NDK}/sources/android/native_app_glue)
set(VK_ANDROID_COMMON_DIR ${ANDROID_NDK}/sources/third_party/vulkan/src/common)
set(VK_ANDROID_PATCH_DIR ${PROJECT_SOURCE_DIR}/vk_ndk_wrapper_include/)
set(VK_ANDROID_INCLUDE_DIR ${ANDROID_NDK}/sources/third_party/vulkan/src/include)
include_directories(
${ANDROID_APP_GLUE_DIR}
#${ANDROID_APP_GLUE_DIR}
${VK_ANDROID_COMMON_DIR}
${VK_ANDROID_PATCH_DIR}
${VK_ANDROID_INCLUDE_DIR})
add_library(android_app_glue STATIC
${ANDROID_APP_GLUE_DIR}/android_native_app_glue.c)
#add_library(android_app_glue STATIC
# ${ANDROID_APP_GLUE_DIR}/android_native_app_glue.c)
add_library(kompute_vk_ndk_wrapper STATIC
${PROJECT_SOURCE_DIR}/vk_ndk_wrapper_include/kompute_vk_ndk_wrapper.cpp)
@ -79,7 +79,7 @@ endif()
if(KOMPUTE_OPT_ANDOID_BUILD)
target_link_libraries(
kompute
android_app_glue
#android_app_glue
kompute_vk_ndk_wrapper
log
android

4
src/include/kompute/Core.hpp
View file

@ -9,8 +9,8 @@
//#define USE_DEBUG_EXTENTIONS
#ifdef VK_USE_PLATFORM_ANDROID_KHR
#include <android/log.h>
#include <android_native_app_glue.h>
//#include <android/log.h>
//#include <android_native_app_glue.h>
#include <kompute_vk_ndk_wrapper.hpp>
// VK_NO_PROTOTYPES required before vulkan import but after wrapper.hpp