update

ling0322 · Mar 6, 2024 · 32b8e8e · 32b8e8e
1 parent 0950ef6
commit 32b8e8e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,11 +48,14 @@ if(UNIX)
     set(CMAKE_C_FLAGS "-O3 -g")
 endif(UNIX)
 
-if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+message("CMAKE_HOST_SYSTEM_PROCESSOR=" ${CMAKE_HOST_SYSTEM_PROCESSOR})
+
+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
     add_compile_definitions(LIBLLM_ARCH_X86_64)
-endif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
-if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+    set(LIBLLM_KERNEL_X86_64 ON)
+endif()
+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(aarch64)|(arm64)")
     add_compile_definitions(LIBLLM_ARCH_AARCH64)
-endif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+endif()
 
 add_subdirectory("src/libllm")
diff --git a/src/libllm/CMakeLists.txt b/src/libllm/CMakeLists.txt
@@ -142,7 +142,7 @@ if(UNIX AND NOT APPLE)
 endif()
 
 # CPU specific code
-if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+if(LIBLLM_KERNEL_X86_64)
     set(libllm_SOURCES
         ${libllm_SOURCES}
         "cpu/kernel/kernel_avx2.cc"
@@ -163,7 +163,7 @@ if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
             "cpu/kernel/kernel_avx2.cc"
             PROPERTIES COMPILE_FLAGS "-mavx2 -mfma -mf16c")
     endif(UNIX)
-endif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+endif()
 
 add_library(lut STATIC ${lut_SOURCES})
 set_target_properties(lut PROPERTIES CXX_VISIBILITY_PRESET hidden)