Refactor code according to upstream changes

.github/workflows/test-spyre.yml

@@ -1,14 +1,6 @@
 name: test-sypre
 
-on:
-  # Trigger the workflow on push or pull request,
-  # but only for the main branch
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+on: pull_request
 
 jobs:
   test-spyre:
@@ -20,10 +12,16 @@ jobs:
     - name: Run Spyre tests within docker container
       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\")" && \
           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 && \
-          pip install pytest sentence-transformers && \
+          python3.12 -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 && \
           python3.12 -m pytest tests/spyre -v
         '''

tests/spyre/test_spyre_embeddings.py

@@ -10,7 +10,6 @@
                         st_embeddings)
 
 
-@pytest.mark.skip("Skip until failure is resolved.")
 @pytest.mark.parametrize("model", ["/models/all-roberta-large-v1"])
 @pytest.mark.parametrize("prompts", [[
     "The capital of France is Paris."

tests/spyre/test_spyre_tensor_parallel.py

@@ -12,7 +12,6 @@
 from vllm import SamplingParams
 
 
-@pytest.mark.skip("Skip until failure is resolved.")
 @pytest.mark.parametrize("model", ["/models/llama-194m"])
 @pytest.mark.parametrize("prompts", [[
     "Provide a list of instructions for preparing"

vllm/__init__.py

@@ -34,6 +34,7 @@ def configure_as_vllm_process():
     # see https://github.com/vllm-project/vllm/issues/10480
     os.environ['TORCHINDUCTOR_COMPILE_THREADS'] = '1'
     # see https://github.com/vllm-project/vllm/issues/10619
+    import torch._inductor.config
     torch._inductor.config.compile_threads = 1
 
     from vllm.platforms import current_platform