diff --git a/environment-nocuda.yaml b/environment-nocuda.yaml index 2b1fbfeb6..57523f850 100644 --- a/environment-nocuda.yaml +++ b/environment-nocuda.yaml @@ -16,9 +16,7 @@ dependencies: - libcblas - ocl-icd-system - libvulkan-loader - - tk - - fontconfig - - freetype + - tk=*=xft_* - psutil - jinja2 - pip: diff --git a/environment.yaml b/environment.yaml index ef5861378..bcc904e25 100644 --- a/environment.yaml +++ b/environment.yaml @@ -19,9 +19,7 @@ dependencies: - libcblas - ocl-icd-system - libvulkan-loader - - tk - - fontconfig - - freetype + - tk=*=xft_* - psutil - jinja2 - pip: diff --git a/koboldcpp.sh b/koboldcpp.sh index 963e4ae8a..a40f6952b 100755 --- a/koboldcpp.sh +++ b/koboldcpp.sh @@ -24,7 +24,6 @@ if [[ ! -f "conda/envs/linux/bin/python" && $KCPP_CUDA == "rocm" || $1 == "rebui echo "rocm" > conda/envs/linux/cudaver fi -TK_ENV_VARS="FONTCONFIG_PATH=\$CONDA_PREFIX/etc/fonts" KCPP_CUDA=$(