vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-12 18:09:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

try fix macos build again (+3 squashed commit)

Browse source 
Squashed commit:

[7d2a67132] fix ci builds

[f0a5f0a97] fixed a typo

[8736d9034] try fix ci builds (+1 squashed commits)

Squashed commits:

[c2ae5a542] Revert "updated ci"

This reverts commit d8ebdde6ee.
This commit is contained in:
Concedo 2024-11-21 18:56:59 +08:00
parent ac6a0cde91
commit dbbdb2eedc
6 changed files with 9 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/kcpp-build-release-win-cuda.yaml vendored
View file

@ -25,11 +25,7 @@ jobs:
mkdir build
cd build
cmake .. -DLLAMA_CUBLAS=ON -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
cmake --build . --config Release -j 2
else
cmake --build . --config Release -j 1
fi
cmake --build . --config Release -j 2
- name: Save artifact
uses: actions/upload-artifact@v3

6
.github/workflows/kcpp-build-release-win-cuda12.yaml vendored
View file

@ -25,11 +25,7 @@ jobs:
mkdir build
cd build
cmake .. -DLLAMA_CUBLAS=ON -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
cmake --build . --config Release -j 2
else
cmake --build . --config Release -j 1
fi
cmake --build . --config Release -j 2
- name: Save artifact
uses: actions/upload-artifact@v3

6
.github/workflows/kcpp-build-release-win-full-cu12.yaml vendored
View file

@ -58,11 +58,7 @@ jobs:
mkdir build
cd build
cmake .. -DLLAMA_CUBLAS=ON -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
cmake --build . --config Release -j 2
else
cmake --build . --config Release -j 1
fi
cmake --build . --config Release -j 2
mv bin/Release/koboldcpp_cublas.dll ../koboldcpp_cublas.dll
cd ..

6
.github/workflows/kcpp-build-release-win-full.yaml vendored
View file

@ -58,11 +58,7 @@ jobs:
mkdir build
cd build
cmake .. -DLLAMA_CUBLAS=ON -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
cmake --build . --config Release -j 2
else
cmake --build . --config Release -j 1
fi
cmake --build . --config Release -j 2
mv bin/Release/koboldcpp_cublas.dll ../koboldcpp_cublas.dll
cd ..

6
.github/workflows/kcpp-build-release-win-oldcpu-full.yaml vendored
View file

@ -58,11 +58,7 @@ jobs:
mkdir build
cd build
cmake .. -DLLAMA_CUBLAS=ON -DLLAMA_AVX2=OFF -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
cmake --build . --config Release -j 2
else
cmake --build . --config Release -j 1
fi
cmake --build . --config Release -j 2
mv bin/Release/koboldcpp_cublas.dll ../koboldcpp_cublas.dll
cd ..

7
Makefile
View file

@ -298,10 +298,11 @@ ifdef LLAMA_METAL
LDFLAGS += -framework Foundation -framework Metal -framework MetalKit -framework MetalPerformanceShaders
OBJS += ggml-metal.o
ggml-metal.o: ggml/src/ggml-metal/ggml-metal.m ggml/include/ggml-metal.h
ggml-metal.o: ggml/src/ggml-metal/ggml-metal.m ggml/src/ggml-metal/ggml-metal-impl.h ggml/include/ggml-metal.h
@echo "== Preparing merged Metal file =="
@sed -e '/#include "..\/ggml-common.h"/r ggml/src/ggml-common.h' -e '/#include "..\/ggml-common.h"/d' < ggml/src/ggml-metal/ggml-metal.metal > ggml/src/ggml-metal-merged.metal
@cp ggml/src/ggml-metal-merged.metal ./ggml-metal-merged.metal
@sed -e '/#include "..\/ggml-common.h"/r ggml/src/ggml-common.h' -e '/#include "..\/ggml-common.h"/d' < ggml/src/ggml-metal/ggml-metal.metal > ggml/src/ggml-metal/ggml-metal-embed.metal.tmp
@sed -e '/#include "ggml-metal-impl.h"/r ggml/src/ggml-metal/ggml-metal-impl.h' -e '/#include "ggml-metal-impl.h"/d' < ggml/src/ggml-metal/ggml-metal-embed.metal.tmp > ggml/src/ggml-metal/ggml-metal-merged.metal
@cp ggml/src/ggml-metal/ggml-metal-merged.metal ./ggml-metal-merged.metal
$(CC) $(CFLAGS) -c $< -o $@
endif # LLAMA_METAL