revert all tk experiments

This commit is contained in:
Concedo 2025-12-21 21:10:36 +08:00
parent 80a0269dbe
commit b51e3592ba
4 changed files with 1 additions and 31 deletions

View file

@ -13,7 +13,6 @@ env:
NOAVX1: 1
ARCHES_CU11: 1
KCPP_CUDA: 11.5.0
TRANSPLANT_TK: 1
jobs:
linux:

View file

@ -12,7 +12,6 @@ env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
KCPP_CUDA: 12.1.0
ARCHES_CU12: 1
TRANSPLANT_TK: 1
jobs:
linux:

View file

@ -19,7 +19,7 @@ dependencies:
- libcblas
- ocl-icd-system
- libvulkan-loader
- tk
- tk=*=xft_*
- psutil
- jinja2
- pip:

View file

@ -27,34 +27,6 @@ fi
KCPP_CUDA=$(<conda/envs/linux/cudaver)
KCPP_CUDAAPPEND=-cuda${KCPP_CUDA//.}$KCPP_APPEND
if [ -n "$TRANSPLANT_TK" ]; then
echo Check system tk and python
python3 --version
ldd "/usr/lib/x86_64-linux-gnu/libtk8.6.so"
python3 - <<'EOF'
import tkinter
print("System TK version:", tkinter.Tcl().call("info", "patchlevel"))
EOF
echo Attempting to use a transplanted tkinter from ubuntu-24.04.3 to fix fontconfig issues
bin/micromamba run -r conda -p conda/envs/linux python - <<'EOF'
import tkinter
print("Before Tk version:", tkinter.Tcl().call("info", "patchlevel"))
EOF
ldd "conda/envs/linux/lib/libtk8.6.so"
rm -f "conda/envs/linux/lib/libtcl8.6.so"
rm -f "conda/envs/linux/lib/libtk8.6.so"
curl -L https://github.com/LostRuins/koboldcpp/releases/download/cuda11_cublas_libraries/libtcl8.6.so --output conda/envs/linux/lib/libtcl8.6.so
curl -L https://github.com/LostRuins/koboldcpp/releases/download/cuda11_cublas_libraries/libtk8.6.so --output conda/envs/linux/lib/libtk8.6.so
chmod 755 "conda/envs/linux/lib/libtcl8.6.so" "conda/envs/linux/lib/libtk8.6.so"
ls -lah conda/envs/linux/lib
bin/micromamba run -r conda -p conda/envs/linux python - <<'EOF'
import tkinter
print("After Tk version:", tkinter.Tcl().call("info", "patchlevel"))
EOF
ldd "conda/envs/linux/lib/libtk8.6.so"
echo Tkinter Transplant completed
fi
LLAMA_NOAVX1_FLAG=""
LLAMA_NOAVX2_FLAG=""
ARCHES_FLAG=""