Skip to content

Commit 6dbee2f

Browse files
committed
more robust glslc checks, increase default denoise str
1 parent 16156f0 commit 6dbee2f

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -698,13 +698,14 @@ else
698698
@echo 'Now rebuilding vulkan shaders for Linux...'
699699
@chmod +x vulkan-shaders-gen glslc-linux
700700
@echo 'Checking if bundled glslc-linux binary is usable...'
701-
@GLSLC_BIN=$$(if ./glslc-linux --version >/dev/null 2>&1; then \
702-
echo "./glslc-linux"; \
703-
elif command -v glslc >/dev/null 2>&1; then \
704-
echo "glslc"; \
705-
else \
706-
echo ""; \
707-
fi); \
701+
@GLSLC_BIN=$$( \
702+
if [ -x ./glslc-linux ] && ./glslc-linux --version 2>/dev/null | grep -q "glslang"; then \
703+
echo "./glslc-linux"; \
704+
elif command -v glslc >/dev/null 2>&1; then \
705+
echo "glslc"; \
706+
else \
707+
echo ""; \
708+
fi); \
708709
if [ -z "$$GLSLC_BIN" ]; then \
709710
echo "Error: No usable glslc found. Vulkan shaders cannot be compiled!"; \
710711
else \

kcpp_sdui.embd

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

koboldcpp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2117,7 +2117,7 @@ def transform_genparams(genparams, api_format):
21172117
# note: message string already contains the instruct start tag!
21182118
temp_poll = {
21192119
"prompt": f"{messages_string}\n\nTool List:\n{tools_string}\n\n{custom_tools_prompt}{user_end}",
2120-
"max_length":4,
2120+
"max_length":6,
21212121
"temperature":0.1,
21222122
"top_k":1,
21232123
"rep_pen":1,

0 commit comments

Comments
 (0)