Skip to content

Commit 560720c

Browse files
committed
test1
1 parent 7fad4dc commit 560720c

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

.github/workflows/kcpp-build-release-linux-olderpc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
NOAVX1: 1
1414
ARCHES_CU11: 1
1515
KCPP_CUDA: 11.5.0
16+
TRANSPLANT_TK: 1
1617

1718
jobs:
1819
linux:

.github/workflows/kcpp-build-release-linux.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
1313
KCPP_CUDA: 12.1.0
1414
ARCHES_CU12: 1
15+
TRANSPLANT_TK: 1
1516

1617
jobs:
1718
linux:

environment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
- libcblas
2020
- ocl-icd-system
2121
- libvulkan-loader
22-
- tk=*=xft_*
22+
- tk
2323
- psutil
2424
- jinja2
2525
- pip:

koboldcpp.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,33 @@ fi
2727
KCPP_CUDA=$(<conda/envs/linux/cudaver)
2828
KCPP_CUDAAPPEND=-cuda${KCPP_CUDA//.}$KCPP_APPEND
2929

30+
if [ -n "$TRANSPLANT_TK" ]; then
31+
echo Check system tk and python
32+
python3 --version
33+
ldd "/usr/lib/x86_64-linux-gnu/libtk8.6.so"
34+
python3 - <<'EOF'
35+
import tkinter
36+
print("System TK version:", tkinter.Tcl().call("info", "patchlevel"))
37+
EOF
38+
echo Attempting to use a transplanted tkinter from ubuntu-24.04.3 to fix fontconfig issues
39+
bin/micromamba run -r conda -p conda/envs/linux python - <<'EOF'
40+
import tkinter
41+
print("Before Tk version:", tkinter.Tcl().call("info", "patchlevel"))
42+
EOF
43+
ldd "conda/envs/linux/lib/libtk8.6.so"
44+
rm -f "conda/envs/linux/lib/libtcl8.6.so"
45+
rm -f "conda/envs/linux/lib/libtk8.6.so"
46+
ln -s /usr/lib/x86_64-linux-gnu/libtk8.6.so conda/envs/linux/lib/libtk8.6.so
47+
ln -s /usr/lib/x86_64-linux-gnu/libtcl8.6.so conda/envs/linux/lib/libtcl8.6.so
48+
ls -lah conda/envs/linux/lib
49+
bin/micromamba run -r conda -p conda/envs/linux python - <<'EOF'
50+
import tkinter
51+
print("After Tk version:", tkinter.Tcl().call("info", "patchlevel"))
52+
EOF
53+
ldd "conda/envs/linux/lib/libtk8.6.so"
54+
echo Tkinter Transplant completed
55+
fi
56+
3057
LLAMA_NOAVX1_FLAG=""
3158
LLAMA_NOAVX2_FLAG=""
3259
ARCHES_FLAG=""

0 commit comments

Comments
 (0)