Skip to content

Commit 76b32bc

Browse files
Merge branch 'pytorch:main' into main
2 parents f134b62 + ce38bfd commit 76b32bc

File tree

281 files changed

+6836
-4687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+6836
-4687
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
41e7ffa8b7ff09206aa5b9b5c1bbd82b9e0ff277
1+
319c8d7fd3551bac63429334509de2663aa43f57

.ci/docker/common/install_cuda.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ function prune_126 {
239239
}
240240

241241
function install_128 {
242-
CUDNN_VERSION=9.7.0.66
242+
CUDNN_VERSION=9.7.1.26
243243
echo "Installing CUDA 12.8.0 and cuDNN ${CUDNN_VERSION} and NCCL ${NCCL_VERSION} and cuSparseLt-0.6.3"
244244
rm -rf /usr/local/cuda-12.8 /usr/local/cuda
245245
# install CUDA 12.8.0 in the same container

.ci/docker/common/install_cuda_aarch64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ function prune_126 {
161161
}
162162

163163
function install_128 {
164-
CUDNN_VERSION=9.7.0.66
164+
CUDNN_VERSION=9.7.1.26
165165
echo "Installing CUDA 12.8.0 and cuDNN ${CUDNN_VERSION} and NCCL ${NCCL_VERSION} and cuSparseLt-0.6.3"
166166
rm -rf /usr/local/cuda-12.8 /usr/local/cuda
167167
# install CUDA 12.8.0 in the same container

.ci/docker/common/install_cudnn.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ if [[ -n "${CUDNN_VERSION}" ]]; then
44
# cuDNN license: https://developer.nvidia.com/cudnn/license_agreement
55
mkdir tmp_cudnn
66
pushd tmp_cudnn
7-
if [[ ${CUDA_VERSION:0:4} == "12.6" ]]; then
7+
if [[ ${CUDA_VERSION:0:4} == "12.8" ]]; then
8+
CUDNN_NAME="cudnn-linux-x86_64-9.7.1.26_cuda12-archive"
9+
elif [[ ${CUDA_VERSION:0:4} == "12.6" ]]; then
810
CUDNN_NAME="cudnn-linux-x86_64-9.5.1.17_cuda12-archive"
911
elif [[ ${CUDA_VERSION:0:2} == "12" ]]; then
1012
CUDNN_NAME="cudnn-linux-x86_64-9.1.0.70_cuda12-archive"

.ci/docker/common/install_onnx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pip_install ml_dtypes
3939
# Cache the transformers model to be used later by ONNX tests. We need to run the transformers
4040
# package to download the model. By default, the model is cached at ~/.cache/huggingface/hub/
4141
IMPORT_SCRIPT_FILENAME="/tmp/onnx_import_script.py"
42-
as_jenkins echo 'import transformers; transformers.AutoModel.from_pretrained("sshleifer/tiny-gpt2"); transformers.AutoTokenizer.from_pretrained("sshleifer/tiny-gpt2"); transformers.AutoModelForSpeechSeq2Seq.from_pretrained("openai/whisper-large-v3");' > "${IMPORT_SCRIPT_FILENAME}"
42+
as_jenkins echo 'import transformers; transformers.GPTJForCausalLM.from_pretrained("hf-internal-testing/tiny-random-gptj");' > "${IMPORT_SCRIPT_FILENAME}"
4343

4444
# Need a PyTorch version for transformers to work
4545
pip_install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu

.ci/pytorch/test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ test_inductor_cpp_wrapper_shard() {
420420
python test/run_test.py \
421421
--include inductor/test_torchinductor inductor/test_max_autotune inductor/test_cpu_repro \
422422
--verbose
423+
python test/run_test.py --inductor --include test_torch -k 'take' --verbose
423424

424425
# Run inductor benchmark tests with cpp wrapper.
425426
# Skip benchmark tests if it's in rerun-disabled-mode.
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: upload-utilization-stats
2+
3+
description: Upload utilization stats to artifacts
4+
5+
inputs:
6+
workflow_run_id:
7+
type: string
8+
description: 'workflow (run) id of the workflow the test is running'
9+
required: True
10+
workflow_attempt:
11+
type: string
12+
description: 'the workflow (run) attempt'
13+
required: True
14+
workflow_name:
15+
description: 'name of the workflow'
16+
type: string
17+
required: True
18+
job_id:
19+
type: string
20+
description: 'the job (run) id for the test'
21+
required: True
22+
job_name:
23+
type: string
24+
description: 'the job name of the test'
25+
required: True
26+
27+
runs:
28+
using: composite
29+
steps:
30+
- name: Print Inputs
31+
shell: bash
32+
run: |
33+
echo "workflow_id: ${{inputs.workflow_run_id}}"
34+
echo "workflow_attempt: ${{inputs.workflow_attempt}}"
35+
echo "workflow_Name: ${{inputs.workflow_name}}"
36+
echo "job_id: ${{inputs.job_id}}"
37+
echo "job_name: ${{inputs.job_name}}"
38+
- uses: nick-fields/[email protected]
39+
name: Setup dependencies
40+
with:
41+
shell: bash
42+
timeout_minutes: 5
43+
max_attempts: 5
44+
retry_wait_seconds: 30
45+
command: |
46+
set -eu
47+
python3 -m pip install python-dateutil==2.8.2 boto3==1.35.42 pandas==2.1.3
48+
- name: Upload utilizatoin stats to s3
49+
shell: bash
50+
run: |
51+
python3 -m tools.stats.upload_utilization_stats.upload_utilization_stats \
52+
--workflow-run-id "${{inputs.workflow_run_id}}" \
53+
--workflow-name "${{inputs.workflow_name}}" \
54+
--workflow-run-attempt "${{inputs.workflow_attempt}}" \
55+
--job-id "${{inputs.job_id}}" \
56+
--job-name "${{inputs.job_name}}"

.github/ci_commit_pins/audio.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2709b65c9d3c55da40a5436ec4c45c427feb1d2a
1+
f084f34bbb743fada85f66b0ed8041387565e69c

.github/scripts/generate_binary_build_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"nvidia-cuda-nvrtc-cu12==12.8.61; platform_system == 'Linux' and platform_machine == 'x86_64' | "
9494
"nvidia-cuda-runtime-cu12==12.8.57; platform_system == 'Linux' and platform_machine == 'x86_64' | "
9595
"nvidia-cuda-cupti-cu12==12.8.57; platform_system == 'Linux' and platform_machine == 'x86_64' | "
96-
"nvidia-cudnn-cu12==9.7.0.66; platform_system == 'Linux' and platform_machine == 'x86_64' | "
96+
"nvidia-cudnn-cu12==9.7.1.26; platform_system == 'Linux' and platform_machine == 'x86_64' | "
9797
"nvidia-cublas-cu12==12.8.3.14; platform_system == 'Linux' and platform_machine == 'x86_64' | "
9898
"nvidia-cufft-cu12==11.3.3.41; platform_system == 'Linux' and platform_machine == 'x86_64' | "
9999
"nvidia-curand-cu12==10.3.9.55; platform_system == 'Linux' and platform_machine == 'x86_64' | "

.github/workflows/_linux-test.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,17 @@ jobs:
416416
if-no-files-found: ignore
417417
path: ./**/core.[1-9]*
418418

419+
- name: Upload utilization stats
420+
if: ${{ always() && steps.test.conclusion && steps.test.conclusion != 'skipped' && !inputs.disable-monitor }}
421+
continue-on-error: true
422+
uses: ./.github/actions/upload-utilization-stats
423+
with:
424+
job_id: ${{ steps.get-job-id.outputs.job-id }}
425+
job_name: ${{ steps.get-job-id.outputs.job-name }}
426+
workflow_name: ${{ github.workflow }}
427+
workflow_run_id: ${{github.run_id}}
428+
workflow_attempt: ${{github.run_attempt}}
429+
419430
- name: Teardown Linux
420431
uses: pytorch/test-infra/.github/actions/teardown-linux@main
421432
if: always() && steps.check_container_runner.outputs.IN_CONTAINER_RUNNER == 'false'

0 commit comments

Comments
 (0)