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

fix merge

Browse source
This commit is contained in:
netrunnereve 2023-11-02 22:01:17 -04:00
parent d104725a46
commit 4998f59e57
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -100,11 +100,6 @@ option(LLAMA_BUILD_TESTS "llama: build tests" ${LLAMA_STANDALO
option(LLAMA_BUILD_EXAMPLES "llama: build examples" ${LLAMA_STANDALONE}) option(LLAMA_BUILD_EXAMPLES "llama: build examples" ${LLAMA_STANDALONE})
option(LLAMA_BUILD_SERVER "llama: build server example" ON) option(LLAMA_BUILD_SERVER "llama: build server example" ON)
# instruction set detection for MSVC only
if (LLAMA_NATIVE)
include(cmake/FindSIMD.cmake)
endif ()
# #
# Build info header # Build info header
# #
@ -138,11 +133,6 @@ else()
message(WARNING "Git repository not found; to enable automatic generation of build info, make sure Git is installed and the project is a Git repository.") message(WARNING "Git repository not found; to enable automatic generation of build info, make sure Git is installed and the project is a Git repository.")
endif() endif()
if(LLAMA_NATIVE)
include(cmake/FindSIMD.cmake)
endif()
>>>>>>> 8a2a73102c8b7af446af0350282b65d7820fe4ac
# #
# Compile flags # Compile flags
# #
@ -524,6 +514,11 @@ if (NOT MSVC)
endif() endif()
endif() endif()
# instruction set detection for MSVC only
if (LLAMA_NATIVE)
include(cmake/FindSIMD.cmake)
endif ()
if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") OR ("${CMAKE_GENERATOR_PLATFORM_LWR}" MATCHES "arm64")) if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") OR ("${CMAKE_GENERATOR_PLATFORM_LWR}" MATCHES "arm64"))
message(STATUS "ARM detected") message(STATUS "ARM detected")
if (MSVC) if (MSVC)

2
cmake/FindSIMD.cmake
View file

@ -58,7 +58,7 @@ macro(check_sse type flags)
foreach(__FLAG ${flags}) foreach(__FLAG ${flags})
if(NOT ${type}_FOUND) if(NOT ${type}_FOUND)
set(CMAKE_REQUIRED_FLAGS ${__FLAG}) set(CMAKE_REQUIRED_FLAGS ${__FLAG})
CHECK_C_SOURCE_RUNS("${${type}_CODE}" HAS_${type}_${__FLAG_I}) check_c_source_runs("${${type}_CODE}" HAS_${type}_${__FLAG_I})
if(HAS_${type}_${__FLAG_I}) if(HAS_${type}_${__FLAG_I})
set(${type}_FOUND TRUE CACHE BOOL "${type} support") set(${type}_FOUND TRUE CACHE BOOL "${type} support")
set(${type}_FLAGS "${__FLAG}" CACHE STRING "${type} flags") set(${type}_FLAGS "${__FLAG}" CACHE STRING "${type} flags")