From 1304af9c203fd17a7e17c6ab28735c853172f14f Mon Sep 17 00:00:00 2001 From: Chen Lai Date: Tue, 12 Nov 2024 15:44:49 -0800 Subject: [PATCH] Add qnn sdk docker (#6796) Summary: Add a dedicated docker for qnn sdk Differential Revision: D65845829 --- .ci/docker/build.sh | 5 +++++ .ci/docker/ubuntu/Dockerfile | 2 ++ .github/workflows/docker-builds.yml | 1 + .github/workflows/pull.yml | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh index fabb60b5fd1..4a833308977 100755 --- a/.ci/docker/build.sh +++ b/.ci/docker/build.sh @@ -37,6 +37,10 @@ case "${IMAGE_NAME}" in ARM_SDK=yes CLANG_VERSION=12 ;; + executorch-ubuntu-22.04-qnn-sdk) + QNN_SDK=yes + CLANG_VERSION=12 + ;; executorch-ubuntu-22.04-clang12-android) LINTRUNNER="" CLANG_VERSION=12 @@ -72,6 +76,7 @@ docker build \ --build-arg "LINTRUNNER=${LINTRUNNER:-}" \ --build-arg "BUILD_DOCS=${BUILD_DOCS}" \ --build-arg "ARM_SDK=${ARM_SDK:-}" \ + --build-arg "QNN_SDK=${QNN_SDK:-}" \ --build-arg "ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-}" \ -f "${OS}"/Dockerfile \ "$@" \ diff --git a/.ci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile index 449cd14b6b4..f55504c9700 100644 --- a/.ci/docker/ubuntu/Dockerfile +++ b/.ci/docker/ubuntu/Dockerfile @@ -82,5 +82,7 @@ COPY --chown=ci-user:ci-user ./arm /opt/arm # Set up ARM SDK if needed RUN if [ -n "${ARM_SDK}" ]; then git config --global user.email "ossci@example.com"; git config --global user.name "OSS CI"; bash /opt/arm/setup.sh --i-agree-to-the-contained-eula /opt/arm-sdk; chown -R ci-user:ci-user /opt/arm-sdk; fi +ARG QNN_SDK + USER ci-user CMD ["bash"] diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index f773f3aca88..d256af7fcda 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -38,6 +38,7 @@ jobs: - docker-image-name: executorch-ubuntu-22.04-clang12 - docker-image-name: executorch-ubuntu-22.04-linter - docker-image-name: executorch-ubuntu-22.04-arm-sdk + - docker-image-name: executorch-ubuntu-22.04-qnn-sdk - docker-image-name: executorch-ubuntu-22.04-clang12-android env: DOCKER_IMAGE: 308535385114.dkr.ecr.us-east-1.amazonaws.com/executorch/${{ matrix.docker-image-name }} diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index dd5b432e5a4..1f5da06a920 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -372,7 +372,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12-android + docker-image: executorch-ubuntu-22.04-qnn-sdk submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 900