Skip to content

Commit 533af1a

Browse files
author
tylertitsworth
committed
swap to azure login and fix pyt mult ver
Signed-off-by: tylertitsworth <tyler.titsworth@intel.com>
1 parent 4cb76dd commit 533af1a

File tree

4 files changed

+42
-17
lines changed

4 files changed

+42
-17
lines changed

‎.github/workflows/container-ci.yaml

+21-6
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,16 @@ jobs:
8989
- uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
9090
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
9191
if: ${{ !inputs.no_build }}
92-
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
92+
- uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
9393
with:
94-
registry: ${{ secrets.REGISTRY }}
94+
login-server: ${{ secrets.REGISTRY }}
9595
username: ${{ secrets.REGISTRY_USER }}
9696
password: ${{ secrets.REGISTRY_TOKEN }}
97+
# - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
98+
# with:
99+
# registry: ${{ secrets.REGISTRY }}
100+
# username: ${{ secrets.REGISTRY_USER }}
101+
# password: ${{ secrets.REGISTRY_TOKEN }}
97102
if: ${{ !inputs.no_build }}
98103
- name: Build Container Group
99104
if: ${{ !inputs.no_build }}
@@ -140,11 +145,16 @@ jobs:
140145
with:
141146
egress-policy: audit
142147
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
143-
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
148+
- uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
144149
with:
145-
registry: ${{ secrets.REGISTRY }}
150+
login-server: ${{ secrets.REGISTRY }}
146151
username: ${{ secrets.REGISTRY_USER }}
147152
password: ${{ secrets.REGISTRY_TOKEN }}
153+
# - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
154+
# with:
155+
# registry: ${{ secrets.REGISTRY }}
156+
# username: ${{ secrets.REGISTRY_USER }}
157+
# password: ${{ secrets.REGISTRY_TOKEN }}
148158
- name: Pull Image
149159
run: docker pull ${{ secrets.REGISTRY }}/${{ secrets.REPO }}:${{ matrix.container }}
150160
- name: Scan Container
@@ -191,11 +201,16 @@ jobs:
191201
with:
192202
egress-policy: audit
193203
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
194-
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
204+
- uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
195205
with:
196-
registry: ${{ secrets.REGISTRY }}
206+
login-server: ${{ secrets.REGISTRY }}
197207
username: ${{ secrets.REGISTRY_USER }}
198208
password: ${{ secrets.REGISTRY_TOKEN }}
209+
# - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
210+
# with:
211+
# registry: ${{ secrets.REGISTRY }}
212+
# username: ${{ secrets.REGISTRY_USER }}
213+
# password: ${{ secrets.REGISTRY_TOKEN }}
199214
- name: Test Container Group
200215
uses: intel/ai-containers/test-runner@main
201216
with:

‎.github/workflows/test-runner-ci.yaml

+14-4
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,16 @@ jobs:
4040
- uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
4141
with:
4242
driver: docker
43-
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
43+
- uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
4444
with:
45-
registry: ${{ secrets.REGISTRY }}
45+
login-server: ${{ secrets.REGISTRY }}
4646
username: ${{ secrets.REGISTRY_USER }}
4747
password: ${{ secrets.REGISTRY_TOKEN }}
48+
# - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
49+
# with:
50+
# registry: ${{ secrets.REGISTRY }}
51+
# username: ${{ secrets.REGISTRY_USER }}
52+
# password: ${{ secrets.REGISTRY_TOKEN }}
4853
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
4954
with:
5055
python-version: ${{ matrix.python }}
@@ -90,11 +95,16 @@ jobs:
9095
- uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
9196
with:
9297
driver: docker
93-
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
98+
- uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
9499
with:
95-
registry: ${{ secrets.REGISTRY }}
100+
login-server: ${{ secrets.REGISTRY }}
96101
username: ${{ secrets.REGISTRY_USER }}
97102
password: ${{ secrets.REGISTRY_TOKEN }}
103+
# - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
104+
# with:
105+
# registry: ${{ secrets.REGISTRY }}
106+
# username: ${{ secrets.REGISTRY_USER }}
107+
# password: ${{ secrets.REGISTRY_TOKEN }}
98108
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
99109
with:
100110
python-version: "3.8"

‎pytorch/docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ services:
8989
\"\\nOneCCL:\", oneccl.__version__,
9090
\"\\nDeepspeed:\", deepspeed.__version__)'"
9191
extends: ipex-base
92-
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0}
92+
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0.2}
9393
shm_size: 2gb
9494
xpu:
9595
build:

‎pytorch/tests/tests.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ import-xpu-jupyter-${PACKAGE_OPTION:-pip}:
2727
cmd: python -m jupyter --version
2828
device: ["/dev/dri"]
2929
import-cpu-oneccl-${PACKAGE_OPTION:-pip}:
30-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0}
30+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0.2}
3131
cmd: python -c "'import oneccl_bindings_for_pytorch as oneccl;print(oneccl.__version__)'"
3232
import-cpu-transformers-${PACKAGE_OPTION:-pip}:
3333
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-hf-${HF_VERSION:-4.44.0}
3434
cmd: python -c "import transformers;print(f'transformers {transformers.__version__}');assert transformers.utils.import_utils.is_ipex_available()"
3535
import-cpu-inc-${PACKAGE_OPTION:-pip}:
36-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0}
36+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0.2}
3737
cmd: python -c "'import neural_compressor as inc;print(inc.__version__)'"
3838
import-cpu-deepspeed-${PACKAGE_OPTION:-pip}:
39-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0}
39+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0.2}
4040
cmd: ds_report
4141
shm_size: 2gb
4242
ipex-cpu-${PACKAGE_OPTION:-pip}:
@@ -58,21 +58,21 @@ ipex-xpu-jupyter-${PACKAGE_OPTION:-pip}:
5858
device: ["/dev/dri"]
5959
notebook: True
6060
oneccl-${PACKAGE_OPTION:-pip}:
61-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0}
61+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0.2}
6262
cmd: ipexrun cpu /tests/ipex-resnet50.py --ipex --device cpu --backend ccl
6363
privileged: true
6464
volumes:
6565
- dst: /tests
6666
src: $PWD/pytorch/tests
6767
oneccl-ds-${PACKAGE_OPTION:-pip}:
68-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0}
68+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0.2}
6969
cmd: ipexrun cpu /tests/ipex-resnet50.py --ipex --device cpu --backend ccl --deepspeed
7070
privileged: true
7171
volumes:
7272
- dst: /tests
7373
src: $PWD/pytorch/tests
7474
inc-${PACKAGE_OPTION:-pip}:
75-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0}
75+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.4.0}-oneccl-inc-${INC_VERSION:-3.0.2}
7676
cmd: python /tests/inc-quant.py
7777
volumes:
7878
- dst: /tests

0 commit comments

Comments
 (0)