use llama.cpp server instead of llama-cpp-python

bin/llama-server.sh

@@ -1,19 +1,13 @@
 #!/bin/bash
 
-# pip uninstall llama-cpp-python -y
-# CMAKE_ARGS="-DLLAMA_METAL=on" FORCE_CMAKE=1 pip install -U llama-cpp-python --no-cache-dir
-# pip install 'llama-cpp-python[server]'
-
 # if conf does not exist, create it
 if [ ! -f "$HOME/.config/llama/llama-server.conf" ]; then
     mkdir -p "$HOME/.config/llama"
     cat <<EOF > "$HOME/.config/llama/llama-server.conf"
 LLAMA_MODEL_NAME=$HOME/.ai/models/llama/teknium/OpenHermes-2.5-Mistral-7B/openhermes-2.5-mistral-7b-f16.gguf
 LLAMA_CONTEXT_SIZE=8192
-
 LLAMA_PORT=8000
 LLAMA_LOG=$HOME/.local/var/llama-server.log
-PYTHON_EXEC=$HOME/.virtualenvs/llama.cpp/bin/python
 EOF
 fi
 
@@ -21,17 +15,17 @@ source "$HOME/.config/llama/llama-server.conf"
 
 # if arg1 is "stop" then pkill the koboldcpp.py server
 if [[ $# -eq 1 ]] && [[ $1 == "stop" ]]; then
-    echo "Stopping llama_cpp.server"
-    pkill -f "llama_cpp.server"
+    echo "Stopping llama server"
+    pkill -f "llama-server"
     echo "ok"
     exit
 fi
 
 # start server and pipe stdout+stderr to log file
-$PYTHON_EXEC -m llama_cpp.server \
+llama-server \
     --model "$LLAMA_MODEL_NAME" \
-    --n_ctx "$LLAMA_CONTEXT_SIZE" \
-    --n_gpu_layers 1 \
+    --ctx-size "$LLAMA_CONTEXT_SIZE" \
+    --n-gpu-layers 1 \
     --port "$LLAMA_PORT" \
     > "$LLAMA_LOG" 2>&1 &
-echo "Started llama-cpp-python server"
+echo "Started llama.cpp server"

bin/llama-update.sh

@@ -34,13 +34,7 @@ install -c -v bin/ggml-metal.metal "$BIN_PATH"
 install -c -v -m 755 bin/llava-cli "$BIN_PATH"/llava
 install -c -v -m 755 bin/finetune "$BIN_PATH/llama-finetune"
 install -c -v -m 755 bin/speculative "$BIN_PATH/llama-speculative"
-
-# configured for Metal
-CMAKE_ARGS="-DLLAMA_METAL=on" "$HOME/.virtualenvs/llama.cpp/bin/pip" install \
-    'llama-cpp-python[server]' \
-    --force-reinstall \
-    --upgrade \
-    --no-cache-dir
+install -c -v -m 755 bin/server "$BIN_PATH/llama-server"
 
 # if koboldcpp directory does not exist, clone it
 if [ ! -d "$KOBOLDCPP_GIT" ]; then