Skip to content

修复MSVC 2017和GCC 8.x的CPU编译，clang编译 #694

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

Open
TylunasLi wants to merge 4 commits into
base: master
Choose a base branch
from
Open

修复MSVC 2017和GCC 8.x的CPU编译，clang编译 #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c16e6a0
修复GCC 8.x和VS 2017下的编译
TylunasLi Jan 29, 2026
83d10bd
修复v0.1.5.1在VS 2015下的编译
TylunasLi Jan 29, 2026
9c98f23
修复Win32Demo CPU编译
TylunasLi May 30, 2026
d98f434
修复clang编译
TylunasLi Jun 10, 2026
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
30 changes: 30 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,36 @@ string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+$" "\\1" CXX_MAJOR_VERSION "${C

if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread --std=c++17 -O2")
if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -mavx2 -mfma -mf16c")
set_source_files_properties(
"src/devices/cpu/avx512f.cpp"
PROPERTIES
COMPILE_OPTIONS "-mavx512f;-mavx512bw;-mavx512vl"
)
set_source_files_properties(
"src/devices/cpu/avx512vnni.cpp"
PROPERTIES
COMPILE_OPTIONS "-mavx512vnni;-mavx512f"
)
if (CXX_MAJOR_VERSION GREATER_EQUAL 10)
set_source_files_properties(
"src/devices/cpu/avx512bf16.cpp"
PROPERTIES
COMPILE_OPTIONS "-mavx512bf16;-mavx512f;-mavx512bw;-mavx512vl"
)
endif()
set(AMX_COMPILE_OPTIONS "-mavx512bf16;-mavx512f;-mavx512bw;-mavx512vl")
if (CXX_MAJOR_VERSION GREATER_EQUAL 11)
list(APPEND AMX_COMPILE_OPTIONS "-mamx-tile" "-mamx-bf16")
message(STATUS "AMX support enabled (clang >= 11)")
endif()
set_source_files_properties(
"src/devices/cpu/amx.cpp"
PROPERTIES
COMPILE_OPTIONS "${AMX_COMPILE_OPTIONS}"
)
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
string(REPLACE "/Ob2" "/Ob1 /Gy" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX /std:c++17 /arch:AVX2 /source-charset:utf-8")
Expand Down
8 changes: 4 additions & 4 deletions example/Win32Demo/Win32Demo.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalOptions>/arch:AVX /source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\blocks;$(ProjectDir)..\..\third_party\json11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -123,7 +123,7 @@
<ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalOptions>/arch:AVX /source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\blocks;$(ProjectDir)..\..\third_party\json11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -143,7 +143,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\blocks;$(ProjectDir)..\..\third_party\json11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -165,7 +165,7 @@
<PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;__AVX__;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\json11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\blocks;$(ProjectDir)..\..\third_party\json11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down
26 changes: 22 additions & 4 deletions example/Win32Demo/fastllm-gpu.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>NOMINMAX;USE_CUDA;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\devices;$(ProjectDir)..\..\include\devices\cpu;$(ProjectDir)..\..\include\devices\cuda;$(ProjectDir)..\..\include\devices\multicuda;$(ProjectDir)..\..\include\models;$(ProjectDir)..\..\include\utils;$(ProjectDir)..\..\third_party\json11;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\devices;$(ProjectDir)..\..\include\devices\cpu;$(ProjectDir)..\..\include\devices\cuda;$(ProjectDir)..\..\include\devices\multicuda;$(ProjectDir)..\..\include\models;$(ProjectDir)..\..\include\utils;$(ProjectDir)..\..\third_party\gguf;$(ProjectDir)..\..\third_party\json11;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand All @@ -120,7 +120,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>NOMINMAX;USE_CUDA;WIN64;__AVX__;__AVX2__;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\devices;$(ProjectDir)..\..\include\devices\cpu;$(ProjectDir)..\..\include\devices\cuda;$(ProjectDir)..\..\include\devices\multicuda;$(ProjectDir)..\..\include\models;$(ProjectDir)..\..\include\utils;$(ProjectDir)..\..\third_party\json11;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\devices;$(ProjectDir)..\..\include\devices\cpu;$(ProjectDir)..\..\include\devices\cuda;$(ProjectDir)..\..\include\devices\multicuda;$(ProjectDir)..\..\include\models;$(ProjectDir)..\..\include\utils;$(ProjectDir)..\..\third_party\gguf;$(ProjectDir)..\..\third_party\json11;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
Expand All @@ -146,7 +146,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NOMINMAX;USE_CUDA;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\devices;$(ProjectDir)..\..\include\devices\cpu;$(ProjectDir)..\..\include\devices\cuda;$(ProjectDir)..\..\include\devices\multicuda;$(ProjectDir)..\..\include\models;$(ProjectDir)..\..\include\utils;$(ProjectDir)..\..\third_party\json11;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\devices;$(ProjectDir)..\..\include\devices\cpu;$(ProjectDir)..\..\include\devices\cuda;$(ProjectDir)..\..\include\devices\multicuda;$(ProjectDir)..\..\include\models;$(ProjectDir)..\..\include\utils;$(ProjectDir)..\..\third_party\gguf;$(ProjectDir)..\..\third_party\json11;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
Expand All @@ -173,7 +173,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NOMINMAX;USE_CUDA;__AVX__;__AVX2__;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\devices;$(ProjectDir)..\..\include\devices\cpu;$(ProjectDir)..\..\include\devices\cuda;$(ProjectDir)..\..\include\devices\multicuda;$(ProjectDir)..\..\include\models;$(ProjectDir)..\..\include\utils;$(ProjectDir)..\..\third_party\json11;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\devices;$(ProjectDir)..\..\include\devices\cpu;$(ProjectDir)..\..\include\devices\cuda;$(ProjectDir)..\..\include\devices\multicuda;$(ProjectDir)..\..\include\models;$(ProjectDir)..\..\include\utils;$(ProjectDir)..\..\third_party\gguf;$(ProjectDir)..\..\third_party\json11;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
Expand Down Expand Up @@ -213,6 +213,8 @@
<ClInclude Include="..\..\include\models\ernie4_5.h" />
<ClInclude Include="..\..\include\models\factoryllm.h" />
<ClInclude Include="..\..\include\models\glm.h" />
<ClInclude Include="..\..\include\models\glm4_moe.h" />
<ClInclude Include="..\..\include\models\gpt_oss.h" />
<ClInclude Include="..\..\include\models\graphllm.h" />
<ClInclude Include="..\..\include\models\hunyuan.h" />
<ClInclude Include="..\..\include\models\internlm2.h" />
Expand All @@ -227,15 +229,20 @@
<ClInclude Include="..\..\include\models\qwen.h" />
<ClInclude Include="..\..\include\models\qwen3.h" />
<ClInclude Include="..\..\include\models\qwen3_moe.h" />
<ClInclude Include="..\..\include\models\qwen3_next.h" />
<ClInclude Include="..\..\include\models\xlmroberta.h" />
<ClInclude Include="..\..\include\template.h" />
<ClInclude Include="..\..\include\utils\armMath.h" />
<ClInclude Include="..\..\include\utils\utils.h" />
<ClInclude Include="..\..\third_party\gguf\gguf.h" />
<ClInclude Include="..\..\third_party\json11\json11.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\device.cpp" />
<ClCompile Include="..\..\src\devices\cpu\amx.cpp" />
<ClCompile Include="..\..\src\devices\cpu\avx2.cpp" />
<ClCompile Include="..\..\src\devices\cpu\avx512bf16.cpp" />
<ClCompile Include="..\..\src\devices\cpu\avx512f.cpp" />
<ClCompile Include="..\..\src\devices\cpu\avx512vnni.cpp" />
<ClCompile Include="..\..\src\devices\cpu\cpudevice.cpp" />
<ClCompile Include="..\..\src\devices\cpu\cpudevicebatch.cpp" />
Expand All @@ -254,6 +261,8 @@
<ClCompile Include="..\..\src\models\deepseekv2.cpp" />
<ClCompile Include="..\..\src\models\ernie4_5.cpp" />
<ClCompile Include="..\..\src\models\glm.cpp" />
<ClCompile Include="..\..\src\models\glm4_moe.cpp" />
<ClCompile Include="..\..\src\models\gpt_oss.cpp" />
<ClCompile Include="..\..\src\models\graphllm.cpp" />
<ClCompile Include="..\..\src\models\graph\fastllmjson.cpp" />
<ClCompile Include="..\..\src\models\graph\gemma2.cpp" />
Expand All @@ -272,9 +281,15 @@
<ClCompile Include="..\..\src\models\qwen.cpp" />
<ClCompile Include="..\..\src\models\qwen3.cpp" />
<ClCompile Include="..\..\src\models\qwen3_moe.cpp" />
<ClCompile Include="..\..\src\models\qwen3_next.cpp" />
<ClCompile Include="..\..\src\models\xlmroberta.cpp" />
<ClCompile Include="..\..\src\template.cpp" />
<ClCompile Include="..\..\src\tokenizer.cpp" />
<ClCompile Include="..\..\third_party\gguf\gguf-adapter.cpp" />
<ClCompile Include="..\..\third_party\gguf\ggml-dequantize.cpp" />
<ClCompile Include="..\..\third_party\gguf\ggml-iqk.cpp" />
<ClCompile Include="..\..\third_party\gguf\ggml-quant.cpp" />
<ClCompile Include="..\..\third_party\gguf\gguf.cpp" />
<ClCompile Include="..\..\third_party\json11\json11.cpp" />
</ItemGroup>
<ItemGroup>
Expand All @@ -287,6 +302,9 @@
<CudaCompile Include="..\..\src\devices\cuda\fastllm-cuda.cu">
<FileType>Document</FileType>
</CudaCompile>
<CudaCompile Include="..\..\src\devices\cuda\fastllm-ggml-cuda.cu">
<FileType>Document</FileType>
</CudaCompile>
<CudaCompile Include="..\..\src\devices\multicuda\fastllm-multicuda.cu">
<FileType>Document</FileType>
</CudaCompile>
Expand Down
48 changes: 48 additions & 0 deletions example/Win32Demo/fastllm-gpu.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
<ClInclude Include="..\..\include\models\glm.h">
<Filter>头文件\models</Filter>
</ClInclude>
<ClInclude Include="..\..\include\models\glm4_moe.h">
<Filter>头文件\models</Filter>
</ClInclude>
<ClInclude Include="..\..\include\models\gpt_oss.h">
<Filter>头文件\models</Filter>
</ClInclude>
<ClInclude Include="..\..\include\models\graphllm.h">
<Filter>头文件\models</Filter>
</ClInclude>
Expand Down Expand Up @@ -141,6 +147,9 @@
<ClInclude Include="..\..\include\models\qwen3_moe.h">
<Filter>头文件\models</Filter>
</ClInclude>
<ClInclude Include="..\..\include\models\qwen3_next.h">
<Filter>头文件\models</Filter>
</ClInclude>
<ClInclude Include="..\..\include\models\xlmroberta.h">
<Filter>头文件\models</Filter>
</ClInclude>
Expand Down Expand Up @@ -174,6 +183,9 @@
<ClInclude Include="..\..\include\devices\multicuda\fastllm-multicuda.cuh">
<Filter>头文件\devices\multicuda</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\gguf\gguf.h">
<Filter>头文件\third_party</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\json11\json11.hpp">
<Filter>头文件\third_party</Filter>
</ClInclude>
Expand Down Expand Up @@ -221,6 +233,12 @@
<ClCompile Include="..\..\src\models\glm.cpp">
<Filter>源文件\models</Filter>
</ClCompile>
<ClCompile Include="..\..\src\models\glm4_moe.cpp">
<Filter>源文件\models</Filter>
</ClCompile>
<ClCompile Include="..\..\src\models\gpt_oss.cpp">
<Filter>源文件\models</Filter>
</ClCompile>
<ClCompile Include="..\..\src\models\graphllm.cpp">
<Filter>源文件\models</Filter>
</ClCompile>
Expand Down Expand Up @@ -263,6 +281,9 @@
<ClCompile Include="..\..\src\models\qwen3_moe.cpp">
<Filter>源文件\models</Filter>
</ClCompile>
<ClCompile Include="..\..\src\models\qwen3_next.cpp">
<Filter>源文件\models</Filter>
</ClCompile>
<ClCompile Include="..\..\src\models\xlmroberta.cpp">
<Filter>源文件\models</Filter>
</ClCompile>
Expand All @@ -278,12 +299,21 @@
<ClCompile Include="..\..\src\models\graph\telechat.cpp">
<Filter>源文件\models\graph</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\cpu\amx.cpp">
<Filter>源文件\devices\cpu</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\cpu\avx2.cpp">
<Filter>源文件\devices\cpu</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\cpu\avx512bf16.cpp">
<Filter>源文件\devices\cpu</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\cpu\avx512vnni.cpp">
<Filter>源文件\devices\cpu</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\cpu\avx512f.cpp">
<Filter>源文件\devices\cpu</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\cpu\cpudevice.cpp">
<Filter>源文件\devices\cpu</Filter>
</ClCompile>
Expand All @@ -302,6 +332,21 @@
<ClCompile Include="..\..\src\devices\multicuda\multicudadevice.cpp">
<Filter>源文件\devices\multicuda</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\gguf\ggml-dequantize.cpp">
<Filter>源文件\third_party</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\gguf\ggml-iqk.cpp">
<Filter>源文件\third_party</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\gguf\ggml-quant.cpp">
<Filter>源文件\third_party</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\gguf\gguf.cpp">
<Filter>源文件\third_party</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\gguf\gguf-adapter.cpp">
<Filter>源文件\third_party</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\json11\json11.cpp">
<Filter>源文件\third_party</Filter>
</ClCompile>
Expand All @@ -313,5 +358,8 @@
<CudaCompile Include="..\..\src\devices\multicuda\fastllm-multicuda.cu">
<Filter>源文件\devices\multicuda</Filter>
</CudaCompile>
<CudaCompile Include="..\..\src\devices\cuda\fastllm-ggml-cuda.cu">
<Filter>源文件\devices\cuda</Filter>
</CudaCompile>
</ItemGroup>
</Project>
Loading