Skip to content

Commit b2d019f

Browse files
authored
update CI gaudi-docker to 1.19.0 (#2096)
Signed-off-by: Sun, Xuehao <xuehao.sun@intel.com>
1 parent adf0ca7 commit b2d019f

10 files changed

+20
-65
lines changed

.azure-pipelines/code-scan.yml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ pr:
1313
- requirements.txt
1414
- .azure-pipelines/code-scan.yml
1515
- .azure-pipelines/scripts/codeScan
16+
- .azure-pipelines/template/docker-template.yml
1617

1718
pool:
1819
vmImage: "ubuntu-latest"

.azure-pipelines/docker/DockerfileWithNC.devel

-53
This file was deleted.

.azure-pipelines/model-test-3x.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pr:
1515
- requirements_pt.txt
1616
- .azure-pipelines/scripts/models
1717
- .azure-pipelines/model-test-3x.yml
18+
- .azure-pipelines/template/docker-template.yml
1819

1920
variables:
2021
OUT_SCRIPT_PATH: $(Build.SourcesDirectory)/.azure-pipelines/scripts/models

.azure-pipelines/model-test.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ pr:
1212
- setup.py
1313
- requirements.txt
1414
- .azure-pipelines/model-test.yml
15+
- .azure-pipelines/template/docker-template.yml
1516
- .azure-pipelines/scripts/models
1617
- examples/tensorflow/oob_models/quantization/ptq
1718
- .azure-pipelines/model-test.yml

.azure-pipelines/template/docker-template.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ steps:
7474
7575
- ${{ if eq(parameters.imageSource, 'pull') }}:
7676
- script: |
77-
docker pull vault.habana.ai/gaudi-docker/1.19.0/ubuntu24.04/habanalabs/pytorch-installer-2.5.1:latest
77+
docker pull vault.habana.ai/gaudi-docker/1.19.0/ubuntu22.04/habanalabs/pytorch-installer-2.5.1:latest
7878
displayName: "Pull habana docker image"
7979
8080
- script: |
@@ -95,7 +95,8 @@ steps:
9595
else
9696
docker run -dit --disable-content-trust --privileged --name=${{ parameters.containerName }} --shm-size="2g" \
9797
--runtime=habana -e HABANA_VISIBLE_DEVICES=all -e OMPI_MCA_btl_vader_single_copy_mechanism=none --cap-add=sys_nice --net=host --ipc=host \
98-
-v ${BUILD_SOURCESDIRECTORY}:/neural-compressor vault.habana.ai/gaudi-docker/1.19.0/ubuntu24.04/habanalabs/pytorch-installer-2.5.1:latest
98+
-v ${BUILD_SOURCESDIRECTORY}:/neural-compressor vault.habana.ai/gaudi-docker/1.19.0/ubuntu22.04/habanalabs/pytorch-installer-2.5.1:latest
99+
docker exec ${{ parameters.containerName }} bash -c "ln -sf \$(which python3) /usr/bin/python"
99100
fi
100101
echo "Show the container list after docker run ... "
101102
docker ps -a

.azure-pipelines/ut-3x-pt-fp8.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pr:
1111
- .azure-pipelines/scripts/ut/3x/run_3x_pt_fp8.sh
1212
- .azure-pipelines/scripts/install_nc.sh
1313
- .azure-pipelines/ut-3x-pt-fp8.yml
14+
- .azure-pipelines/template/docker-template.yml
1415
- neural_compressor/common
1516
- neural_compressor/torch
1617
- test/3x/torch/algorithms/fp8_quant
@@ -88,7 +89,7 @@ stages:
8889

8990
- script: |
9091
echo "--- create container ---"
91-
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
92+
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
9293
echo "--- docker ps ---"
9394
docker ps
9495
echo "--- collect logs ---"

.azure-pipelines/ut-3x-pt.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pr:
1515
- setup.py
1616
- requirements_pt.txt
1717
- .azure-pipelines/ut-3x-pt.yml
18+
- .azure-pipelines/template/docker-template.yml
1819
- .azure-pipelines/scripts/install_nc.sh
1920
- .azure-pipelines/scripts/ut/3x/run_3x_pt.sh
2021

@@ -86,7 +87,7 @@ stages:
8687

8788
- script: |
8889
echo "--- create container ---"
89-
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
90+
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
9091
echo "--- docker ps ---"
9192
docker ps
9293
echo "--- collect logs ---"

.azure-pipelines/ut-3x-tf.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pr:
1515
- setup.py
1616
- requirements_tf.txt
1717
- .azure-pipelines/scripts/ut/3x/run_3x_tf.sh
18+
- .azure-pipelines/template/docker-template.yml
1819

1920
pool: ICX-16C
2021

@@ -83,7 +84,7 @@ stages:
8384

8485
- script: |
8586
echo "--- create container ---"
86-
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
87+
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
8788
echo "--- docker ps ---"
8889
docker ps
8990
echo "--- collect logs ---"

.azure-pipelines/ut-basic.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ pr:
1313
- setup.py
1414
- requirements.txt
1515
- .azure-pipelines/ut-basic.yml
16+
- .azure-pipelines/template/docker-template.yml
1617
- .azure-pipelines/scripts/ut
1718
- .azure-pipelines/scripts/fwk_version.sh
1819
- .azure-pipelines/scripts/install_nc.sh
@@ -257,7 +258,7 @@ stages:
257258

258259
- script: |
259260
echo "--- create container ---"
260-
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
261+
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
261262
echo "--- docker ps ---"
262263
docker ps
263264
echo "--- collect logs ---"

docker/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Please note that `INC_VER` must be set to a valid version published here:
55
https://pypi.org/project/neural-compressor/#history
66

77
```console
8-
$ PYTHON=python3.8
9-
$ INC_VER=1.12
8+
$ PYTHON=python3.10
9+
$ INC_BRANCH=3.2
1010
$ IMAGE_NAME=neural-compressor
1111
$ IMAGE_TAG=${INC_VER}
1212
$ 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/
1919
then please modify the tag so that the tagging requirement is met. For example replace `/` with `-`.
2020

2121
```console
22-
$ PYTHON=python3.8
23-
$ INC_BRANCH=v1.12
22+
$ PYTHON=python3.10
23+
$ INC_BRANCH=3.2
2424
$ IMAGE_NAME=neural-compressor
2525
$ IMAGE_TAG=${INC_BRANCH}-devel
2626
$ 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}
2929
### Check the Containers built:
3030
```console
3131
$ docker images | grep -i neural-compressor
32-
neural-compressor v1.12-devel 5c0dc1371312 5 minutes ago 2.76GB
33-
neural-compressor 1.12 303de7f7c38d 36 minutes ago 1.61GB
32+
neural-compressor v3.2-devel 5c0dc1371312 5 minutes ago 2.76GB
33+
neural-compressor 3.2 303de7f7c38d 36 minutes ago 1.61GB
3434
```

0 commit comments

Comments
 (0)