update CI gaudi-docker to 1.19.0 (#2096)

Signed-off-by: Sun, Xuehao <xuehao.sun@intel.com>
intel · Dec 27, 2024 · b2d019f · b2d019f
1 parent adf0ca7
commit b2d019f
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 65 deletions.
diff --git a/.azure-pipelines/code-scan.yml b/.azure-pipelines/code-scan.yml
@@ -13,6 +13,7 @@ pr:
       - requirements.txt
       - .azure-pipelines/code-scan.yml
       - .azure-pipelines/scripts/codeScan
+      - .azure-pipelines/template/docker-template.yml
 
 pool:
   vmImage: "ubuntu-latest"

diff --git a/.azure-pipelines/docker/DockerfileWithNC.devel b/.azure-pipelines/docker/DockerfileWithNC.devel
diff --git a/.azure-pipelines/model-test-3x.yml b/.azure-pipelines/model-test-3x.yml
@@ -15,6 +15,7 @@ pr:
       - requirements_pt.txt
       - .azure-pipelines/scripts/models
       - .azure-pipelines/model-test-3x.yml
+      - .azure-pipelines/template/docker-template.yml
 
 variables:
   OUT_SCRIPT_PATH: $(Build.SourcesDirectory)/.azure-pipelines/scripts/models

diff --git a/.azure-pipelines/model-test.yml b/.azure-pipelines/model-test.yml
@@ -12,6 +12,7 @@ pr:
       - setup.py
       - requirements.txt
       - .azure-pipelines/model-test.yml
+      - .azure-pipelines/template/docker-template.yml
       - .azure-pipelines/scripts/models
       - examples/tensorflow/oob_models/quantization/ptq
       - .azure-pipelines/model-test.yml

diff --git a/.azure-pipelines/template/docker-template.yml b/.azure-pipelines/template/docker-template.yml
@@ -74,7 +74,7 @@ steps:
 
   - ${{ if eq(parameters.imageSource, 'pull') }}:
       - script: |
-            docker pull vault.habana.ai/gaudi-docker/1.19.0/ubuntu24.04/habanalabs/pytorch-installer-2.5.1:latest
+            docker pull vault.habana.ai/gaudi-docker/1.19.0/ubuntu22.04/habanalabs/pytorch-installer-2.5.1:latest
         displayName: "Pull habana docker image"
 
   - script: |
@@ -95,7 +95,8 @@ steps:
             else
                 docker run -dit --disable-content-trust --privileged --name=${{ parameters.containerName }} --shm-size="2g" \
                 --runtime=habana -e HABANA_VISIBLE_DEVICES=all -e OMPI_MCA_btl_vader_single_copy_mechanism=none --cap-add=sys_nice --net=host --ipc=host \
-                -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor vault.habana.ai/gaudi-docker/1.19.0/ubuntu24.04/habanalabs/pytorch-installer-2.5.1:latest
+                -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor vault.habana.ai/gaudi-docker/1.19.0/ubuntu22.04/habanalabs/pytorch-installer-2.5.1:latest
+                docker exec ${{ parameters.containerName }} bash -c "ln -sf \$(which python3) /usr/bin/python"
             fi
             echo "Show the container list after docker run ... "
             docker ps -a

diff --git a/.azure-pipelines/ut-3x-pt-fp8.yml b/.azure-pipelines/ut-3x-pt-fp8.yml
@@ -11,6 +11,7 @@ pr:
       - .azure-pipelines/scripts/ut/3x/run_3x_pt_fp8.sh
       - .azure-pipelines/scripts/install_nc.sh
       - .azure-pipelines/ut-3x-pt-fp8.yml
+      - .azure-pipelines/template/docker-template.yml
       - neural_compressor/common
       - neural_compressor/torch
       - test/3x/torch/algorithms/fp8_quant
@@ -88,7 +89,7 @@ stages:
 
           - script: |
               echo "--- create container ---"
-              docker run -d -it --name="collectLogs"  -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor  ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
+              docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor  ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
               echo "--- docker ps ---"
               docker ps
               echo "--- collect logs ---"

diff --git a/.azure-pipelines/ut-3x-pt.yml b/.azure-pipelines/ut-3x-pt.yml
@@ -15,6 +15,7 @@ pr:
       - setup.py
       - requirements_pt.txt
       - .azure-pipelines/ut-3x-pt.yml
+      - .azure-pipelines/template/docker-template.yml
       - .azure-pipelines/scripts/install_nc.sh
       - .azure-pipelines/scripts/ut/3x/run_3x_pt.sh
 
@@ -86,7 +87,7 @@ stages:
 
           - script: |
               echo "--- create container ---"
-              docker run -d -it --name="collectLogs"  -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor  ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
+              docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor  ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
               echo "--- docker ps ---"
               docker ps
               echo "--- collect logs ---"

diff --git a/.azure-pipelines/ut-3x-tf.yml b/.azure-pipelines/ut-3x-tf.yml
@@ -15,6 +15,7 @@ pr:
       - setup.py
       - requirements_tf.txt
       - .azure-pipelines/scripts/ut/3x/run_3x_tf.sh
+      - .azure-pipelines/template/docker-template.yml
 
 pool: ICX-16C
 
@@ -83,7 +84,7 @@ stages:
 
           - script: |
               echo "--- create container ---"
-              docker run -d -it --name="collectLogs"  -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor  ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
+              docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor  ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
               echo "--- docker ps ---"
               docker ps
               echo "--- collect logs ---"

diff --git a/.azure-pipelines/ut-basic.yml b/.azure-pipelines/ut-basic.yml
@@ -13,6 +13,7 @@ pr:
       - setup.py
       - requirements.txt
       - .azure-pipelines/ut-basic.yml
+      - .azure-pipelines/template/docker-template.yml
       - .azure-pipelines/scripts/ut
       - .azure-pipelines/scripts/fwk_version.sh
       - .azure-pipelines/scripts/install_nc.sh
@@ -257,7 +258,7 @@ stages:
 
           - script: |
               echo "--- create container ---"
-              docker run -d -it --name="collectLogs"  -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor  ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
+              docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor  ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
               echo "--- docker ps ---"
               docker ps
               echo "--- collect logs ---"

diff --git a/docker/README.md b/docker/README.md
@@ -5,8 +5,8 @@ Please note that `INC_VER` must be set to a valid version published here:
 https://pypi.org/project/neural-compressor/#history
 
 ```console
-$ PYTHON=python3.8
-$ INC_VER=1.12
+$ PYTHON=python3.10
+$ INC_BRANCH=3.2
 $ IMAGE_NAME=neural-compressor
 $ IMAGE_TAG=${INC_VER}
 $ docker build --build-arg PYTHON=${PYTHON} --build-arg INC_VER=${INC_VER} -f Dockerfile -t ${IMAGE_NAME}:${IMAGE_TAG} .
@@ -19,8 +19,8 @@ https://docs.docker.com/engine/reference/commandline/tag/
 then please modify the tag so that the tagging requirement is met. For example replace `/` with `-`.  
 
 ```console
-$ PYTHON=python3.8
-$ INC_BRANCH=v1.12
+$ PYTHON=python3.10
+$ INC_BRANCH=3.2
 $ IMAGE_NAME=neural-compressor
 $ IMAGE_TAG=${INC_BRANCH}-devel
 $ docker build --build-arg PYTHON=${PYTHON} --build-arg INC_BRANCH=${INC_BRANCH} -f Dockerfile.devel -t ${IMAGE_NAME}:${IMAGE_TAG} .
@@ -29,6 +29,6 @@ $ docker build --build-arg PYTHON=${PYTHON} --build-arg INC_BRANCH=${INC_BRANCH}
 ### Check the Containers built:
 ```console
 $ docker images | grep -i neural-compressor
-neural-compressor                                                                           v1.12-devel                                               5c0dc1371312   5 minutes ago    2.76GB
-neural-compressor                                                                           1.12                                                      303de7f7c38d   36 minutes ago   1.61GB
+neural-compressor   v3.2-devel   5c0dc1371312   5 minutes ago    2.76GB
+neural-compressor   3.2   303de7f7c38d   36 minutes ago   1.61GB
 ```