Merge remote-tracking branch 'origin/main'

mllm-streamlit.sh

@@ -72,6 +72,25 @@ then
     FIRST_RUN=1
 fi
 
+if [[ "$@" =~ --linux-install ]]
+then
+    apt install build-essential cmake openjdk-17-jre-headless curl
+
+    export CUDACXX="/usr/local/cuda-12/bin/nvcc"
+    export CMAKE_ARGS="-DGGML_CUDA=on -DCMAKE_CUDA_ARCHITECTURES=native"
+    export FORCE_CMAKE="1"
+
+    pip install llama-cpp-python --no-cache-dir --force-reinstall --upgrade
+
+    pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121
+
+    pip install streamlit
+    pip install streamlit_js_eval
+    pip install pyqt6 pyqt6-webengine
+
+    exit 0
+fi
+
 if [[ $FIRST_RUN -eq 1 ]]
 then
     pip install streamlit
@@ -131,9 +150,12 @@ CHILD_PIDS="${CHILD_PIDS} $!"
 ./${SCRIPT_NAME} --streamlit &
 CHILD_PIDS="${CHILD_PIDS} $!"
 
-export CHILD_PIDS
+if [[ ! "$@" =~ --headless ]]
+then
+    export CHILD_PIDS
 
-./${SCRIPT_NAME} --gui &
+    ./${SCRIPT_NAME} --gui &
-CHILD_PIDS="${CHILD_PIDS} $!"
+    CHILD_PIDS="${CHILD_PIDS} $!"
+fi
 
 wait ${CHILD_PIDS}