diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh index 81c9c52f3f4..daa686ca01d 100755 --- a/.ci/docker/build.sh +++ b/.ci/docker/build.sh @@ -7,9 +7,11 @@ set -exu -IMAGE_NAME="$1" +FULL_IMAGE_NAME="$1" shift +IMAGE_NAME=$(echo "${FULL_IMAGE_NAME}" | sed 's/ci-image://') + echo "Building ${IMAGE_NAME} Docker image" OS=ubuntu diff --git a/.github/workflows/_android.yml b/.github/workflows/_android.yml index 630ae2747bf..2449e94b2af 100644 --- a/.github/workflows/_android.yml +++ b/.github/workflows/_android.yml @@ -13,7 +13,7 @@ jobs: contents: read with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12-android + docker-image: ci-image:executorch-ubuntu-22.04-clang12-android submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 diff --git a/.github/workflows/_link_check.yml b/.github/workflows/_link_check.yml index 2e96b0fd118..aadd6c07420 100644 --- a/.github/workflows/_link_check.yml +++ b/.github/workflows/_link_check.yml @@ -11,7 +11,7 @@ jobs: uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-linter + docker-image: ci-image:executorch-ubuntu-22.04-linter submodules: false fetch-depth: 0 ref: ${{ inputs.ref }} @@ -36,7 +36,7 @@ jobs: uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-linter + docker-image: ci-image:executorch-ubuntu-22.04-linter submodules: false fetch-depth: 0 ref: ${{ inputs.ref }} diff --git a/.github/workflows/android-perf.yml b/.github/workflows/android-perf.yml index eba12967e5f..ffa138d5cf0 100644 --- a/.github/workflows/android-perf.yml +++ b/.github/workflows/android-perf.yml @@ -168,7 +168,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge.memory - docker-image: executorch-ubuntu-22.04-qnn-sdk + docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk submodules: 'recursive' timeout: 60 upload-artifact: android-models @@ -409,7 +409,7 @@ jobs: needs: set-parameters with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12-android + docker-image: ci-image:executorch-ubuntu-22.04-clang12-android submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 diff --git a/.github/workflows/android-release-artifacts.yml b/.github/workflows/android-release-artifacts.yml index 0e6879bd416..9ef8d046b8b 100644 --- a/.github/workflows/android-release-artifacts.yml +++ b/.github/workflows/android-release-artifacts.yml @@ -54,7 +54,7 @@ jobs: contents: read with: secrets-env: EXECUTORCH_MAVEN_SIGNING_KEYID EXECUTORCH_MAVEN_SIGNING_PASSWORD EXECUTORCH_MAVEN_CENTRAL_PASSWORD EXECUTORCH_MAVEN_CENTRAL_USERNAME EXECUTORCH_MAVEN_SIGNING_GPG_KEY_CONTENTS - docker-image: executorch-ubuntu-22.04-clang12-android + docker-image: ci-image:executorch-ubuntu-22.04-clang12-android submodules: 'recursive' ref: ${{ github.sha }} timeout: 90 diff --git a/.github/workflows/build-presets.yml b/.github/workflows/build-presets.yml index ae8ff8b7493..caace2e29e4 100644 --- a/.github/workflows/build-presets.yml +++ b/.github/workflows/build-presets.yml @@ -44,7 +44,7 @@ jobs: job-name: build ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-arm-sdk + docker-image: ci-image:executorch-ubuntu-22.04-arm-sdk submodules: recursive timeout: 90 script: | @@ -63,7 +63,7 @@ jobs: # Verify download echo "93128be0235cf5cf5f1ee561aa6eac5f ${toolchain_dir}.tar.xz" > arm-zephyr-eabi.md5 md5sum -c --strict arm-zephyr-eabi.md5 - + # Extract and install to PATH tar xf "${toolchain_dir}.tar.xz" rm -f "${toolchain_dir}.tar.xz" @@ -93,7 +93,7 @@ jobs: job-name: build ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} runner: ${{ matrix.runner }} - docker-image: ${{ matrix.docker-image }} + docker-image: ci-image:${{ matrix.docker-image }} submodules: recursive timeout: 90 script: | diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index 8e5519d33ef..3d24f353e26 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -26,7 +26,7 @@ jobs: with: job-name: Build doc runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12-android + docker-image: ci-image:executorch-ubuntu-22.04-clang12-android submodules: 'recursive' repository: pytorch/executorch upload-artifact: docs diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 791a52b96c1..fcfa8546eb4 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -40,7 +40,7 @@ jobs: executorch-ubuntu-22.04-qnn-sdk, executorch-ubuntu-22.04-mediatek-sdk, executorch-ubuntu-22.04-clang12-android - ] + ] include: - docker-image-name: executorch-ubuntu-22.04-gcc11-aarch64 runner: linux.arm64.2xlarge @@ -71,7 +71,7 @@ jobs: id: build-docker-image uses: pytorch/test-infra/.github/actions/calculate-docker-image@main with: - docker-image-name: ${{ matrix.docker-image-name }} + docker-image-name: ci-image:${{ matrix.docker-image-name }} always-rebuild: true push: true force-push: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fc896c5e970..e30d5390df4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,7 +22,7 @@ jobs: contents: read with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-linter + docker-image: ci-image:executorch-ubuntu-22.04-linter submodules: 'recursive' fetch-depth: 0 ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -76,7 +76,7 @@ jobs: contents: read with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-linter + docker-image: ci-image:executorch-ubuntu-22.04-linter fetch-depth: 0 ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 diff --git a/.github/workflows/periodic.yml b/.github/workflows/periodic.yml index 59b3a522954..89e1692df97 100644 --- a/.github/workflows/periodic.yml +++ b/.github/workflows/periodic.yml @@ -49,7 +49,7 @@ jobs: fail-fast: false with: runner: ${{ matrix.runner }} - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: ${{ matrix.timeout }} diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 88a82d1a4b3..9e621329049 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-gcc9 + docker-image: ci-image:executorch-ubuntu-22.04-gcc9 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -65,7 +65,7 @@ jobs: fail-fast: false with: runner: ${{ matrix.runner }} - docker-image: ${{ matrix.docker-image }} + docker-image: ci-image:${{ matrix.docker-image }} submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -118,7 +118,7 @@ jobs: fail-fast: false with: runner: ${{ matrix.runner }} - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -164,7 +164,7 @@ jobs: fail-fast: false with: runner: ${{ matrix.runner }} - docker-image: ${{ matrix.docker-image }} + docker-image: ci-image:${{ matrix.docker-image }} submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 900 @@ -196,7 +196,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12-android + docker-image: ci-image:executorch-ubuntu-22.04-clang12-android submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -221,7 +221,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -245,7 +245,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -269,7 +269,7 @@ jobs: fail-fast: false with: runner: linux.24xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -300,7 +300,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -330,7 +330,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -353,7 +353,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-gcc9 + docker-image: ci-image:executorch-ubuntu-22.04-gcc9 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -389,7 +389,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -428,7 +428,7 @@ jobs: with: build-mode: Debug build-tool: cmake - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 unittest-editable: uses: ./.github/workflows/_unittest.yml @@ -439,7 +439,7 @@ jobs: build-mode: Debug build-tool: cmake editable: true - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 unittest-buck: uses: ./.github/workflows/_unittest.yml @@ -449,7 +449,7 @@ jobs: with: build-mode: Debug build-tool: buck2 - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 unittest-arm-backend-with-no-fvp: name: unittest-arm-backend-with-no-fvp @@ -465,7 +465,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-arm-sdk + docker-image: ci-image:executorch-ubuntu-22.04-arm-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -498,7 +498,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-qnn-sdk + docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 900 @@ -533,7 +533,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-qnn-sdk + docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 180 @@ -566,7 +566,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-qnn-sdk + docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 180 @@ -588,7 +588,7 @@ jobs: fail-fast: false with: runner: linux.24xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -615,7 +615,7 @@ jobs: fail-fast: false with: runner: linux.24xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -642,7 +642,7 @@ jobs: fail-fast: false with: runner: linux.24xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -669,7 +669,7 @@ jobs: fail-fast: false with: runner: linux.24xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -696,7 +696,7 @@ jobs: fail-fast: false with: runner: linux.24xlarge - docker-image: executorch-ubuntu-22.04-mediatek-sdk + docker-image: ci-image:executorch-ubuntu-22.04-mediatek-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -723,7 +723,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-gcc9 + docker-image: ci-image:executorch-ubuntu-22.04-gcc9 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -745,7 +745,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -770,7 +770,7 @@ jobs: contents: read with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -791,8 +791,8 @@ jobs: # Run pytest PYTHON_EXECUTABLE=python bash backends/nxp/run_unittests.sh - - # Run aot example: + + # Run aot example: PYTHON_EXECUTABLE=python bash examples/nxp/run_aot_example.sh @@ -804,7 +804,7 @@ jobs: contents: read with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-arm-sdk + docker-image: ci-image:executorch-ubuntu-22.04-arm-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index bb55bdb41eb..753033d73a7 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -88,7 +88,7 @@ jobs: fail-fast: false with: runner: ${{ matrix.runner }} - docker-image: executorch-ubuntu-22.04-gcc11-aarch64 + docker-image: ci-image:executorch-ubuntu-22.04-gcc11-aarch64 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -163,7 +163,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} script: | @@ -194,7 +194,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge.memory - docker-image: executorch-ubuntu-22.04-arm-sdk + docker-image: ci-image:executorch-ubuntu-22.04-arm-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 120 @@ -229,7 +229,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-arm-sdk + docker-image: ci-image:executorch-ubuntu-22.04-arm-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -310,7 +310,7 @@ jobs: contents: read with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-arm-sdk + docker-image: ci-image:executorch-ubuntu-22.04-arm-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -430,7 +430,7 @@ jobs: fail-fast: false with: runner: ${{ matrix.runner }} - docker-image: ${{ matrix.docker-image }} + docker-image: ci-image:${{ matrix.docker-image }} submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 900 @@ -529,7 +529,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-qnn-sdk + docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 900 @@ -555,7 +555,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-qnn-sdk + docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 900 @@ -623,7 +623,7 @@ jobs: with: secrets-env: EXECUTORCH_HF_TOKEN runner: linux.2xlarge.memory - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12 submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 90 @@ -738,7 +738,7 @@ jobs: fail-fast: false with: runner: linux.2xlarge - docker-image: executorch-ubuntu-22.04-qnn-sdk + docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk submodules: 'recursive' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout: 900 @@ -771,4 +771,4 @@ jobs: with: build-mode: Release build-tool: cmake - docker-image: executorch-ubuntu-22.04-clang12 + docker-image: ci-image:executorch-ubuntu-22.04-clang12