Skip to content

Commit 6ae2609

Browse files
authored
fix: temporarily pin to a working llama.cpp release
1 parent a80b4f7 commit 6ae2609

File tree

2 files changed

+38
-45
lines changed

2 files changed

+38
-45
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ jobs:
2323
- name: Download latest llama.cpp release
2424
env:
2525
CI: true
26-
run: node ./dist/cli/cli.js source download --release latest --skipBuild --noBundle --noUsageExample --updateBinariesReleaseMetadataAndSaveGitBundle
26+
# pinned to `b4357` temporarily until the Windows on Arm64 build is fixed
27+
run: node ./dist/cli/cli.js source download --release b4357 --skipBuild --noBundle --noUsageExample --updateBinariesReleaseMetadataAndSaveGitBundle
2728
- name: Upload build artifact
2829
uses: actions/upload-artifact@v4
2930
with:
Lines changed: 36 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,41 @@
11
set(CMAKE_SYSTEM_NAME Windows)
2-
set(CMAKE_SYSTEM_PROCESSOR arm64)
2+
set(CMAKE_SYSTEM_PROCESSOR ARM64)
33

4-
set(target arm64-pc-windows-msvc)
4+
# Look for cl.exe in the Visual Studio installation directories
5+
set(PROGRAMFILES "$ENV{ProgramFiles}")
6+
set(PROGRAMFILES_X86 "$ENV{ProgramFiles\(x86\)}")
57

6-
set(CMAKE_C_COMPILER clang)
7-
set(CMAKE_CXX_COMPILER clang++)
8+
set(VS_INSTALL_PATHS
9+
"${PROGRAMFILES_X86}/Microsoft Visual Studio"
10+
"${PROGRAMFILES}/Microsoft Visual Studio"
11+
"C:/Program Files (x86)/Microsoft Visual Studio"
12+
"C:/Program Files/Microsoft Visual Studio"
13+
)
14+
foreach(PATH IN LISTS VS_INSTALL_PATHS)
15+
if(CL_EXE_PATH)
16+
break()
17+
endif()
818

9-
set(CMAKE_C_COMPILER_TARGET ${target})
10-
set(CMAKE_CXX_COMPILER_TARGET ${target})
19+
file(GLOB_RECURSE FOUND_CL_EXE "${PATH}/*/VC/Tools/MSVC/*/bin/Hostx64/arm64/cl.exe")
20+
if(FOUND_CL_EXE)
21+
list(GET FOUND_CL_EXE 0 CL_EXE_PATH)
22+
break()
23+
endif()
1124

12-
# Look for cl.exe in the Visual Studio installation directories
13-
# set(PROGRAMFILES "$ENV{ProgramFiles}")
14-
# set(PROGRAMFILES_X86 "$ENV{ProgramFiles\(x86\)}")
15-
#
16-
# set(VS_INSTALL_PATHS
17-
# "${PROGRAMFILES_X86}/Microsoft Visual Studio"
18-
# "${PROGRAMFILES}/Microsoft Visual Studio"
19-
# "C:/Program Files (x86)/Microsoft Visual Studio"
20-
# "C:/Program Files/Microsoft Visual Studio"
21-
# )
22-
# foreach(PATH IN LISTS VS_INSTALL_PATHS)
23-
# if(CL_EXE_PATH)
24-
# break()
25-
# endif()
26-
#
27-
# file(GLOB_RECURSE FOUND_CL_EXE "${PATH}/*/VC/Tools/MSVC/*/bin/Hostx64/arm64/cl.exe")
28-
# if(FOUND_CL_EXE)
29-
# list(GET FOUND_CL_EXE 0 CL_EXE_PATH)
30-
# break()
31-
# endif()
32-
#
33-
# if(CL_EXE_PATH)
34-
# break()
35-
# endif()
36-
#
37-
# file(GLOB_RECURSE FOUND_CL_EXE "${PATH}/**/*/VC/Tools/MSVC/*/bin/Hostx64/arm64/cl.exe")
38-
# if(FOUND_CL_EXE)
39-
# list(GET FOUND_CL_EXE 0 CL_EXE_PATH)
40-
# break()
41-
# endif()
42-
# endforeach()
43-
#
44-
# if(NOT CL_EXE_PATH)
45-
# message(FATAL_ERROR "cl.exe not found for ARM architecture.")
46-
# else()
47-
# set(CMAKE_C_COMPILER "${CL_EXE_PATH}")
48-
# set(CMAKE_CXX_COMPILER "${CL_EXE_PATH}")
49-
# endif()
25+
if(CL_EXE_PATH)
26+
break()
27+
endif()
28+
29+
file(GLOB_RECURSE FOUND_CL_EXE "${PATH}/**/*/VC/Tools/MSVC/*/bin/Hostx64/arm64/cl.exe")
30+
if(FOUND_CL_EXE)
31+
list(GET FOUND_CL_EXE 0 CL_EXE_PATH)
32+
break()
33+
endif()
34+
endforeach()
35+
36+
if(NOT CL_EXE_PATH)
37+
message(FATAL_ERROR "cl.exe not found for ARM architecture.")
38+
else()
39+
set(CMAKE_C_COMPILER "${CL_EXE_PATH}")
40+
set(CMAKE_CXX_COMPILER "${CL_EXE_PATH}")
41+
endif()

0 commit comments

Comments
 (0)