@@ -31,36 +31,93 @@ jobs:
3131 strategy :
3232 fail-fast : false
3333 matrix :
34+ # Main matrix from generate-matrix job
35+ standard-config : [true]
36+
37+ # Specific x64 configurations with multiple Python versions
38+ python-version : [null, '3.12']
39+ aarch : [null, 'x64']
40+
41+ # Filter combinations to either use standard config or x64 specific configs
42+ exclude :
43+ # Exclude null values for standard config
44+ - standard-config : true
45+ python-version : null
46+ - standard-config : true
47+ aarch : null
48+ # Exclude x64 configs when using standard config
49+ - standard-config : true
50+ aarch : x64
51+
3452 include :
35- # Standard matrix configuration from the original build job
36- - repository : pytorch/vision
53+ # Standard matrix configuration details
54+ - standard-config : true
55+ repository : pytorch/vision
3756 pre-script : packaging/pre_build_script.sh
3857 env-script : packaging/windows/internal/vc_env_helper.bat
3958 post-script : " python packaging/wheel/relocate.py"
4059 smoke-test-script : test/smoke_test.py
4160 package-name : torchvision
42- # Special x64 configuration from the original build-x64-test job
43- - repository : pytorch/vision
61+
62+ # Add common properties to all x64 configurations
63+ - aarch : x64
64+ repository : pytorch/vision
4465 smoke-test-script : test/smoke_test.py
4566 package-name : torchvision
46- python-version : ' 3.12 '
47- aarch : ' x64 '
48- test-infra-repository : ' alinpahontu2912/test-infra '
49- test-infra-ref : ' x64windows_test '
50- name : ${{ matrix.repository }}${{ matrix.aarch && format(' ({0 })', matrix.aarch) || '' }}
67+ test-infra-repository : alinpahontu2912/test-infra
68+ test-infra-ref : x64windows_test
69+ standard-config : false
70+
71+ name : ${{ matrix.standard-config && matrix.repository || format('{0} (x64-py{1 })', matrix.repository, matrix.python-version) }}
5172 uses : alinpahontu2912/test-infra/.github/workflows/build_wheels_windows.yml@x64windows_test
5273 with :
5374 repository : ${{ matrix.repository }}
5475 ref : " "
5576 test-infra-repository : ${{ matrix.test-infra-repository || 'pytorch/test-infra' }}
5677 test-infra-ref : ${{ matrix.test-infra-ref || 'main' }}
57- build-matrix : ${{ ! matrix.aarch && needs.generate-matrix.outputs.matrix || toJson(matrix) }}
78+ build-matrix : ${{ matrix.standard-config && needs.generate-matrix.outputs.matrix || toJson(matrix) }}
5879 pre-script : ${{ matrix.pre-script }}
5980 env-script : ${{ matrix.env-script }}
6081 post-script : ${{ matrix.post-script }}
6182 package-name : ${{ matrix.package-name }}
6283 smoke-test-script : ${{ matrix.smoke-test-script }}
6384 trigger-event : ${{ github.event_name }}
85+
86+ # build:
87+ # needs: generate-matrix
88+ # strategy:
89+ # fail-fast: false
90+ # matrix:
91+ # include:
92+ # # Standard matrix configuration from the original build job
93+ # - repository: pytorch/vision
94+ # pre-script: packaging/pre_build_script.sh
95+ # env-script: packaging/windows/internal/vc_env_helper.bat
96+ # post-script: "python packaging/wheel/relocate.py"
97+ # smoke-test-script: test/smoke_test.py
98+ # package-name: torchvision
99+ # # Special x64 configuration from the original build-x64-test job
100+ # - repository: pytorch/vision
101+ # smoke-test-script: test/smoke_test.py
102+ # package-name: torchvision
103+ # python-version: '3.12'
104+ # aarch: 'x64'
105+ # test-infra-repository: 'alinpahontu2912/test-infra'
106+ # test-infra-ref: 'x64windows_test'
107+ # name: ${{ matrix.repository }}${{ matrix.aarch && format(' ({0})', matrix.aarch) || '' }}
108+ # uses: alinpahontu2912/test-infra/.github/workflows/build_wheels_windows.yml@x64windows_test
109+ # with:
110+ # repository: ${{ matrix.repository }}
111+ # ref: ""
112+ # test-infra-repository: ${{ matrix.test-infra-repository || 'pytorch/test-infra' }}
113+ # test-infra-ref: ${{ matrix.test-infra-ref || 'main' }}
114+ # build-matrix: ${{ !matrix.aarch && needs.generate-matrix.outputs.matrix || toJson(matrix) }}
115+ # pre-script: ${{ matrix.pre-script }}
116+ # env-script: ${{ matrix.env-script }}
117+ # post-script: ${{ matrix.post-script }}
118+ # package-name: ${{ matrix.package-name }}
119+ # smoke-test-script: ${{ matrix.smoke-test-script }}
120+ # trigger-event: ${{ github.event_name }}
64121
65122# jobs:
66123# build-x64-test:
0 commit comments