fix cache path

bin/llama.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
-# if conf does not exist, create it
-if [ ! -f "$HOME/.config/llama/llama-main.conf" ]; then
-    mkdir -p "$HOME/.config/llama"
-    cat <<EOF > "$HOME/.config/llama/llama-main.conf"
+function llama_init_environment {
+    # if conf does not exist, create it
+    if [ ! -f "$HOME/.config/llama/llama-main.conf" ]; then
+        mkdir -p "$HOME/.config/llama"
+        cat <<EOF > "$HOME/.config/llama/llama-main.conf"
 LLAMA_TEMPERATURE=0.1
 LLAMA_CONTEXT_SIZE=4096
 LLAMA_REPETITION_PENALTY=1.15
@@ -13,13 +14,19 @@ LLAMA_TEMPLATE=chatml
 LLAMA_MODEL_NAME=teknium/OpenHermes-2.5-Mistral-7B/openhermes-2.5-mistral-7b-f16.gguf
 LLAMA_MODELS_PATH=$HOME/.ai/models/llama
 LLAMA_PROMPT_PATH=$HOME/.local/share/llama/prompts
-LLAMA_CACHE_PATH=$HOME/.local/share/llama/cache
+LLAMA_CACHE_PATH=$HOME/.cache/llama
 EOF
-fi
+    fi
 
-function llama_interactive {
     source $HOME/.config/llama/llama-main.conf
 
+    if [ ! -d "$LLAMA_CACHE_PATH" ]; then
+        mkdir -p "$LLAMA_CACHE_PATH"
+    fi
+
+}
+
+function llama_interactive {
     # if 4 arguments are provided...
     if [[ $# -eq 4 ]]; then
         LLAMA_MODEL_NAME=$1
@@ -39,7 +46,7 @@ function llama_interactive {
     llama \
         --n-gpu-layers 1 \
         --model "$LLAMA_MODELS_PATH/$LLAMA_MODEL_NAME" \
-        --prompt-cache "$LLAMA_CACHE_PATH/$LLAMA_MODEL_NAME" \
+        --prompt-cache "$LLAMA_CACHE_PATH/${LLAMA_MODEL_NAME//[\/\.]/-}-${LLAMA_CONTEXT_SIZE}.cache" \
         --file "$(get_model_prompt $LLAMA_MODEL_NAME)" \
         --in-prefix "$(get_model_prefix $LLAMA_TEMPLATE)" \
         --in-suffix "$(get_model_suffix $LLAMA_TEMPLATE)" \
@@ -57,7 +64,8 @@ function llama_interactive {
         --instruct \
         --no-mmap \
         --color \
-        --escape
+        --escape \
+        --log-disable
 }
 
 function get_model_prefix {
@@ -69,10 +77,10 @@ function get_model_prefix {
             printf "### Instruction: "
             ;;
         *vicuna*|*wizardlm*|*samantha*)
-            printf "USER:"
+            printf "USER: "
             ;;
         *based*|*yi*)
-            printf "Human:"
+            printf "Human: "
             ;;
         *orca*)
             printf "### User: "
@@ -95,10 +103,10 @@ function get_model_suffix {
             printf "### Response: "
             ;;
         *vicuna*|*wizardlm*|*samantha*)
-            printf "ASSISTANT:"
+            printf "ASSISTANT: "
             ;;
         *based*|*yi*)
-            printf "Assistant:"
+            printf "Assistant: "
             ;;
         *orca*)
             printf "### Response: "
@@ -135,4 +143,5 @@ function get_model_prompt {
     esac
 }
 
+llama_init_environment
 llama_interactive $*