more robust glslc checks, increase default denoise str

This commit is contained in:
Concedo 2025-04-22 15:19:47 +08:00
parent 16156f0d86
commit 6dbee2f2f8
3 changed files with 10 additions and 9 deletions

View file

@ -698,13 +698,14 @@ else
@echo 'Now rebuilding vulkan shaders for Linux...' @echo 'Now rebuilding vulkan shaders for Linux...'
@chmod +x vulkan-shaders-gen glslc-linux @chmod +x vulkan-shaders-gen glslc-linux
@echo 'Checking if bundled glslc-linux binary is usable...' @echo 'Checking if bundled glslc-linux binary is usable...'
@GLSLC_BIN=$$(if ./glslc-linux --version >/dev/null 2>&1; then \ @GLSLC_BIN=$$( \
echo "./glslc-linux"; \ if [ -x ./glslc-linux ] && ./glslc-linux --version 2>/dev/null | grep -q "glslang"; then \
elif command -v glslc >/dev/null 2>&1; then \ echo "./glslc-linux"; \
echo "glslc"; \ elif command -v glslc >/dev/null 2>&1; then \
else \ echo "glslc"; \
echo ""; \ else \
fi); \ echo ""; \
fi); \
if [ -z "$$GLSLC_BIN" ]; then \ if [ -z "$$GLSLC_BIN" ]; then \
echo "Error: No usable glslc found. Vulkan shaders cannot be compiled!"; \ echo "Error: No usable glslc found. Vulkan shaders cannot be compiled!"; \
else \ else \

File diff suppressed because one or more lines are too long

View file

@ -2117,7 +2117,7 @@ def transform_genparams(genparams, api_format):
# note: message string already contains the instruct start tag! # note: message string already contains the instruct start tag!
temp_poll = { temp_poll = {
"prompt": f"{messages_string}\n\nTool List:\n{tools_string}\n\n{custom_tools_prompt}{user_end}", "prompt": f"{messages_string}\n\nTool List:\n{tools_string}\n\n{custom_tools_prompt}{user_end}",
"max_length":4, "max_length":6,
"temperature":0.1, "temperature":0.1,
"top_k":1, "top_k":1,
"rep_pen":1, "rep_pen":1,