diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index 3c5aac2eb..e457bf69d 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -46,9 +46,14 @@ jobs: package-type: all os: linux channel: ${{ inputs.channel }} + generate-release-matrix: + needs: generate-release-matrix + uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main + with: + version: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix).[0].stable_version }} linux: - needs: generate-linux-matrix + needs: generate-linux-matrix. generate-release-matrix strategy: matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} fail-fast: false diff --git a/release/pypi/promote_pypi_to_staging.sh b/release/pypi/promote_pypi_to_staging.sh index 678d9dd03..a9dbe535b 100644 --- a/release/pypi/promote_pypi_to_staging.sh +++ b/release/pypi/promote_pypi_to_staging.sh @@ -34,13 +34,13 @@ PLATFORM="${MACOS_X86_64}" VERSION_SUFFIX="" PLATFORM="${MACOS_ARM64}" VERSION_SUFFIX="" upload_pypi_to_staging torch "${PYTORCH_VERSION}" # m1 mac PLATFORM="linux_x86_64" VERSION_SUFFIX="${LINUX_VERSION_SUFFIX}" upload_pypi_to_staging torchvision "${TORCHVISION_VERSION}" -PLATFORM="manylinux2014_aarch64" VERSION_SUFFIX="" upload_pypi_to_staging torchvision "${TORCHVISION_VERSION}" +PLATFORM="linux_aarch64" VERSION_SUFFIX="" upload_pypi_to_staging torchvision "${TORCHVISION_VERSION}" PLATFORM="win_amd64" VERSION_SUFFIX="${WIN_VERSION_SUFFIX}" upload_pypi_to_staging torchvision "${TORCHVISION_VERSION}" PLATFORM="${MACOS_X86_64}" VERSION_SUFFIX="" upload_pypi_to_staging torchvision "${TORCHVISION_VERSION}" PLATFORM="${MACOS_ARM64}" VERSION_SUFFIX="" upload_pypi_to_staging torchvision "${TORCHVISION_VERSION}" PLATFORM="linux_x86_64" VERSION_SUFFIX="${LINUX_VERSION_SUFFIX}" upload_pypi_to_staging torchaudio "${TORCHAUDIO_VERSION}" -PLATFORM="manylinux2014_aarch64" VERSION_SUFFIX="" upload_pypi_to_staging torchaudio "${TORCHAUDIO_VERSION}" +PLATFORM="linux_aarch64" VERSION_SUFFIX="" upload_pypi_to_staging torchaudio "${TORCHAUDIO_VERSION}" PLATFORM="win_amd64" VERSION_SUFFIX="${WIN_VERSION_SUFFIX}" upload_pypi_to_staging torchaudio "${TORCHAUDIO_VERSION}" PLATFORM="${MACOS_X86_64}" VERSION_SUFFIX="" upload_pypi_to_staging torchaudio "${TORCHAUDIO_VERSION}" PLATFORM="${MACOS_ARM64}" VERSION_SUFFIX="" upload_pypi_to_staging torchaudio "${TORCHAUDIO_VERSION}" diff --git a/release/pypi/upload_pypi_to_staging.sh b/release/pypi/upload_pypi_to_staging.sh index a9573eac2..250b231f9 100644 --- a/release/pypi/upload_pypi_to_staging.sh +++ b/release/pypi/upload_pypi_to_staging.sh @@ -42,10 +42,16 @@ fi for pkg in ${pkgs_to_promote}; do pkg_basename="$(basename "${pkg}")" - # Don't attempt to change if manylinux2014 - if [[ "${pkg}" != *manylinux2014* ]]; then + + if [[ "${pkg}" != *aarch64* ]]; then # sub out linux for manylinux1 pkg_basename="$(basename "${pkg//linux/manylinux1}")" + elif [[ "${pkg}" == *manylinux_2_17_aarch64* ]]; then + # strip manylinux_2_17 from core filename + pkg_basename="$(basename "${pkg//manylinux_2_17_aarch64./}")" + elif [[ "${pkg}" == *linux_aarch64* ]]; then + # domains change linux_aarch64 to manylinux2014_aarch64 + pkg_basename="$(basename "${pkg//linux_aarch64/manylinux2014_aarch64}")" fi orig_pkg="${tmp_dir}/${pkg_basename}" (