vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows build Fix

Browse source
This commit is contained in:
nusu-github 2023-03-20 16:37:00 +09:00 • committed by GitHub
parent 965d8fd3d8
commit 0e83240e0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
CMakeLists.txt
View file

@ -5,11 +5,9 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED true)
set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED true)
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
if (NOT XCODE AND NOT MSVC AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
@ -47,10 +45,6 @@ option(LLAMA_OPENBLAS "llama: use OpenBLAS"
# Compile flags
#
# OS specific
find_package(Threads REQUIRED)
set(THREADS_PREFER_PTHREAD_FLAG ON)
if (NOT MSVC)
if (LLAMA_SANITIZE_THREAD)
add_compile_options(-fsanitize=thread)
@ -122,7 +116,7 @@ if (LLAMA_ALL_WARNINGS)
endif()
if (LLAMA_LTO AND ${CMAKE_BUILD_TYPE} STREQUAL "Release")
if (LLAMA_LTO)
include(CheckIPOSupported)
check_ipo_supported(RESULT result OUTPUT output)
if (result)
@ -191,6 +185,10 @@ endif()
# Build library
#
add_executable(llama main.cpp)
add_executable(quantize quantize.cpp)
add_library(ggml OBJECT
ggml.c
ggml.h)
@ -199,12 +197,8 @@ add_library(utils OBJECT
utils.cpp
utils.h)
add_executable(llama main.cpp)
add_executable(quantize quantize.cpp)
target_link_libraries(ggml PUBLIC Threads::Threads)
target_link_libraries(ggml PRIVATE ${LLAMA_EXTRA_LIBS})
target_include_directories(ggml PUBLIC .)
target_link_libraries(llama ggml utils)
target_link_libraries(quantize ggml utils)
target_link_libraries(ggml PRIVATE Threads::Threads ${LLAMA_EXTRA_LIBS})
target_link_libraries(llama PRIVATE ggml utils)
target_link_libraries(quantize PRIVATE ggml utils)