Compatibiliy with upstream vllm-project/vllm repository

.github/workflows/test-spyre.yml

@@ -13,16 +13,16 @@ jobs:
       run: |
         docker run -i --rm --entrypoint /bin/bash vllm-spyre -c '''
           pip install pytest sentence-transformers && \
-          python3.12 -c "from transformers import pipeline; pipeline(\"text-generation\", model=\"JackFram/llama-160m\")" && \
+          python -c "from transformers import pipeline; pipeline(\"text-generation\", model=\"JackFram/llama-160m\")" && \
           export VARIANT=$(ls /root/.cache/huggingface/hub/models--JackFram--llama-160m/snapshots/) && \
           mkdir -p /models && \
           ln -s /root/.cache/huggingface/hub/models--JackFram--llama-160m/snapshots/${VARIANT} /models/llama-194m && \
-          python3.12 -c "from sentence_transformers import SentenceTransformer; SentenceTransformer(\"sentence-transformers/all-roberta-large-v1\")" && \
+          python -c "from sentence_transformers import SentenceTransformer; SentenceTransformer(\"sentence-transformers/all-roberta-large-v1\")" && \
           export VARIANT=$(ls /root/.cache/huggingface/hub/models--sentence-transformers--all-roberta-large-v1/snapshots/) && \
           ln -s /root/.cache/huggingface/hub/models--sentence-transformers--all-roberta-large-v1/snapshots/${VARIANT} /models/all-roberta-large-v1 && \
           export MASTER_PORT=12355 && \
           export MASTER_ADDR=localhost && \
           export DISTRIBUTED_STRATEGY_IGNORE_MODULES=WordEmbedding && \
           cd vllm-spyre && \
-          python3.12 -m pytest tests -v
+          python -m pytest tests -v
         '''

Dockerfile.spyre

@@ -12,17 +12,14 @@ WORKDIR /workspace
 RUN microdnf update -y && microdnf install -y \
     python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip python${PYTHON_VERSION}-wheel git vim gcc g++ kmod\
     && microdnf clean all
+RUN ln -sf $(which python${PYTHON_VERSION}) /usr/bin/python && \
+    ln -sf $(which pip${PYTHON_VERSION}) /usr/bin/pip
 
 # Download and install vllm ###########################################################
-ENV VLLM_TARGET_DEVICE=empty
-RUN git clone -b sop-plugin-refactoring --single-branch https://github.com/IBM/vllm.git \
-    && cd vllm \
-    && python3.12 -m pip install --upgrade pip \
-    && pip install -r requirements-build.txt \
-    && pip install --no-build-isolation -v -e . \
-    && mkdir /workspace/vllm-spyre
+RUN pip install vllm==0.7.3
 
 # Install vllm Spyre plugin ##################################################################
+RUN mkdir /workspace/vllm-spyre
 COPY . /workspace/vllm-spyre
 RUN cd /workspace/vllm-spyre && pip install --no-build-isolation -v -e .
 ENV VLLM_PLUGINS=spyre

README.md

@@ -24,11 +24,7 @@ docker run -it --rm vllm-spyre bash
 
 ```
 # Install vllm
-git clone https://github.com/vllm-project/vllm.git
-cd vllm
-pip install -r requirements-build.txt
-export VLLM_TARGET_DEVICE=empty
-pip install --no-build-isolation -v -e .
+pip install vllm==0.7.3
 
 # Install vllm-spyre
 cd ..