Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/linux-cpu-arm64-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ env:

jobs:
linux-cpu-arm64-build:
permissions:
contents: read
packages: write # needed for GHCR push
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2004-ARM-CPU"]
steps:
- name: Checkout OnnxRuntime GenAI repo
Expand Down Expand Up @@ -73,12 +76,14 @@ jobs:
- name: Download Docker Image
run: |
set -e -x
az login --identity --object-id b44538a9-6545-4353-907e-da46df88a2ab
az login --identity --object-id 161bbca8-9899-4f61-950c-4d556fbcf830
az acr login --name onnxruntimebuildcache --subscription 00c06639-6ee4-454e-8058-8d8b1703bd87
docker login --username "$GITHUB_ACTOR" --password '${{ secrets.GITHUB_TOKEN }}' ghcr.io
Comment thread
sanaa-hamel-microsoft marked this conversation as resolved.

Comment thread
sanaa-hamel-microsoft marked this conversation as resolved.
python3 tools/ci_build/get_docker_image.py --dockerfile tools/ci_build/github/linux/docker/inference/aarch64/default/cpu/Dockerfile \
--context tools/ci_build/github/linux/docker/inference/aarch64/default/cpu \
--docker-build-args "--build-arg BUILD_UID=$( id -u )" \
--container-registry onnxruntimebuildcache \
--container-registry ghcr.io/microsoft/onnxruntime-genai \
--repository ort_genai_linux_arm64_gha

- name: Docker -- Configure with CMake and GCC
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/linux-gpu-x64-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ env:

jobs:
linux-cuda-x64-build:
permissions:
contents: read
packages: write # needed for GHCR push
env:
PYTHON_EXECUTABLE: "/opt/python/cp312-cp312/bin/python3.12"
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2204-A10"]
Expand Down Expand Up @@ -102,12 +105,14 @@ jobs:
- name: Get Docker Image
run: |
set -e -x
az login --identity --object-id b44538a9-6545-4353-907e-da46df88a2ab
az login --identity --object-id 161bbca8-9899-4f61-950c-4d556fbcf830
az acr login --name onnxruntimebuildcache --subscription 00c06639-6ee4-454e-8058-8d8b1703bd87
docker login --username "$GITHUB_ACTOR" --password '${{ secrets.GITHUB_TOKEN }}' ghcr.io
Comment thread
tianleiwu marked this conversation as resolved.

Comment thread
sanaa-hamel-microsoft marked this conversation as resolved.
python3 tools/ci_build/get_docker_image.py --dockerfile tools/ci_build/github/linux/docker/manylinux/Dockerfile.manylinux2_28_cuda_12.8 \
--context tools/ci_build/github/linux/docker/manylinux \
--docker-build-args "--build-arg BUILD_UID=$( id -u )" \
--container-registry onnxruntimebuildcache \
--container-registry ghcr.io/microsoft/onnxruntime-genai \
--manylinux-src manylinux \
--multiple_repos \
--repository onnxruntimecudabuildx64
Expand Down
3 changes: 3 additions & 0 deletions .ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
!/.config
!/.github
!/.pipelines
2 changes: 1 addition & 1 deletion .pipelines/stages/jobs/integration-build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
--dockerfile tools/ci_build/github/linux/docker/manylinux/Dockerfile.manylinux2_28_cuda_12.8 \
--context tools/ci_build/github/linux/docker/manylinux \
--docker-build-args "--build-arg BUILD_UID=$( id -u )" \
--container-registry onnxruntimebuildcache \
--container-registry onnxruntimebuildcache.azurecr.io \
--repository ortgenaicudabuildx64
displayName: 'Build manylinux CUDA docker image'
workingDirectory: '$(Build.Repository.LocalPath)'
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/stages/jobs/steps/capi-linux-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ steps:
python3 tools/ci_build/get_docker_image.py --dockerfile tools/ci_build/github/linux/docker/manylinux/Dockerfile.manylinux2_28_$(ep)_$cuda_dockerfile_version \
--context tools/ci_build/github/linux/docker/manylinux \
--docker-build-args "--build-arg BUILD_UID=$( id -u )" \
--container-registry onnxruntimebuildcache \
--container-registry onnxruntimebuildcache.azurecr.io \
--repository ortgenai$(ep)build$(arch)
displayName: 'Get CUDA Docker Image $(cuda_version)'
condition: eq(variables['ep'], 'cuda')
Expand All @@ -76,7 +76,7 @@ steps:
python3 tools/ci_build/get_docker_image.py --dockerfile "$dockerfile" \
--context tools/ci_build/github/linux/docker/manylinux \
--docker-build-args "--build-arg BUILD_UID=$( id -u )" \
--container-registry onnxruntimebuildcache \
--container-registry onnxruntimebuildcache.azurecr.io \
--repository ortgenai$(ep)build$(arch)
displayName: 'Get Docker Image'
condition: ne(variables['ep'], 'cuda')
Expand Down
6 changes: 2 additions & 4 deletions tools/ci_build/get_docker_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def parse_args():

parser.add_argument(
"--container-registry",
help="The Azure container registry name. If not provided, no container registry will be used.",
help="Container registry host and, optionally, qualifiers. If not provided, no container registry will be used.",
)
parser.add_argument("--repository", required=True, help="The image repository name.")

Expand Down Expand Up @@ -64,9 +64,7 @@ def main():
log.info("No container registry will be used")

full_image_name = (
f"{args.container_registry}.azurecr.io/{args.repository}:latest"
if use_container_registry
else f"{args.repository}:latest"
f"{args.container_registry}/{args.repository}:latest" if use_container_registry else f"{args.repository}:latest"
)
Comment thread
sanaa-hamel-microsoft marked this conversation as resolved.

log.info(f"Image: {full_image_name}")
Expand Down
Loading