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

Downgraded CMake minimum version to 3.14 from 3.15

Browse source 
Signed-off-by: Fabian Sauter <sauter.fabian@mailbox.org>
This commit is contained in:
Fabian Sauter 2022-07-11 14:13:35 +02:00
parent a86736e332
commit dab8492376
14 changed files with 151 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

27
test/CMakeLists.txt
View file

@ -1,28 +1,29 @@
# SPDX-License-Identifier: Apache-2.0
#######################
cmake_minimum_required(VERSION 3.15)
# ######################
cmake_minimum_required(VERSION 3.14)
#####################################################
# ####################################################
# Shaders
#####################################################
# ####################################################
add_subdirectory(shaders)
#####################################################
# ####################################################
# Tests
#####################################################
# ####################################################
macro(add_kompute_test _TEST_NAME)
add_executable("${_TEST_NAME}_tests" "Test${_TEST_NAME}.cpp"
${ARGN})
${ARGN})
target_link_libraries("${_TEST_NAME}_tests" PRIVATE GTest::GTest
kompute::kompute
kp_logger
test_shaders
test_shaders_glsl)
kompute::kompute
kp_logger
test_shaders
test_shaders_glsl)
add_test(NAME "kompute_${_TEST_NAME}_tests" COMMAND "${_TEST_NAME}_tests")
# Group under the "tests" project folder in IDEs such as Visual Studio.
set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests")
if(WIN32 AND BUILD_SHARED_LIBS AND NOT FILES_COPYED) # Install dlls in the same directory as the executable on Windows so one can simply double click them
if(WIN32 AND BUILD_SHARED_LIBS AND NOT FILES_COPYED) # Install dlls in the same directory as the executable on Windows so one can simply double click them
set(FILES_COPYED "DONE")
add_custom_command(TARGET ${_TEST_NAME}_tests POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:test_shaders> $<TARGET_FILE_DIR:${_TEST_NAME}_tests>)
add_custom_command(TARGET ${_TEST_NAME}_tests POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:kompute::kompute> $<TARGET_FILE_DIR:${_TEST_NAME}_tests>)

6
test/shaders/CMakeLists.txt
View file

@ -1,8 +1,8 @@
# SPDX-License-Identifier: Apache-2.0
#######################
cmake_minimum_required(VERSION 3.15)
# ######################
cmake_minimum_required(VERSION 3.14)
add_library(test_shaders "Utils.cpp"
"Utils.hpp")
"Utils.hpp")
add_subdirectory(glsl)

26
test/shaders/glsl/CMakeLists.txt
View file

@ -1,26 +1,26 @@
# SPDX-License-Identifier: Apache-2.0
#######################
cmake_minimum_required(VERSION 3.15)
# ######################
cmake_minimum_required(VERSION 3.14)
vulkan_compile_shader(INFILE test_logistic_regression_shader.comp
OUTFILE test_logistic_regression_shader.hpp
NAMESPACE "kp")
OUTFILE test_logistic_regression_shader.hpp
NAMESPACE "kp")
vulkan_compile_shader(INFILE test_op_custom_shader.comp
OUTFILE test_op_custom_shader.hpp
NAMESPACE "kp")
OUTFILE test_op_custom_shader.hpp
NAMESPACE "kp")
vulkan_compile_shader(INFILE test_workgroup_shader.comp
OUTFILE test_workgroup_shader.hpp
NAMESPACE "kp")
OUTFILE test_workgroup_shader.hpp
NAMESPACE "kp")
vulkan_compile_shader(INFILE test_shader.comp
OUTFILE test_shader.hpp
NAMESPACE "kp")
OUTFILE test_shader.hpp
NAMESPACE "kp")
add_library(test_shaders_glsl INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/test_logistic_regression_shader.hpp"
"${CMAKE_CURRENT_BINARY_DIR}/test_op_custom_shader.hpp"
"${CMAKE_CURRENT_BINARY_DIR}/test_workgroup_shader.hpp"
"${CMAKE_CURRENT_BINARY_DIR}/test_shader.hpp")
"${CMAKE_CURRENT_BINARY_DIR}/test_op_custom_shader.hpp"
"${CMAKE_CURRENT_BINARY_DIR}/test_workgroup_shader.hpp"
"${CMAKE_CURRENT_BINARY_DIR}/test_shader.hpp")
target_include_directories(test_shaders_glsl INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)