Skip to content

Commit 00e6e13

Browse files
committed
fix
Signed-off-by: Sun, Xuehao <xuehao.sun@intel.com>
1 parent 06e8d1c commit 00e6e13

10 files changed

+15
-23
lines changed

.azure-pipelines/docker/Dockerfile.devel

+2-10
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
3434

3535
RUN ln -sf $(which python3) /usr/bin/python
3636

37-
ARG USER_ID=1001
38-
ARG GROUP_ID=1001
39-
40-
RUN groupadd -g ${GROUP_ID} hostgroup && \
41-
useradd -m -u ${USER_ID} -g ${GROUP_ID} hostuser
42-
43-
USER hostuser
44-
45-
RUN pip install --user --no-cache-dir --upgrade pip
46-
RUN pip install --user --no-cache-dir setuptools
37+
RUN pip install --no-cache-dir --upgrade pip
38+
RUN pip install --no-cache-dir setuptools
4739

4840
RUN pip list
4941

.azure-pipelines/scripts/models/run_pytorch_models_trigger.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ FRAMEWORK="pytorch"
7272
source /neural-compressor/.azure-pipelines/scripts/fwk_version.sh 'latest'
7373
if [[ "${inc_new_api}" == "3x"* ]]; then
7474
FRAMEWORK_VERSION="latest"
75-
export LD_LIBRARY_PATH=${HOME}/.local/lib/:$LD_LIBRARY_PATH
75+
export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH
7676
else
7777
FRAMEWORK_VERSION=${pytorch_version}
7878
TORCH_VISION_VERSION=${torchvision_version}

.azure-pipelines/scripts/ut/3x/run_3x_pt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ echo "##[section]import check pass"
1111

1212
# install requirements
1313
echo "##[group]set up UT env..."
14-
export LD_LIBRARY_PATH=${HOME}/.local/lib/:$LD_LIBRARY_PATH
14+
export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH
1515
pip install -r /neural-compressor/test/3x/torch/requirements.txt
1616
pip install pytest-cov
1717
pip install pytest-html

.azure-pipelines/scripts/ut/3x/run_3x_pt_fp8.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ echo "##[section]import check pass"
1111

1212
# install requirements
1313
echo "##[group]set up UT env..."
14-
export LD_LIBRARY_PATH=${HOME}/.local/lib/:$LD_LIBRARY_PATH
14+
export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH
1515
sed -i '/^intel_extension_for_pytorch/d' /neural-compressor/test/3x/torch/requirements.txt
1616
sed -i '/^auto_round/d' /neural-compressor/test/3x/torch/requirements.txt
1717
cat /neural-compressor/test/3x/torch/requirements.txt

.azure-pipelines/scripts/ut/run_basic_adaptor.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source /neural-compressor/.azure-pipelines/scripts/fwk_version.sh $1
88

99
echo "set up UT env..."
1010
bash /neural-compressor/.azure-pipelines/scripts/ut/env_setup.sh "${test_case}"
11-
export LD_LIBRARY_PATH=${HOME}/.local/lib/:$LD_LIBRARY_PATH
11+
export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH
1212
export COVERAGE_RCFILE=/neural-compressor/.azure-pipelines/scripts/ut/coverage.file
1313
lpot_path=$(python -c 'import neural_compressor; import os; print(os.path.dirname(neural_compressor.__file__))')
1414
cd /neural-compressor/test || exit 1

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ steps:
6363
- script: |
6464
docker image prune -a -f
6565
if [[ ! $(docker images | grep -i ${{ parameters.repoName }}:${{ parameters.repoTag }}) ]]; then
66-
docker build --build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) -f ${BUILD_SOURCESDIRECTORY}/.azure-pipelines/docker/${{parameters.dockerFileName}}.devel -t ${{ parameters.repoName }}:${{ parameters.repoTag }} .
66+
docker build -f ${BUILD_SOURCESDIRECTORY}/.azure-pipelines/docker/${{parameters.dockerFileName}}.devel -t ${{ parameters.repoName }}:${{ parameters.repoTag }} .
6767
fi
6868
docker images | grep -i ${{ parameters.repoName }}
6969
if [[ $? -ne 0 ]]; then
70-
echo "NO Such Repo"
70+
echo "NO Such Image"
7171
exit 1
7272
fi
7373
displayName: "Build develop docker image"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ stages:
7575
fi
7676
docker images | grep -i ${IMAGE_NAME}
7777
if [[ $? -ne 0 ]]; then
78-
echo "NO Such Repo"
78+
echo "NO Such Image"
7979
exit 1
8080
fi
8181
displayName: "Build develop docker image"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ stages:
7373
fi
7474
docker images | grep -i ${IMAGE_NAME}
7575
if [[ $? -ne 0 ]]; then
76-
echo "NO Such Repo"
76+
echo "NO Such Image"
7777
exit 1
7878
fi
7979
displayName: "Build develop docker image"
@@ -86,7 +86,7 @@ stages:
8686

8787
- script: |
8888
echo "--- create container ---"
89-
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
89+
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
9090
echo "--- docker ps ---"
9191
docker ps
9292
echo "--- collect logs ---"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ stages:
7070
fi
7171
docker images | grep -i ${IMAGE_NAME}
7272
if [[ $? -ne 0 ]]; then
73-
echo "NO Such Repo"
73+
echo "NO Such Image"
7474
exit 1
7575
fi
7676
displayName: "Build develop docker image"
@@ -83,7 +83,7 @@ stages:
8383

8484
- script: |
8585
echo "--- create container ---"
86-
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
86+
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
8787
echo "--- docker ps ---"
8888
docker ps
8989
echo "--- collect logs ---"

.azure-pipelines/ut-basic.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ stages:
244244
fi
245245
docker images | grep -i ${IMAGE_NAME}
246246
if [[ $? -ne 0 ]]; then
247-
echo "NO Such Repo"
247+
echo "NO Such Image"
248248
exit 1
249249
fi
250250
displayName: "Build develop docker image"
@@ -257,7 +257,7 @@ stages:
257257

258258
- script: |
259259
echo "--- create container ---"
260-
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
260+
docker run -d -it --name="collectLogs" -v ${BUILD_SOURCESDIRECTORY}:/neural-compressor ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash
261261
echo "--- docker ps ---"
262262
docker ps
263263
echo "--- collect logs ---"

0 commit comments

Comments
 (0)