Upgrade habana docker version to 1.18.0 (#854)

* Upgrade habana docker version to 1.18.0 Signed-off-by: lvliang-intel <liang1.lv@intel.com> * fix issues Signed-off-by: lvliang-intel <liang1.lv@intel.com> * fix ci issue Signed-off-by: lvliang-intel <liang1.lv@intel.com> --------- Signed-off-by: lvliang-intel <liang1.lv@intel.com>
2024-11-07 11:28:48 +08:00
parent 518cdfb6e3
commit 618f45bab1
19 changed files with 22 additions and 35 deletions
--- a/.github/workflows/scripts/freeze_images.sh
+++ b/.github/workflows/scripts/freeze_images.sh
@@ -5,8 +5,7 @@

 declare -A dict
 dict["langchain/langchain"]="docker://docker.io/langchain/langchain"
-# dict["vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2"]="docker://vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2"
-dict["opea/habanalabs:1.16.1-pytorch-installer-2.2.2"]="docker://docker.io/opea/habanalabs:1.16.1-pytorch-installer-2.2.2"
+dict["vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0"]="docker://vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0"

 function get_latest_version() {
    repo_image=$1
--- a/comps/animation/wav2lip/dependency/Dockerfile.intel_hpu
+++ b/comps/animation/wav2lip/dependency/Dockerfile.intel_hpu
@@ -1,6 +1,6 @@
 # Use a base image
 # FROM python:3.11-slim
-FROM vault.habana.ai/gaudi-docker/1.16.2/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest AS hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 # Set environment variables
 ENV LANG=en_US.UTF-8
--- a/comps/asr/whisper/dependency/Dockerfile.intel_hpu
+++ b/comps/asr/whisper/dependency/Dockerfile.intel_hpu
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 RUN useradd -m -s /bin/bash user && \
    mkdir -p /home/user && \
--- a/comps/embeddings/multimodal/bridgetower/Dockerfile.intel_hpu
+++ b/comps/embeddings/multimodal/bridgetower/Dockerfile.intel_hpu
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest AS hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu
 RUN useradd -m -s /bin/bash user && \
    mkdir -p /home/user && \
    chown -R user /home/user/
--- a/comps/finetuning/Dockerfile.intel_hpu
+++ b/comps/finetuning/Dockerfile.intel_hpu
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # Use the same python version with ray
-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 ENV DEVICE="hpu"

--- a/comps/image2image/Dockerfile.intel_hpu
+++ b/comps/image2image/Dockerfile.intel_hpu
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu
 RUN useradd -m -s /bin/bash user && \
    mkdir -p /home/user && \
    chown -R user /home/user/
--- a/comps/image2video/dependency/Dockerfile.intel_hpu
+++ b/comps/image2video/dependency/Dockerfile.intel_hpu
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu
 RUN useradd -m -s /bin/bash user && \
    mkdir -p /home/user && \
    chown -R user /home/user/
--- a/comps/llms/text-generation/native/langchain/Dockerfile
+++ b/comps/llms/text-generation/native/langchain/Dockerfile
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 ENV LANG=en_US.UTF-8
 ARG REPO=https://github.com/huggingface/optimum-habana.git
--- a/comps/llms/text-generation/native/llama_index/Dockerfile
+++ b/comps/llms/text-generation/native/llama_index/Dockerfile
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 ENV LANG=en_US.UTF-8
 ARG REPO=https://github.com/huggingface/optimum-habana.git
--- a/comps/llms/text-generation/vllm/langchain/dependency/Dockerfile.intel_hpu
+++ b/comps/llms/text-generation/vllm/langchain/dependency/Dockerfile.intel_hpu
@@ -1,8 +1,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0

-#FROM vault.habana.ai/gaudi-docker/1.17.0/ubuntu22.04/habanalabs/pytorch-installer-2.3.1:latest
-FROM vault.habana.ai/gaudi-docker/1.16.2/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 RUN git clone https://github.com/HabanaAI/vllm-fork.git /workspace/vllm 

--- a/comps/llms/text-generation/vllm/llama_index/dependency/Dockerfile.intel_hpu
+++ b/comps/llms/text-generation/vllm/llama_index/dependency/Dockerfile.intel_hpu
@@ -1,9 +1,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0

-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
-
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu
 RUN useradd -m -s /bin/bash user && \
    mkdir -p /home/user && \
    chown -R user /home/user/
--- a/comps/llms/text-generation/vllm/ray/dependency/Dockerfile
+++ b/comps/llms/text-generation/vllm/ray/dependency/Dockerfile
@@ -1,8 +1,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0

-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 ENV LANG=en_US.UTF-8

@@ -16,7 +15,8 @@ RUN pip install --no-cache-dir --upgrade-strategy eager optimum[habana] && \
 RUN pip install --no-cache-dir -v git+https://github.com/HabanaAI/vllm-fork.git@cf6952d
 RUN pip install --no-cache-dir "ray>=2.10" "ray[serve,tune]>=2.10"

-RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config && \
+RUN ssh-keygen -A && \
+    sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config && \
    service ssh restart

 ENV PYTHONPATH=$PYTHONPATH:/root:/home/user/vllm/ray
--- a/comps/lvms/llama-vision/Dockerfile
+++ b/comps/lvms/llama-vision/Dockerfile
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-FROM vault.habana.ai/gaudi-docker/1.17.1/ubuntu22.04/habanalabs/pytorch-installer-2.3.1:latest as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 ENV LANG=en_US.UTF-8

--- a/comps/lvms/llama-vision/Dockerfile_guard
+++ b/comps/lvms/llama-vision/Dockerfile_guard
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-FROM vault.habana.ai/gaudi-docker/1.17.1/ubuntu22.04/habanalabs/pytorch-installer-2.3.1:latest as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 ENV LANG=en_US.UTF-8

--- a/comps/lvms/llama-vision/Dockerfile_tp
+++ b/comps/lvms/llama-vision/Dockerfile_tp
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-FROM vault.habana.ai/gaudi-docker/1.17.1/ubuntu22.04/habanalabs/pytorch-installer-2.3.1:latest as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu

 ENV LANG=en_US.UTF-8

--- a/comps/lvms/llava/dependency/Dockerfile.intel_hpu
+++ b/comps/lvms/llava/dependency/Dockerfile.intel_hpu
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu
 RUN useradd -m -s /bin/bash user && \
    mkdir -p /home/user && \
    chown -R user /home/user/
--- a/comps/text2image/Dockerfile.intel_hpu
+++ b/comps/text2image/Dockerfile.intel_hpu
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu
 RUN useradd -m -s /bin/bash user && \
    mkdir -p /home/user && \
    chown -R user /home/user/
--- a/comps/tts/speecht5/dependency/Dockerfile.intel_hpu
+++ b/comps/tts/speecht5/dependency/Dockerfile.intel_hpu
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # HABANA environment
-# FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest as hpu
-FROM opea/habanalabs:1.16.1-pytorch-installer-2.2.2 as hpu
+FROM vault.habana.ai/gaudi-docker/1.18.0/ubuntu22.04/habanalabs/pytorch-installer-2.4.0 AS hpu
 RUN useradd -m -s /bin/bash user && \
    mkdir -p /home/user && \
    chown -R user /home/user/
--- a/tests/llms/test_llms_text-generation_vllm_ray_on_intel_hpu.sh
+++ b/tests/llms/test_llms_text-generation_vllm_ray_on_intel_hpu.sh
@@ -35,7 +35,7 @@ function build_docker_images() {
 }

 function start_service() {
-    export LLM_MODEL="facebook/opt-125m"
+    export LLM_MODEL="Intel/neural-chat-7b-v3-3"
    port_number=5031
    docker run -d --rm \
        --name="test-comps-vllm-ray-service" \
@@ -78,7 +78,7 @@ function validate_microservice() {
    port_number=5031
    result=$(http_proxy="" curl http://${ip_address}:$port_number/v1/chat/completions \
        -H "Content-Type: application/json" \
-        -d '{"model": "facebook/opt-125m", "messages": [{"role": "user", "content": "How are you?"}]}')
+        -d '{"model": "Intel/neural-chat-7b-v3-3", "messages": [{"role": "user", "content": "How are you?"}]}')
    if [[ $result == *"message"* ]]; then
        echo "Result correct."
    else