From a8e3ce9770605788edca195414cea931b51383c5 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 27 Feb 2025 15:41:10 -0800 Subject: [PATCH] Remove manylinux 2014 images --- .ci/magma/Makefile | 2 +- .circleci/scripts/binary_populate_env.sh | 4 +- .github/workflows/build-manywheel-images.yml | 81 -------------------- 3 files changed, 3 insertions(+), 84 deletions(-) diff --git a/.ci/magma/Makefile b/.ci/magma/Makefile index 2273cb761a795..17c62b71d4e2a 100644 --- a/.ci/magma/Makefile +++ b/.ci/magma/Makefile @@ -12,7 +12,7 @@ DOCKER_RUN = set -eou pipefail; ${DOCKER_CMD} run --rm -i \ -e PACKAGE_NAME=${PACKAGE_NAME}${DESIRED_CUDA_SHORT} \ -e DESIRED_CUDA=${DESIRED_CUDA} \ -e CUDA_ARCH_LIST="${CUDA_ARCH_LIST}" \ - "pytorch/manylinux-builder:cuda${DESIRED_CUDA}-main" \ + "pytorch/manylinux2_28-builder:cuda${DESIRED_CUDA}-main" \ magma/build_magma.sh .PHONY: all diff --git a/.circleci/scripts/binary_populate_env.sh b/.circleci/scripts/binary_populate_env.sh index cb6096ae32c4d..7d97ecba505a0 100755 --- a/.circleci/scripts/binary_populate_env.sh +++ b/.circleci/scripts/binary_populate_env.sh @@ -31,9 +31,9 @@ fi export DOCKER_IMAGE=${DOCKER_IMAGE:-} if [[ -z "$DOCKER_IMAGE" ]]; then if [[ "$DESIRED_CUDA" == cpu ]]; then - export DOCKER_IMAGE="pytorch/manylinux:cpu" + export DOCKER_IMAGE="pytorch/manylinux2_28:cpu" else - export DOCKER_IMAGE="pytorch/manylinux-builder:${DESIRED_CUDA:2}" + export DOCKER_IMAGE="pytorch/manylinux2_28-builder:${DESIRED_CUDA:2}" fi fi diff --git a/.github/workflows/build-manywheel-images.yml b/.github/workflows/build-manywheel-images.yml index d8b3b0fab1d5f..f695820b25936 100644 --- a/.github/workflows/build-manywheel-images.yml +++ b/.github/workflows/build-manywheel-images.yml @@ -43,51 +43,6 @@ jobs: curr_branch: ${{ github.head_ref || github.ref_name }} curr_ref_type: ${{ github.ref_type }} - build-docker-cuda: - environment: ${{ (github.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/tags/v')) && 'docker-build' || '' }} - needs: get-label-type - runs-on: "${{ needs.get-label-type.outputs.label-type }}linux.9xlarge.ephemeral" - strategy: - matrix: - cuda_version: ["12.8", "12.6", "12.4", "11.8"] - env: - GPU_ARCH_TYPE: cuda - GPU_ARCH_VERSION: ${{ matrix.cuda_version }} - steps: - - name: Purge tools folder (free space for build) - run: rm -rf /opt/hostedtoolcache - - name: Checkout PyTorch - uses: pytorch/pytorch/.github/actions/checkout-pytorch@main - with: - submodules: false - - name: Calculate docker image - if: env.WITH_PUSH == 'false' - uses: pytorch/test-infra/.github/actions/calculate-docker-image@main - with: - docker-image-name: manylinux-builder-cuda${{matrix.cuda_version}} - docker-build-dir: .ci/docker/manywheel - always-rebuild: true - push: true - - name: Authenticate if WITH_PUSH - if: env.WITH_PUSH == 'true' - env: - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - DOCKER_ID: ${{ secrets.DOCKER_ID }} - run: | - if [[ "${WITH_PUSH}" == true ]]; then - echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_ID}" --password-stdin - fi - - name: Build Docker Image - if: env.WITH_PUSH == 'true' - uses: nick-fields/retry@v3.0.0 - with: - shell: bash - timeout_minutes: 90 - max_attempts: 3 - retry_wait_seconds: 90 - command: | - .ci/docker/manywheel/build.sh manylinux-builder:cuda${{matrix.cuda_version}} - # NOTE: manylinux_2_28 are still experimental, see https://github.com/pytorch/pytorch/issues/123649 build-docker-cuda-manylinux_2_28: environment: ${{ (github.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/tags/v')) && 'docker-build' || '' }} needs: get-label-type @@ -214,42 +169,6 @@ jobs: retry_wait_seconds: 90 command: | .ci/docker/manywheel/build.sh manylinux2_28-builder:rocm${{matrix.rocm_version}} - build-docker-cpu: - environment: ${{ (github.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/tags/v')) && 'docker-build' || '' }} - needs: get-label-type - runs-on: "${{ needs.get-label-type.outputs.label-type }}linux.9xlarge.ephemeral" - steps: - - name: Checkout PyTorch - uses: pytorch/pytorch/.github/actions/checkout-pytorch@main - with: - submodules: false - - name: Calculate docker image - if: env.WITH_PUSH == 'false' - uses: pytorch/test-infra/.github/actions/calculate-docker-image@main - with: - docker-image-name: manylinux-builder-cpu - docker-build-dir: .ci/docker/manywheel - always-rebuild: true - push: true - - name: Authenticate if WITH_PUSH - if: env.WITH_PUSH == 'true' - env: - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - DOCKER_ID: ${{ secrets.DOCKER_ID }} - run: | - if [[ "${WITH_PUSH}" == true ]]; then - echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_ID}" --password-stdin - fi - - name: Build Docker Image - if: env.WITH_PUSH == 'true' - uses: nick-fields/retry@v3.0.0 - with: - shell: bash - timeout_minutes: 90 - max_attempts: 3 - retry_wait_seconds: 90 - command: | - .ci/docker/manywheel/build.sh manylinux-builder:cpu build-docker-cpu-manylinux_2_28: environment: ${{ (github.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/tags/v')) && 'docker-build' || '' }} needs: get-label-type