sync with IBM/main

[dtrifiro]

sync with IBM/vllm@4c758aa2

[dtrifiro]

@z103cb here's the current diff with IBM/main

diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index 452b3fa0..48e87808 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -116,7 +116,7 @@ RUN ldconfig /usr/local/cuda-12.2/compat/
 ## Python cuda base #################################################################
 FROM cuda-devel as python-cuda-base
 
-COPY --from=python-install --link /opt/vllm /opt/vllm
+COPY --from=python-install /opt/vllm /opt/vllm
 ENV PATH=/opt/vllm/bin/:$PATH
 
 # install cuda and common dependencies
@@ -206,16 +206,16 @@ ENV PATH=/usr/local/cuda/bin:$PATH
 ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH
 
 # Copy the entire directory before building wheel
-COPY --link vllm vllm
+COPY vllm vllm
 
 # Comment if building *.so files from scratch
 ##################################################
 # Copy the prebuilt *.so files
-COPY --from=prebuilt-wheel --link /workspace/vllm/*.so /workspace/vllm/
+COPY --from=prebuilt-wheel /workspace/vllm/*.so /workspace/vllm/
 ##################################################
 
 # Copy over the generated *.pb2 files
-COPY --from=gen-protos --link /workspace/vllm/entrypoints/grpc/pb vllm/entrypoints/grpc/pb
+COPY --from=gen-protos /workspace/vllm/entrypoints/grpc/pb vllm/entrypoints/grpc/pb
 
 ENV CCACHE_DIR=/root/.cache/ccache
 RUN --mount=type=cache,target=/root/.cache/ccache \
@@ -251,7 +251,7 @@ FROM cuda-runtime AS vllm-openai
 WORKDIR /workspace
 
 # Create release python environment
-COPY --from=python-cuda-base --link /opt/vllm /opt/vllm
+COPY --from=python-cuda-base /opt/vllm /opt/vllm
 ENV PATH=/opt/vllm/bin/:$PATH
 
 # install vllm wheel first, so that torch etc will be installed
diff --git a/vllm/entrypoints/grpc/grpc_server.py b/vllm/entrypoints/grpc/grpc_server.py
index 15885fca..ebec0bbc 100644
--- a/vllm/entrypoints/grpc/grpc_server.py
+++ b/vllm/entrypoints/grpc/grpc_server.py
@@ -92,7 +92,6 @@ class TextGenerationService(generation_pb2_grpc.GenerationServiceServicer):
         self.engine: AsyncLLMEngine = engine
 
         # These set in _post_init()
-        self.tokenizer_group: BaseTokenizerGroup = None
         self.tokenizer: Union[PreTrainedTokenizer,
                               PreTrainedTokenizerFast] = None
         self.config: ModelConfig = None
@@ -101,9 +100,13 @@ class TextGenerationService(generation_pb2_grpc.GenerationServiceServicer):
         self.skip_special_tokens = not args.output_special_tokens
         self.default_include_stop_seqs = args.default_include_stop_seqs
 
+    @property
+    def tokenizer_group(self) -> BaseTokenizerGroup:
+        return self.engine.engine.tokenizer
+
+
     async def _post_init(self):
         self.config = await self.engine.get_model_config()
-        self.tokenizer_group = await self.engine.get_tokenizer_group()
         self.tokenizer = await self.engine.get_tokenizer()
 
         # Swap in the special TGIS stats logger

[z103cb]

/lgtm
/approved

[z103cb]

/approve

[z103cb]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dtrifiro, z103cb

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment