8000 MSVC instruction detection (fixed up #809) by netrunnereve · Pull Request #3923 · ggml-org/llama.cpp · GitHub
[go: up one dir, main page]
Skip to content

MSVC instruction detection (fixed up #809) #3923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Nov 5, 2023
Merged

MSVC instruction detection (fixed up #809) #3923

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5f50d15
Add detection code for avx
howard0su Apr 1, 2023
7adce4f
Only check hardware when option is ON
howard0su Apr 7, 2023
ac072d7
Modify per code review sugguestions
howard0su Apr 16, 2023
a8a22ff
Build locally will detect CPU
howard0su Jun 1, 2023
8a2a731
Fixes CMake style to use lowercase like everywhere else
JDunn3 Jun 15, 2023
51c99e4
merge in https://github.com/howard0su/llama.cpp/tree/cmake
netrunnereve Nov 3, 2023
b7ecd0a
cleanup
netrunnereve Nov 3, 2023
d104725
8000 pull in https://github.com/JDunn3/llama.cpp/tree/cmake
netrunnereve Nov 3, 2023
4998f59
fix merge
netrunnereve Nov 3, 2023
ec40b70
linux/gcc version for testing
netrunnereve Nov 3, 2023
3cc91b2
msvc combines avx2 and fma into /arch:AVX2 so check for both
netrunnereve Nov 3, 2023
5c5281b
cleanup
netrunnereve Nov 3, 2023
14aded6
msvc only version
netrunnereve Nov 3, 2023
447e50a
style
netrunnereve Nov 3, 2023
c3b0af4
Update FindSIMD.cmake
netrunnereve Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix merge
  • Loading branch information
@netrunnereve
netrunnereve committed Nov 3, 2023
commit 4998f59e579ed9c52d4d5853f85e4c26132563eb
15 changes: 5 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_SERVER "llama: build server example" ON)

# instruction set detection for MSVC only
if (LLAMA_NATIVE)
include(cmake/FindSIMD.cmake)
endif ()

#
# Build info header
#
Expand Down Expand Up @@ -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.")
endif()

if(LLAMA_NATIVE)
include(cmake/FindSIMD.cmake)
endif()
>>>>>>> 8a2a73102c8b7af446af0350282b65d7820fe4ac

#
# Compile flags
#
Expand Down Expand Up @@ -524,6 +514,11 @@ if (NOT MSVC)
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"))
message(STATUS "ARM detected")
if (MSVC)
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindSIMD.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ macro(check_sse type flags)
foreach(__FLAG ${flags})
if(NOT ${type}_FOUND)
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})
set(${type}_FOUND TRUE CACHE BOOL "${type} support")
set(${type}_FLAGS "${__FLAG}" CACHE STRING "${type} flags")
Expand Down
0