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

Updated to working example

Browse source
This commit is contained in:
Alejandro Saucedo 2020-10-03 15:26:55 +01:00
parent 02f4f34f9c
commit b584a0ebfc
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
examples/android/android-simple/app/build.gradle
View file

@ -17,7 +17,12 @@ android {
externalNativeBuild {
cmake {
abiFilters "armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64'
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static', '-DKOMPUTE_OPT_ANDOID_BUILD=1', '-DKOMPUTE_OPT_INSTALL=0', '-DKOMPUTE_OPT_BUILD_SINGLE_HEADER=1'
arguments '-DANDROID_TOOLCHAIN=clang',
'-DANDROID_STL=c++_static',
'-DKOMPUTE_OPT_ANDOID_BUILD=1',
'-DKOMPUTE_OPT_INSTALL=0',
'-DKOMPUTE_OPT_BUILD_SINGLE_HEADER=1',
'-DKOMPUTE_OPT_DISABLE_VK_DEBUG_LAYERS=1'
}
}
}

2
examples/android/android-simple/app/src/main/jni/CMakeLists.txt
View file

@ -26,7 +26,7 @@ include_directories(
# * -DUSE_DEBUG_EXTENTIONS
# * -Wno-unused-variable
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 \
-DVK_USE_PLATFORM_ANDROID_KHR -DUSE_DEBUG_EXTENTIONS")
-DVK_USE_PLATFORM_ANDROID_KHR=1 -DKOMPUTE_DISABLE_VK_DEBUG_LAYERS=1")
set(CMAKE_SHARED_LINKER_FLAGS
"${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")

10
examples/android/android-simple/app/src/main/jni/main.cpp
View file

@ -215,16 +215,6 @@ bool initialize(android_app* app) {
CALL_VK(
vkCreateDevice(tutorialGpu, &deviceCreateInfo, nullptr, &tutorialDevice));
VkInstance tutorialInstance;
VkPhysicalDevice tutorialGpu;
VkDevice tutorialDevice;
std::shared_ptr<vk::Instance> tutorialInstanceHpp = std::make_shared<vk::Instance>(tutorialInstance);
std::shared_ptr<vk::PhysicalDevice> tutorialGpuHpp = std::make_shared<vk::PhysicalDevice>(tutorialGpu);
std::shared_ptr<vk::Device> tutorialDeviceHpp = std::make_shared<vk::Device>(tutorialDevice);
//
// kp::Manager mgr(tutorialInstanceHpp, tutorialGpuHpp, tutorialDeviceHpp, 0);
LOGI("BEFORE RUNNING");
kp::Manager mgr;