From 84eb924ea7f3e8cb137d6b10b212788e394acc14 Mon Sep 17 00:00:00 2001
From: sasha0552 <admin@sasha0552.org>
Date: Sat, 10 Aug 2024 12:52:06 +0000
Subject: [PATCH] [projects][vllm] Reenable vLLM

---
 .gitignore                                       |  1 +
 .../scripts/1000-vllm.sh.jinja2                  | 16 ++++++++++++++++
 .../scripts/1000-vllm.sh.jinja2.disabled         | 10 ----------
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2
 delete mode 100644 airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2.disabled

diff --git a/.gitignore b/.gitignore
index 81f769e..edba29b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ work/
 airootfs/root/customize_airootfs.sh
 airootfs/root/customize_airootfs/scripts/1000-automatic.sh
 airootfs/root/customize_airootfs/scripts/1000-comfyui.sh
+airootfs/root/customize_airootfs/scripts/1000-invokeai.sh
 airootfs/root/customize_airootfs/scripts/1000-llamacpp.sh
 airootfs/root/customize_airootfs/scripts/1000-sillytavern.sh
 airootfs/root/customize_airootfs/scripts/1000-vllm.sh
diff --git a/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2 b/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2
new file mode 100644
index 0000000..35ce2b2
--- /dev/null
+++ b/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -eu
+
+{% if platform == "cuda" %}
+# use patched vllm
+export PIP_EXTRA_INDEX_URL="https://sasha0552.github.io/pascal-pkgs-ci/"
+
+# install vllm
+pipx install vllm
+
+# remove triton
+pipx runpip vllm uninstall -y triton
+
+# install patched triton
+pipx runpip vllm install triton-pascal
+{% endif %}
diff --git a/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2.disabled b/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2.disabled
deleted file mode 100644
index 4c6cfbf..0000000
--- a/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2.disabled
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -eu
-
-{% if platform == "cuda" %}
-# use patched vllm
-export PIP_EXTRA_INDEX_URL="https://sasha0552.github.io/vllm-ci/"
-
-# install vllm
-pipx install vllm
-{% endif %}