diff --git a/.github/scripts/validate_binaries.sh b/.github/scripts/validate_binaries.sh index 631f21385..8dc7e52e6 100755 --- a/.github/scripts/validate_binaries.sh +++ b/.github/scripts/validate_binaries.sh @@ -29,6 +29,11 @@ else INSTALLATION=${INSTALLATION/"torch "/"torch==${RELEASE_VERSION} "} INSTALLATION=${INSTALLATION/"-y pytorch "/"-y pytorch==${RELEASE_VERSION} "} INSTALLATION=${INSTALLATION/"::pytorch "/"::pytorch==${RELEASE_VERSION} "} + + if [[ ${USE_VERSION_SET} == 'true' ]]; then + INSTALLATION=${INSTALLATION/"torchvision "/"torchvision==${VISION_RELEASE_VERSION} "} + INSTALLATION=${INSTALLATION/"torchaudio "/"torchaudio==${AUDIO_RELEASE_VERSION} "} + fi fi export OLD_PATH=${PATH} diff --git a/.github/workflows/validate-aarch64-linux-binaries.yml b/.github/workflows/validate-aarch64-linux-binaries.yml index 55f0edf17..4afdf9f6d 100644 --- a/.github/workflows/validate-aarch64-linux-binaries.yml +++ b/.github/workflows/validate-aarch64-linux-binaries.yml @@ -115,6 +115,12 @@ jobs: export TORCH_ONLY=${{ inputs.torchonly }} export RELEASE_VERSION=${{ inputs.version }} export USE_FORCE_REINSTALL=${{ inputs.use-force-reinstall }} + export USE_VERSION_SET=${{ inputs.use-version-set }} + if [[ ${USE_VERSION_SET} == 'true' ]]; then + export VISION_RELEASE_VERSION = ${{ inputs.release-matrix.torchvision }} + export AUDIO_RELEASE_VERSION = ${{ inputs.release-matrix.torchaudio }} + fi + printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json eval "$(conda shell.bash hook)" diff --git a/.github/workflows/validate-binaries.yml b/.github/workflows/validate-binaries.yml index ec7e3f9fe..816a4dde6 100644 --- a/.github/workflows/validate-binaries.yml +++ b/.github/workflows/validate-binaries.yml @@ -80,6 +80,11 @@ on: default: "" required: false type: string + use-version-set: + description: 'Applies when version is used, use version for each domain' + default: false + required: false + type: boolean include-test-ops: description: 'Include Test Ops tests (only Linux)' default: false @@ -112,6 +117,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} + use-version-set: ${{ inputs.use-version-set }} release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }} use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }} use-force-reinstall: ${{ inputs.use-force-reinstall }} @@ -125,6 +131,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} + use-version-set: ${{ inputs.use-version-set }} release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }} include-test-ops: ${{ inputs.include-test-ops }} use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }} @@ -139,6 +146,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} + use-version-set: ${{ inputs.use-version-set }} release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }} use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }} use-force-reinstall: ${{ inputs.use-force-reinstall }} @@ -152,6 +160,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} + use-version-set: ${{ inputs.use-version-set }} release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }} use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }} use-force-reinstall: ${{ inputs.use-force-reinstall }} diff --git a/.github/workflows/validate-domain-library.yml b/.github/workflows/validate-domain-library.yml index 149b8335b..6d117109a 100644 --- a/.github/workflows/validate-domain-library.yml +++ b/.github/workflows/validate-domain-library.yml @@ -57,14 +57,6 @@ jobs: os: windows channel: ${{ inputs.channel }} with-cuda: ${{ inputs.with_cuda }} - generate-macos-matrix: - if: (inputs.os == 'macos' || inputs.os == 'all') - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main - with: - package-type: ${{ inputs.package_type }} - os: macos - channel: ${{ inputs.channel }} - with-cuda: ${{ inputs.with_cuda }} generate-macos-arm64-matrix: if: (inputs.os == 'macos-arm64' || inputs.os == 'all') uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index 15799901c..512d18668 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -22,6 +22,11 @@ on: default: "" required: false type: string + use-version-set: + description: 'Applies when version is used, use version for each domain' + default: false + required: false + type: boolean release-matrix: description: 'Release matrix - optional' default: "" @@ -68,6 +73,11 @@ on: default: "" required: false type: string + use-version-set: + description: 'Applies when version is used, use version for each domain' + default: false + required: false + type: boolean release-matrix: description: 'Release matrix - optional' default: "" @@ -119,6 +129,12 @@ jobs: export INCLUDE_TEST_OPS=${{ inputs.include-test-ops }} export USE_ONLY_DL_PYTORCH_ORG=${{ inputs.use-only-dl-pytorch-org }} export RELEASE_VERSION=${{ inputs.version }} + export USE_VERSION_SET=${{ inputs.use-version-set }} + if [[ ${USE_VERSION_SET} == 'true' ]]; then + export VISION_RELEASE_VERSION = ${{ inputs.release-matrix.torchvision }} + export AUDIO_RELEASE_VERSION = ${{ inputs.release-matrix.torchaudio }} + fi + export USE_FORCE_REINSTALL=${{ inputs.use-force-reinstall }} export TARGET_OS="linux" eval "$(conda shell.bash hook)" diff --git a/.github/workflows/validate-macos-arm64-binaries.yml b/.github/workflows/validate-macos-arm64-binaries.yml index 4667b52e4..561fa9c37 100644 --- a/.github/workflows/validate-macos-arm64-binaries.yml +++ b/.github/workflows/validate-macos-arm64-binaries.yml @@ -22,6 +22,11 @@ on: default: "" required: false type: string + use-version-set: + description: 'Applies when version is used, use version for each domain' + default: false + required: false + type: boolean release-matrix: description: 'Release matrix - optional' default: "" @@ -63,6 +68,11 @@ on: default: "" required: false type: string + use-version-set: + description: 'Applies when version is used, use version for each domain' + default: false + required: false + type: boolean release-matrix: description: 'Release matrix - optional' default: "" @@ -108,6 +118,11 @@ jobs: export TORCH_ONLY=${{ inputs.torchonly }} export RELEASE_VERSION=${{ inputs.version }} export USE_FORCE_REINSTALL=${{ inputs.use-force-reinstall }} + export USE_VERSION_SET=${{ inputs.use-version-set }} + if [[ ${USE_VERSION_SET} == 'true' ]]; then + export VISION_RELEASE_VERSION = ${{ inputs.release-matrix.torchvision }} + export AUDIO_RELEASE_VERSION = ${{ inputs.release-matrix.torchaudio }} + fi printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json source ./.github/scripts/validate_binaries.sh diff --git a/.github/workflows/validate-windows-binaries.yml b/.github/workflows/validate-windows-binaries.yml index a287e3ecd..01782f3e2 100644 --- a/.github/workflows/validate-windows-binaries.yml +++ b/.github/workflows/validate-windows-binaries.yml @@ -22,6 +22,11 @@ on: default: "" required: false type: string + use-version-set: + description: 'Applies when version is used, use version for each domain' + default: false + required: false + type: boolean release-matrix: description: 'Release matrix - optional' default: "" @@ -63,6 +68,11 @@ on: default: "" required: false type: string + use-version-set: + description: 'Applies when version is used, use version for each domain' + default: false + required: false + type: boolean release-matrix: description: 'Release matrix - optional' default: "" @@ -109,6 +119,11 @@ jobs: export TORCH_ONLY=${{ inputs.torchonly }} export RELEASE_VERSION=${{ inputs.version }} export USE_FORCE_REINSTALL=${{ inputs.use-force-reinstall }} + export USE_VERSION_SET=${{ inputs.use-version-set }} + if [[ ${USE_VERSION_SET} == 'true' ]]; then + export VISION_RELEASE_VERSION = ${{ inputs.release-matrix.torchvision }} + export AUDIO_RELEASE_VERSION = ${{ inputs.release-matrix.torchaudio }} + fi printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json source /c/Jenkins/Miniconda3/etc/profile.d/conda.sh