map model name to template, map template to prefix/suffix

bin/llama-menu.sh

@@ -8,4 +8,4 @@ if [[ -z "$SELECTED" ]]; then
 fi
 
 echo "Selected: '$SELECTED'"
-llama.sh "$SELECTED" chatml 2048 0.8
+llama.sh "$SELECTED" 2048

bin/llama.sh

@@ -29,21 +29,21 @@ EOF
 
 function llama_interactive {
     # if 4 arguments are provided...
-    if [[ $# -eq 4 ]]; then
+    if [[ $# -eq 2 ]]; then
         LLAMA_MODEL_NAME=$1
-        LLAMA_TEMPLATE=$2
-        LLAMA_CONTEXT_SIZE=$3
-        LLAMA_TEMPERATURE=$4
+        LLAMA_CONTEXT_SIZE=$2
     fi
 
     # if fewer than 4 arguments - but greater than 0 - are provided, then display error message
-    if [[ $# -lt 4 ]] && [[ $# -gt 0 ]]; then
+    if [[ $# -lt 2 ]] && [[ $# -gt 0 ]]; then
         echo "Error: 4 arguments are required."
-        echo "Usage: llama <model_name> <template> <context_size> <temperature>"
-        echo "Example: llama teknium/OpenHermes-2.5-Mistral-7B/openhermes-2.5-mistral-7b-f16.gguf chatml 4096 0.1"
+        echo "Usage: llama <model_name> <context_size>"
+        echo "Example: llama teknium/OpenHermes-2.5-Mistral-7B/openhermes-2.5-mistral-7b-f16.gguf 4096"
         return
     fi
 
+    LLAMA_TEMPLATE=$(get_template_for_model $LLAMA_MODEL_NAME)
+
     llama \
         --n-gpu-layers 1 \
         --model "$LLAMA_MODELS_PATH/$LLAMA_MODEL_NAME" \
@@ -54,11 +54,11 @@ function llama_interactive {
         --reverse-prompt "$(get_model_prefix $LLAMA_TEMPLATE)" \
         --reverse-prompt "<|im_end|>" \
         --reverse-prompt "</s>" \
-        --threads "6" \
-        --temp "$LLAMA_TEMPERATURE" \
-        --top-p "$LLAMA_TOP_P" \
-        --top-k "$LLAMA_TOP_K" \
-        --min-p "$LLAMA_MIN_P" \
+        --threads 1 \
+        --temp 0 \
+        --top-p 1.0 \
+        --top-k 40 \
+        --min-p 0.5 \
         --repeat-penalty "$LLAMA_REPETITION_PENALTY" \
         --ctx-size "$LLAMA_CONTEXT_SIZE" \
         --batch-size 1024 \
@@ -69,28 +69,28 @@ function llama_interactive {
         --color \
         --escape \
         --log-disable
+
+        # --temp "$LLAMA_TEMPERATURE" \
+        # --top-p "$LLAMA_TOP_P" \
+        # --top-k "$LLAMA_TOP_K" \
+        # --min-p "$LLAMA_MIN_P" \
+
 }
 
 function get_model_prefix {
     case $1 in
-        chatml|*dolphin*)
+        chatml)
             printf "<|im_start|>user\\\n"
             ;;
-        *guanaco*)
-            printf "### Human: "
+        instruct)
+            printf "[INST] "
             ;;
-        *alpaca*|*upstage*|*airoboros*|*hermes*)
+        alpaca)
             printf "### Instruction: "
             ;;
-        *vicuna*|*wizardlm*|*samantha*|*scarlett*|*capybara*)
+        vicuna)
             printf "USER: "
             ;;
-        *based*|*yi*)
-            printf "Human: "
-            ;;
-        *orca*)
-            printf "### User: "
-            ;;
         *)
             printf "Input: "
             ;;
@@ -99,26 +99,40 @@ function get_model_prefix {
 
 function get_model_suffix {
     case $1 in
-        chatml|*dolphin*)
+        chatml)
             printf "<|im_end|>\n<|im_start|>assistant\\\n"
             ;;
-        *guanaco*)
-            printf "### Assistant:"
+        instruct)
+            printf " [/INST]"
             ;;
-        *alpaca*|*upstage*|*airoboros*|*hermes*)
+        alpaca)
             printf "### Response:"
             ;;
-        *vicuna*|*wizardlm*|*samantha*|*scarlett*|*capybara*)
+        vicuna)
             printf "ASSISTANT:"
             ;;
-        *based*|*yi*)
-            printf "Assistant:"
+        *)
+            printf "Output:"
             ;;
-        *orca*)
-            printf "### Response:"
+    esac
+}
+
+function get_template_for_model {
+    case $1 in
+        *dolphin*)
+            echo "chatml"
+            ;;
+        *mixtral-8x7b-instruct*)
+            echo "instruct"
+            ;;
+        *upstage*|*airoboros*|*hermes*)
+            echo "alpaca"
+            ;;
+        *wizardlm*|*samantha*|*scarlett*|*capybara*)
+            echo "vicuna"
             ;;
         *)
-            printf "Output:"
+            echo "chatml"
             ;;
     esac
 }