From b2a89b455ee6996463bcdb7fafc3f3fea914d532 Mon Sep 17 00:00:00 2001
From: sasha0552 <admin@sasha0552.org>
Date: Wed, 16 Oct 2024 22:55:55 +0000
Subject: [PATCH] [misc] Remove sglang, flashinfer

---
 .gitignore                                    |  1 -
 .../scripts/1000-sglang.sh.jinja2             | 25 -------------------
 .../scripts/1000-vllm.sh.jinja2               |  3 ---
 .../2000-replace-nonpascal-pkgs.sh.jinja2     |  2 --
 packages.x86_64.jinja2                        |  5 ----
 5 files changed, 36 deletions(-)
 delete mode 100644 airootfs/root/customize_airootfs/scripts/1000-sglang.sh.jinja2

diff --git a/.gitignore b/.gitignore
index e138344..b57c652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ 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-sglang.sh
 airootfs/root/customize_airootfs/scripts/1000-sillytavern.sh
 airootfs/root/customize_airootfs/scripts/1000-vllm.sh
 airootfs/root/customize_airootfs/scripts/2000-replace-nonpascal-pkgs.sh
diff --git a/airootfs/root/customize_airootfs/scripts/1000-sglang.sh.jinja2 b/airootfs/root/customize_airootfs/scripts/1000-sglang.sh.jinja2
deleted file mode 100644
index cb4b383..0000000
--- a/airootfs/root/customize_airootfs/scripts/1000-sglang.sh.jinja2
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-set -eu
-
-{% if platform == "cuda" %}
-# clone repository
-git clone "{{ repositories.sglang }}.git"
-
-# sglang dependencies
-pushd "sglang"
-  # create venv
-  python3 -m venv venv
-
-  # activate venv
-  source venv/bin/activate
-    # use repo with patched packages
-    export PIP_EXTRA_INDEX_URL="https://sasha0552.github.io/pascal-pkgs-ci/"
-
-    # install dependencies
-    pip3 install -e "python[all]"
-
-    # install flashinfer
-    pip3 install flashinfer-pascal
-  deactivate
-popd
-{% endif %}
diff --git a/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2 b/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2
index b3ab517..ab5ee4e 100644
--- a/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2
+++ b/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2
@@ -7,7 +7,4 @@ export PIP_EXTRA_INDEX_URL="https://sasha0552.github.io/pascal-pkgs-ci/"
 
 # install patched vllm
 pipx install vllm-pascal
-
-# install flashinfer
-pipx inject vllm-pascal flashinfer-pascal
 {% endif %}
diff --git a/airootfs/root/customize_airootfs/scripts/2000-replace-nonpascal-pkgs.sh.jinja2 b/airootfs/root/customize_airootfs/scripts/2000-replace-nonpascal-pkgs.sh.jinja2
index 94b01c5..4198b3f 100644
--- a/airootfs/root/customize_airootfs/scripts/2000-replace-nonpascal-pkgs.sh.jinja2
+++ b/airootfs/root/customize_airootfs/scripts/2000-replace-nonpascal-pkgs.sh.jinja2
@@ -24,7 +24,5 @@ replace_package() {
 }
 
 # Replace packages
-replace_package flashinfer
 replace_package triton
-replace_package vllm
 {% endif %}
diff --git a/packages.x86_64.jinja2 b/packages.x86_64.jinja2
index 9eadac1..d9ded9e 100644
--- a/packages.x86_64.jinja2
+++ b/packages.x86_64.jinja2
@@ -22,7 +22,6 @@ mkinitcpio
 mkinitcpio-archiso
 mkinitcpio-nfs-utils
 nano
-nccl
 ncdu
 neofetch
 net-tools
@@ -31,7 +30,6 @@ nodejs
 npm
 ntfs-3g
 nvtop
-openmpi
 openssh
 progress
 pv
@@ -58,9 +56,6 @@ nvidia-utils
 {% if platform == "rocm" %}
 # ROCm
 rocm-hip-sdk
-
-# Required for SillyTavern-Extras
-gtk3
 {% endif %}
 
 {% if type == "gui" %}