Skip to content

Commit

Permalink
cleanup, try to add version tagging
Browse files Browse the repository at this point in the history
  • Loading branch information
LostRuins committed Nov 23, 2024
1 parent 1dd3793 commit afc575f
Show file tree
Hide file tree
Showing 141 changed files with 123 additions and 14,439 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/kcpp-build-release-osx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ jobs:
id: make_build
run: |
make LLAMA_METAL=1 LLAMA_PORTABLE=1
pyinstaller --noconfirm --onefile --collect-all customtkinter --collect-all psutil --add-data './koboldcpp_default.so:.' --add-data './ggml-metal-merged.metal:.' --add-data './kcpp_adapters:./kcpp_adapters' --add-data './klite.embd:.' --add-data './kcpp_docs.embd:.' --add-data './kcpp_sdui.embd:.' --add-data './taesd.embd:.' --add-data './taesd_xl.embd:.' --add-data './rwkv_vocab.embd:.' --add-data './rwkv_world_vocab.embd:.' --clean --console koboldcpp.py -n "koboldcpp-mac-arm64"
chmod +x './create_ver_file.sh'
. create_ver_file.sh
pyinstaller --noconfirm --onefile --collect-all customtkinter --collect-all psutil --add-data './koboldcpp_default.so:.' --add-data './ggml-metal-merged.metal:.' --add-data './kcpp_adapters:./kcpp_adapters' --add-data './klite.embd:.' --add-data './kcpp_docs.embd:.' --add-data './kcpp_sdui.embd:.' --add-data './taesd.embd:.' --add-data './taesd_xl.embd:.' --add-data './rwkv_vocab.embd:.' --add-data './rwkv_world_vocab.embd:.' --version-file './version.txt' --clean --console koboldcpp.py -n "koboldcpp-mac-arm64"
- name: Test
id: test
Expand Down
16 changes: 0 additions & 16 deletions cmake/arm64-apple-clang.cmake

This file was deleted.

33 changes: 33 additions & 0 deletions create_ver_file.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
@echo off
setlocal enabledelayedexpansion
echo Create Version File
:: Read the version string from koboldcpp.py
for /f "tokens=2 delims== " %%A in ('findstr "KcppVersion" koboldcpp.py') do (
set "version=%%~A"
goto :done
)

:done

:: Display the extracted version (optional, for debugging)
echo Extracted Version: %version%

for /f "tokens=1,2 delims=." %%a in ("%version%") do (
set version_major=%%a
set version_minor=%%b
)

echo Major Version: %version_major%
echo Minor Version: %version_minor%

:: Replace all instances of "MYVER" in foo.txt with the version
(
for /f "delims=" %%i in (version_template.txt) do (
set "line=%%i"
set "line=!line:MYVER_MAJOR=%version_major%!"
set "line=!line:MYVER_MINOR=%version_minor%!"
echo !line!
)
) > "version.txt"

endlocal
11 changes: 11 additions & 0 deletions create_ver_file.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash
echo "Create Version File"
extracted_ver=$(cat koboldcpp.py | grep 'KcppVersion = ' | cut -d '"' -f2)
echo "Extracted Version: $extracted_ver"
vmajor=$(echo $extracted_ver | cut -d '.' -f1)
vminor=$(echo $extracted_ver | cut -d '.' -f2)
echo "Major Version: $vmajor"
echo "Minor Version: $vminor"
cp version_template.txt version.txt
sed -i "s/MYVER_MAJOR/$vmajor/g" version.txt
sed -i "s/MYVER_MINOR/$vminor/g" version.txt
259 changes: 0 additions & 259 deletions docs/backend/CANN.md

This file was deleted.

50 changes: 0 additions & 50 deletions examples/Miku.sh

This file was deleted.

Loading

0 comments on commit afc575f

Please sign in to comment.