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

Add to CMakeLists.txt

Browse source
This commit is contained in:
Thomas Antony 2023-03-13 23:10:22 -07:00
parent ebfc622197
commit 0995df5c9e
1 changed files with 38 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
CMakeLists.txt
View file

@ -45,6 +45,7 @@ endif()
if(APPLE AND NOT LLAMA_NO_ACCELERATE) if(APPLE AND NOT LLAMA_NO_ACCELERATE)
find_library(ACCELERATE_FRAMEWORK Accelerate) find_library(ACCELERATE_FRAMEWORK Accelerate)
if(ACCELERATE_FRAMEWORK) if(ACCELERATE_FRAMEWORK)
message(STATUS "Accelerate framework found") message(STATUS "Accelerate framework found")
@ -84,6 +85,7 @@ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES
message(STATUS "ARM detected") message(STATUS "ARM detected")
else() else()
message(STATUS "x86 detected") message(STATUS "x86 detected")
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX2") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX2")
@ -92,12 +94,15 @@ else()
if(NOT LLAMA_NO_AVX) if(NOT LLAMA_NO_AVX)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx")
endif() endif()
if(NOT LLAMA_NO_AVX2) if(NOT LLAMA_NO_AVX2)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
endif() endif()
if(NOT LLAMA_NO_FMA) if(NOT LLAMA_NO_FMA)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfma") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfma")
endif() endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mf16c") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mf16c")
endif() endif()
endif() endif()
@ -105,9 +110,9 @@ endif()
# if (LLAMA_PERF) # if (LLAMA_PERF)
# set(LLAMA_EXTRA_FLAGS ${LLAMA_EXTRA_FLAGS} -DGGML_PERF) # set(LLAMA_EXTRA_FLAGS ${LLAMA_EXTRA_FLAGS} -DGGML_PERF)
# endif() # endif()
add_executable(llama add_executable(llama
main.cpp main.cpp
llama.cpp
utils.cpp utils.cpp
utils.h) utils.h)
@ -116,6 +121,9 @@ add_executable(quantize
utils.cpp utils.cpp
utils.h) utils.h)
add_library(llamalib
llama.cpp)
add_library(ggml add_library(ggml
ggml.c ggml.c
ggml.h) ggml.h)
@ -125,7 +133,10 @@ target_compile_definitions(llama PUBLIC ${LLAMA_EXTRA_FLAGS})
target_compile_definitions(quantize PUBLIC ${LLAMA_EXTRA_FLAGS}) target_compile_definitions(quantize PUBLIC ${LLAMA_EXTRA_FLAGS})
target_link_libraries(ggml PRIVATE ${LLAMA_EXTRA_LIBS}) target_link_libraries(ggml PRIVATE ${LLAMA_EXTRA_LIBS})
target_link_libraries(llamalib PRIVATE ggml ${LLAMA_EXTRA_LIBS})
target_include_directories(ggml PUBLIC .) target_include_directories(ggml PUBLIC .)
target_link_libraries(quantize PRIVATE ggml)
target_link_libraries(llama PRIVATE ggml) target_link_libraries(quantize PRIVATE ggml llamalib)
target_link_libraries(llama PRIVATE ggml llamalib)
target_link_libraries(ggml PRIVATE Threads::Threads) target_link_libraries(ggml PRIVATE Threads::Threads)