Skip to content

Commit 3dd5b5a

Browse files
authored
Merge branch 'main' into etiotto.remove_masks
2 parents 7034506 + 31386a6 commit 3dd5b5a

38 files changed

+481
-89
lines changed

.github/workflows/bandit-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
bandit -c bandit.yaml -r ./benchmarks/ ./scripts/ ./third_party/intel/ --exit-zero -f html -o bandit_report.html
3333
3434
- name: Upload report to artifacts
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v5
3636
with:
3737
name: Bandit Report
3838
path: bandit_report.html

.github/workflows/build-test-reusable.yml

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ jobs:
127127
DEBUG=1
128128
python -m build --wheel --no-isolation && pip install dist/*.whl
129129
130+
- name: Build PTI
131+
run: |
132+
./scripts/install-pti.sh --build-level-zero
133+
130134
- name: Set test-triton command line
131135
id: test-triton
132136
run: |
@@ -170,13 +174,19 @@ jobs:
170174
dest: ${{ steps.pip-cache.outputs.dest }}
171175

172176
- name: Upload Triton wheels
173-
uses: actions/upload-artifact@v4
177+
uses: actions/upload-artifact@v5
174178
with:
175179
name: triton-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
176180
path: dist/*.whl
177181

178-
- name: Upload test reports
182+
- name: Upload PTI wheels
179183
uses: actions/upload-artifact@v4
184+
with:
185+
name: pti-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
186+
path: .scripts_cache/pti/dist/*.whl
187+
188+
- name: Upload test reports
189+
uses: actions/upload-artifact@v5
180190
with:
181191
name: test-reports-build-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
182192
include-hidden-files: true
@@ -238,15 +248,27 @@ jobs:
238248
mode: ${{ inputs.pytorch_mode }}
239249

240250
- name: Download Triton wheels
241-
uses: actions/download-artifact@v5
251+
uses: actions/download-artifact@v6
242252
with:
243253
name: triton-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
244254

255+
- name: Download PTI wheels
256+
uses: actions/download-artifact@v5
257+
with:
258+
name: pti-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
259+
245260
- name: Install Triton
246261
run: |
247262
pip install triton-*.whl
248263
python -c 'import triton; print(triton.__version__)'
249264
265+
- name: Install PTI
266+
run: |
267+
pip install intel_pti-*.whl
268+
PTI_LIBS_DIR=$(python ./scripts/pti_lib.py)
269+
ls $PTI_LIBS_DIR
270+
echo "PTI_LIBS_DIR=$PTI_LIBS_DIR" | tee -a $GITHUB_ENV
271+
250272
- name: Report environment details
251273
run: |
252274
if [ "${{ matrix.suite }}" == "minicore" ]; then
@@ -283,19 +305,7 @@ jobs:
283305
- name: Build PTI && Run Proton tests
284306
if: matrix.suite == 'rest'
285307
run: |
286-
PTI_COMMIT_ID="$(<.github/pins/pti.txt)"
287-
git clone https://github.com/intel/pti-gpu.git
288-
cd pti-gpu
289-
git checkout $PTI_COMMIT_ID
290-
cd sdk
291-
cmake --preset linux-icpx-release
292-
BUILD_TESTING=1 PTI_BUILD_SAMPLES=1 cmake --build --preset linux-icpx-release
293-
294-
PTI_LIBS_DIR="$(pwd)/build-linux-icpx-release/lib/"
295-
cd ../..
296-
297-
export LD_LIBRARY_PATH=$PTI_LIBS_DIR:$LD_LIBRARY_PATH
298-
export TRITON_XPUPTI_LIB_PATH=$PTI_LIBS_DIR
308+
export LD_LIBRARY_PATH=${{ env.PTI_LIBS_DIR }}:$LD_LIBRARY_PATH
299309
cd third_party/proton/test
300310
pytest test_api.py test_cmd.py test_lib.py test_profile.py test_viewer.py --device xpu -s -v
301311
cd ..
@@ -382,7 +392,7 @@ jobs:
382392
dest: ${{ steps.pip-cache.outputs.dest }}
383393

384394
- name: Upload test reports
385-
uses: actions/upload-artifact@v4
395+
uses: actions/upload-artifact@v5
386396
with:
387397
name: test-reports-${{ matrix.suite }}-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
388398
include-hidden-files: true
@@ -405,7 +415,7 @@ jobs:
405415
key: pip-${{ inputs.python_version }}-${{ hashFiles('pyproject.toml', 'setup.py') }}-${{ env.PIP_CACHE_NUMBER }}
406416

407417
- name: Download test reports
408-
uses: actions/download-artifact@v5
418+
uses: actions/download-artifact@v6
409419
with:
410420
pattern: test-reports-*-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
411421
path: reports
@@ -431,20 +441,20 @@ jobs:
431441
python scripts/pass_rate.py --reports reports --suite tutorials --json > pass_rate_tutorials.json
432442
433443
- name: Upload pass rate report
434-
uses: actions/upload-artifact@v4
444+
uses: actions/upload-artifact@v5
435445
with:
436446
name: pass_rate-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
437447
path: pass_rate*.json
438448

439449
- name: Upload tutorials test report
440-
uses: actions/upload-artifact@v4
450+
uses: actions/upload-artifact@v5
441451
with:
442452
name: test-reports-tutorials-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
443453
include-hidden-files: true
444454
path: reports/tutorials.xml
445455

446456
- name: Upload tutorials performance report
447-
uses: actions/upload-artifact@v4
457+
uses: actions/upload-artifact@v5
448458
with:
449459
name: tutorials-${{ inputs.python_version }}-${{ inputs.runner_label || inputs.driver_version }}
450460
if-no-files-found: warn

.github/workflows/build-test-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,13 @@ jobs:
202202
- name: Upload pass rate report
203203
# upload reports only for the default branch
204204
if: github.ref_name == 'main'
205-
uses: actions/upload-artifact@v4
205+
uses: actions/upload-artifact@v5
206206
with:
207207
name: pass_rate
208208
path: ${{ env.NEW_WORKSPACE }}\pass_rate*.json
209209

210210
- name: Upload tutorial performance
211-
uses: actions/upload-artifact@v4
211+
uses: actions/upload-artifact@v5
212212
with:
213213
name: tutorials-report
214214
if-no-files-found: warn

.github/workflows/create_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
files: dist/${{env.RELEASE_FILE}}
6565
- name: Upload source distribution to GHA artifacts for release tags
6666
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && contains(github.ref, 'rc') }}
67-
uses: actions/upload-artifact@v4.4.0
67+
uses: actions/upload-artifact@v5
6868
with:
6969
name: ${{ env.RELEASE_FILE }}
7070
path: dist/${{ env.RELEASE_FILE }}

.github/workflows/e2e-accuracy.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ jobs:
125125
dtype: ${{ fromJson(needs.setup.outputs.dtype) }}
126126
fail-fast: false
127127
uses: ./.github/workflows/e2e-reusable.yml
128+
secrets:
129+
HUGGING_FACE_HUB_TOKEN: ${{ secrets.HUGGING_FACE_HUB_TOKEN }}
128130
with:
129131
pytorch_ref: ${{ inputs.pytorch_ref || '' }}
130132
suite: ${{ matrix.suite }}
@@ -152,7 +154,7 @@ jobs:
152154
python-version: "3.10"
153155

154156
- name: Download all artifacts
155-
uses: actions/download-artifact@v5
157+
uses: actions/download-artifact@v6
156158
with:
157159
path: separate-reports
158160
merge-multiple: true
@@ -168,7 +170,7 @@ jobs:
168170
--output-dir aggregated-results
169171
170172
- name: Upload aggregated results
171-
uses: actions/upload-artifact@v4
173+
uses: actions/upload-artifact@v5
172174
if: ${{ !cancelled() }}
173175
with:
174176
name: aggregated-results-${{ github.run_id }}

.github/workflows/e2e-reusable.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: E2E reusable workflow
22

33
on:
44
workflow_call:
5+
secrets:
6+
HUGGING_FACE_HUB_TOKEN:
7+
required: true
58
inputs:
69
pytorch_ref:
710
description: PyTorch ref, keep empty for default
@@ -137,7 +140,7 @@ jobs:
137140

138141
- name: Install python test dependencies
139142
run: |
140-
pip install pyyaml pandas scipy 'numpy==1.26.4' psutil pyre_extensions torchrec
143+
pip install pyyaml pandas scipy psutil
141144
142145
- name: Install transformers package
143146
if: ${{ inputs.suite == 'huggingface' }}
@@ -186,11 +189,19 @@ jobs:
186189
if: ${{ inputs.suite == 'torchbench' }}
187190
run: |
188191
cd benchmark
192+
sed -i 's/^ *pynvml.*//' requirements.txt
193+
pip install -r requirements.txt
194+
# for dlrm
195+
pip install pyre-extensions
196+
curl -fsSL https://raw.githubusercontent.com/facebookresearch/dlrm/refs/heads/torchrec-dlrm/requirements.txt |xargs pip install
197+
# for soft_actor_critic, temp fix
198+
pip install git+https://github.com/nocoding03/gym@fix-np
199+
189200
if [[ "${{ inputs.only_one_model }}" ]]; then
190201
python install.py "${{ inputs.only_one_model }}"
191202
else
192203
# install all models
193-
python install.py
204+
python install.py --continue_on_fail
194205
fi
195206
pip install -e .
196207
@@ -200,6 +211,9 @@ jobs:
200211
run: |
201212
cd pytorch
202213
214+
# Some models are still not compatible with numpy>2.0
215+
pip install 'numpy==1.26.4'
216+
203217
export WORKSPACE=$GITHUB_WORKSPACE
204218
205219
if [[ "${{ inputs.TORCH_COMPILE_DEBUG }}" = "1" ]] ; then
@@ -277,7 +291,7 @@ jobs:
277291
fi
278292
279293
- name: Upload test logs
280-
uses: actions/upload-artifact@v4
294+
uses: actions/upload-artifact@v5
281295
with:
282296
name: logs-${{ inputs.suite }}-${{ inputs.dtype }}-${{ inputs.mode }}-${{ inputs.test_mode }}
283297
path: inductor_log

.github/workflows/e2e-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ jobs:
339339
EOF
340340
341341
- name: Upload test logs
342-
uses: actions/upload-artifact@v4
342+
uses: actions/upload-artifact@v5
343343
with:
344344
name: logs
345345
path: ${{ env.NEW_WORKSPACE }}\inductor_log

.github/workflows/inductor-tests-reusable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
103103
- name: Upload test logs
104104
if: always()
105-
uses: actions/upload-artifact@v4
105+
uses: actions/upload-artifact@v5
106106
with:
107107
name: logs-${{ env.PYTHON_VERSION }}
108108
path: pytorch/test/test-reports

.github/workflows/inductor-tests-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
150150
- name: Upload test logs
151151
if: always()
152-
uses: actions/upload-artifact@v4
152+
uses: actions/upload-artifact@v5
153153
with:
154154
name: logs-${{ env.PYTHON_VERSION }}
155155
path: ${{ env.NEW_WORKSPACE }}\pytorch\test\test-reports

.github/workflows/llvm-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ jobs:
258258
docker rm "${CONTAINER_ID}"
259259
260260
- name: Upload Build Artifacts
261-
uses: actions/upload-artifact@v4
261+
uses: actions/upload-artifact@v5
262262
with:
263263
name: llvm-${{ matrix.config.target-os }}-${{ matrix.config.arch }}
264264
path: |

0 commit comments

Comments
 (0)