Refactor venv activation, rewrite vllm building

sasha0552 · Dec 24, 2023 · 253c40c · 253c40c
1 parent 19dec98
commit 253c40c
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 34 deletions.
diff --git a/airootfs/root/customize_airootfs/scripts/1000-automatic-dependencies.sh b/airootfs/root/customize_airootfs/scripts/1000-automatic-dependencies.sh
@@ -3,15 +3,15 @@ set -eu
 
 # automatic dependencies
 pushd "automatic"
+  # disable package caching
+  export PIP_NO_CACHE_DIR=0
+
   # create venv
   python3 -m venv venv
 
   # activate venv
   source venv/bin/activate
-
-  # disable package caching
-  export PIP_NO_CACHE_DIR=0
-
-  # install dependencies
-  python3 launch.py --test
+    # install dependencies
+    python3 launch.py --test
+  source venv/bin/deactivate
 popd
diff --git a/airootfs/root/customize_airootfs/scripts/1000-sillytavern-extras-dependencies.sh b/airootfs/root/customize_airootfs/scripts/1000-sillytavern-extras-dependencies.sh
@@ -3,17 +3,17 @@ set -eu
 
 # SillyTavern-Extras dependencies
 pushd "SillyTavern-Extras"
+  # disable package caching
+  export PIP_NO_CACHE_DIR=0
+
   # create venv
   python3 -m venv venv
 
   # activate venv
   source venv/bin/activate
-
-  # disable package caching
-  export PIP_NO_CACHE_DIR=0
-
-  # install dependencies
-  pip3 install -r requirements.txt
-  pip3 install -r requirements-coqui.txt
-  pip3 install -r requirements-rvc.txt
+    # install dependencies
+    pip3 install -r requirements.txt
+    pip3 install -r requirements-coqui.txt
+    pip3 install -r requirements-rvc.txt
+  source venv/bin/deactivate
 popd
diff --git a/airootfs/root/customize_airootfs/scripts/1000-stable-diffusion-webui-dependencies.sh b/airootfs/root/customize_airootfs/scripts/1000-stable-diffusion-webui-dependencies.sh
@@ -3,15 +3,15 @@ set -eu
 
 # stable-diffusion-webui dependencies
 pushd "stable-diffusion-webui"
+  # disable package caching
+  export PIP_NO_CACHE_DIR=0
+
   # create venv
   python3 -m venv venv
 
   # activate venv
   source venv/bin/activate
-
-  # disable package caching
-  export PIP_NO_CACHE_DIR=0
-
-  # install dependencies
-  pip3 install -r requirements.txt
+    # install dependencies
+    pip3 install -r requirements.txt
+  source venv/bin/deactivate
 popd
diff --git a/airootfs/root/customize_airootfs/scripts/1000-text-generation-webui-dependencies.sh b/airootfs/root/customize_airootfs/scripts/1000-text-generation-webui-dependencies.sh
@@ -3,15 +3,15 @@ set -eu
 
 # text-generation-webui dependencies
 pushd "text-generation-webui"
+  # disable package caching
+  export PIP_NO_CACHE_DIR=0
+
   # create venv
   python3 -m venv venv
 
   # activate venv
   source venv/bin/activate
-
-  # disable package caching
-  export PIP_NO_CACHE_DIR=0
-
-  # install dependencies
-  pip3 install -r requirements.txt
+    # install dependencies
+    pip3 install -r requirements.txt
+  source venv/bin/deactivate
 popd
diff --git a/airootfs/root/customize_airootfs/scripts/1000-vllm-dependencies.sh b/airootfs/root/customize_airootfs/scripts/1000-vllm-dependencies.sh
@@ -3,12 +3,6 @@ set -eu
 
 # vllm dependencies
 pushd "vllm"
-  # create venv
-  python3 -m venv venv
-
-  # activate venv
-  source venv/bin/activate
-
   # disable package caching
   export PIP_NO_CACHE_DIR=0
 
@@ -25,6 +19,28 @@ pushd "vllm"
   export CC=gcc-12
   export CXX=g++-12
 
-  # install dependencies
-  pip3 install -e .
+  # create venv
+  python3 -m venv venv
+
+  # activate venv
+  source venv/bin/activate
+    # install dependencies
+    pip3 install -r requirements.txt
+    pip3 install -r requirements-build.txt
+
+    # build native extension
+    python3 setup.py build_ext --inplace
+  source venv/bin/deactivate
+
+  # remove venv
+  rm -fr venv
+
+  # create venv
+  python3 -m venv venv
+
+  # activate venv
+  source venv/bin/activate
+    # install dependencies
+    pip3 install -r requirements.txt
+  source venv/bin/deactivate
 popd