From 675d037e948e1ea08635abf428fd73ba4b997a86 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 09:19:05 -0800 Subject: [PATCH 1/3] test --- .github/workflows/validate-linux-binaries.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index 9078fbb26..e19d7d63a 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -58,6 +58,7 @@ jobs: os: linux channel: ${{ inputs.channel }} generate-release-matrix: + needs: generate-linux-matrix uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main with: version: ${{ inputs.version }} From 3f9e7222a7e97457e640471280022c52311a1925 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 10:01:54 -0800 Subject: [PATCH 2/3] test --- .../validate-aarch64-linux-binaries.yml | 18 +++++++++++------ .github/workflows/validate-binaries.yml | 17 +++++++++++++++- .github/workflows/validate-linux-binaries.yml | 20 +++++++++++-------- .../validate-macos-arm64-binaries.yml | 19 +++++++++++------- .github/workflows/validate-macos-binaries.yml | 19 +++++++++++------- .../workflows/validate-windows-binaries.yml | 19 +++++++++++------- 6 files changed, 76 insertions(+), 36 deletions(-) diff --git a/.github/workflows/validate-aarch64-linux-binaries.yml b/.github/workflows/validate-aarch64-linux-binaries.yml index 11973633e..14b7b6395 100644 --- a/.github/workflows/validate-aarch64-linux-binaries.yml +++ b/.github/workflows/validate-aarch64-linux-binaries.yml @@ -22,6 +22,11 @@ on: default: "" required: false type: string + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string workflow_dispatch: inputs: channel: @@ -48,6 +53,11 @@ on: default: "" required: false type: string + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string jobs: generate-aarch64-linux-matrix: @@ -57,12 +67,8 @@ jobs: os: linux-aarch64 channel: ${{ inputs.channel }} with-cuda: disable - generate-release-matrix: - uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main - with: - version: ${{ inputs.version }} linux-aarch64: - needs: [generate-aarch64-linux-matrix, generate-release-matrix] + needs: generate-aarch64-linux-matrix strategy: matrix: ${{ fromJson(needs.generate-aarch64-linux-matrix.outputs.matrix) }} fail-fast: false @@ -86,7 +92,7 @@ jobs: export TARGET_OS="linux-aarch64" export TORCH_ONLY=${{ inputs.torchonly }} export RELEASE_VERSION=${{ inputs.version }} - printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json + printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json eval "$(conda shell.bash hook)" # Standart case: Validate binaries diff --git a/.github/workflows/validate-binaries.yml b/.github/workflows/validate-binaries.yml index e122f7e57..2aab96222 100644 --- a/.github/workflows/validate-binaries.yml +++ b/.github/workflows/validate-binaries.yml @@ -61,54 +61,69 @@ on: required: false type: boolean version: - description: 'Version to validate - optional' + description: 'Version to validate' default: "" required: false type: string jobs: + generate-release-matrix: + uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main + with: + version: ${{ inputs.version }} + win: if: inputs.os == 'windows' || inputs.os == 'all' + needs: generate-release-matrix uses: ./.github/workflows/validate-windows-binaries.yml with: channel: ${{ inputs.channel }} ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} + release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} linux: if: inputs.os == 'linux' || inputs.os == 'all' + needs: generate-release-matrix uses: ./.github/workflows/validate-linux-binaries.yml with: channel: ${{ inputs.channel }} ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} + release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} linux-aarch64: if: inputs.os == 'linux-aarch64' + needs: generate-release-matrix uses: ./.github/workflows/validate-aarch64-linux-binaries.yml with: channel: ${{ inputs.channel }} ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} + release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} mac: if: inputs.os == 'macos' || inputs.os == 'all' + needs: generate-release-matrix uses: ./.github/workflows/validate-macos-binaries.yml with: channel: ${{ inputs.channel }} ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} + release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} mac-arm64: if: inputs.os == 'macos' || inputs.os == 'all' + needs: generate-release-matrix uses: ./.github/workflows/validate-macos-arm64-binaries.yml with: channel: ${{ inputs.channel }} ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} + release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index e19d7d63a..8bf2b9c71 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 + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string workflow_dispatch: inputs: channel: @@ -48,7 +53,11 @@ on: default: "" required: false type: string - + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string jobs: generate-linux-matrix: @@ -57,14 +66,9 @@ jobs: package-type: all os: linux channel: ${{ inputs.channel }} - generate-release-matrix: - needs: generate-linux-matrix - uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main - with: - version: ${{ inputs.version }} linux: - needs: [generate-linux-matrix, generate-release-matrix] + needs: generate-linux-matrix strategy: matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} fail-fast: false @@ -83,7 +87,7 @@ jobs: export RELEASE_VERSION=${{ inputs.version }} export TARGET_OS="linux" eval "$(conda shell.bash hook)" - printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json + printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json # Special case PyPi installation package. And Install of PyPi package via poetry if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" && ${MATRIX_GPU_ARCH_VERSION} == "12.1" ]]; then diff --git a/.github/workflows/validate-macos-arm64-binaries.yml b/.github/workflows/validate-macos-arm64-binaries.yml index 4d6f7b12f..541183b9a 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 + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string workflow_dispatch: inputs: channel: @@ -48,6 +53,11 @@ on: default: "" required: false type: string + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string jobs: generate-macos-arm64-matrix: @@ -56,13 +66,8 @@ jobs: package-type: all os: macos-arm64 channel: ${{ inputs.channel }} - generate-release-matrix: - needs: generate-macos-arm64-matrix - uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main - with: - version: ${{ inputs.version }} macos-arm64: - needs: [generate-macos-arm64-matrix, generate-release-matrix] + needs: generate-macos-arm64-matrix strategy: matrix: ${{ fromJson(needs.generate-macos-arm64-matrix.outputs.matrix) }} fail-fast: false @@ -80,5 +85,5 @@ jobs: export TARGET_OS="macos-arm64" export TORCH_ONLY=${{ inputs.torchonly }} export RELEASE_VERSION=${{ inputs.version }} - printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json + printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json source ./.github/scripts/validate_binaries.sh diff --git a/.github/workflows/validate-macos-binaries.yml b/.github/workflows/validate-macos-binaries.yml index 2b388dde0..9610b36f7 100644 --- a/.github/workflows/validate-macos-binaries.yml +++ b/.github/workflows/validate-macos-binaries.yml @@ -22,6 +22,11 @@ on: default: "" required: false type: string + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string workflow_dispatch: inputs: channel: @@ -48,6 +53,11 @@ on: default: "" required: false type: string + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string jobs: generate-macos-matrix: @@ -56,13 +66,8 @@ jobs: package-type: all os: macos channel: ${{ inputs.channel }} - generate-release-matrix: - needs: generate-macos-matrix - uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main - with: - version: ${{ inputs.version }} macos: - needs: [generate-macos-matrix, generate-release-matrix] + needs: generate-macos-matrix strategy: matrix: ${{ fromJson(needs.generate-macos-matrix.outputs.matrix) }} fail-fast: false @@ -80,5 +85,5 @@ jobs: export TARGET_OS="macos" export TORCH_ONLY=${{ inputs.torchonly }} export RELEASE_VERSION=${{ inputs.version }} - printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json + 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 97a199eb8..1c501cfb3 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 + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string workflow_dispatch: inputs: channel: @@ -48,6 +53,11 @@ on: default: "" required: false type: string + release-matrix: + description: 'Release matrix - optional' + default: "" + required: false + type: string jobs: generate-windows-matrix: @@ -56,13 +66,8 @@ jobs: package-type: all os: windows channel: ${{ inputs.channel }} - generate-release-matrix: - needs: generate-windows-matrix - uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main - with: - version: ${{ inputs.version }} win: - needs: [generate-windows-matrix, generate-release-matrix] + needs: generate-windows-matrix strategy: matrix: ${{ fromJson(needs.generate-windows-matrix.outputs.matrix) }} fail-fast: false @@ -81,7 +86,7 @@ jobs: export TARGET_OS="windows" export TORCH_ONLY=${{ inputs.torchonly }} export RELEASE_VERSION=${{ inputs.version }} - printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json + printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json source /c/Jenkins/Miniconda3/etc/profile.d/conda.sh if [[ ${MATRIX_GPU_ARCH_VERSION} == "12.1" ]]; then ./windows/internal/driver_update.bat From 0ae20d5dfb25eb16e1baedab757408e9e765c284 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 10:09:05 -0800 Subject: [PATCH 3/3] test --- .github/workflows/validate-binaries.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/validate-binaries.yml b/.github/workflows/validate-binaries.yml index 2aab96222..1198b88d1 100644 --- a/.github/workflows/validate-binaries.yml +++ b/.github/workflows/validate-binaries.yml @@ -82,7 +82,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} + release-matrix: ${{ fromJson(needs.generate-release-matrix.outputs.matrix) }} linux: if: inputs.os == 'linux' || inputs.os == 'all' @@ -93,7 +93,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} + release-matrix: ${{ fromJson(needs.generate-release-matrix.outputs.matrix) }} linux-aarch64: if: inputs.os == 'linux-aarch64' @@ -104,7 +104,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} + release-matrix: ${{ fromJson(needs.generate-release-matrix.outputs.matrix) }} mac: if: inputs.os == 'macos' || inputs.os == 'all' @@ -115,7 +115,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} + release-matrix: ${{ fromJson(needs.generate-rlease-matrix.outputs.matrix) }} mac-arm64: if: inputs.os == 'macos' || inputs.os == 'all' @@ -126,4 +126,4 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }} + release-matrix: ${{ fromJson(needs.generate-release-matrix.outputs.matrix) }}