Skip to content

Commit 03b37e9

Browse files
sandeepgupta12sandeepgupta12
authored
Merge branch 'pytorch:main' into temp-gha-runner-v2
2 parents 8823dbe + 79aef14 commit 03b37e9

File tree

209 files changed

+5121
-7831
lines changed

Some content is hidden

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

209 files changed

+5121
-7831
lines changed

‎.ci/docker/almalinux/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ RUN bash ./install_mnist.sh
7878
FROM base as all_cuda
7979
COPY --from=cuda11.8 /usr/local/cuda-11.8 /usr/local/cuda-11.8
8080
COPY --from=cuda12.6 /usr/local/cuda-12.6 /usr/local/cuda-12.6
81-
COPY --from=cuda12.4 /usr/local/cuda-12.8 /usr/local/cuda-12.8
81+
COPY --from=cuda12.8 /usr/local/cuda-12.8 /usr/local/cuda-12.8
8282

8383
# Final step
8484
FROM ${BASE_TARGET} as final

‎.ci/docker/ci_commit_pins/executorch.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b173722085b3f555d6ba4533d6bbaddfd7c71144
1+
f50bfa92602b45dca884a9e511e5d9ddbe8ba314

‎.ci/docker/common/install_cuda.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function install_118 {
5555
}
5656

5757
function install_126 {
58-
CUDNN_VERSION=9.10.1.4
58+
CUDNN_VERSION=9.5.1.17
5959
echo "Installing CUDA 12.6.3 and cuDNN ${CUDNN_VERSION} and NCCL and cuSparseLt-0.6.3"
6060
install_cuda 12.6.3 cuda_12.6.3_560.35.05_linux
6161

@@ -134,7 +134,7 @@ function prune_126 {
134134
}
135135

136136
function install_128 {
137-
CUDNN_VERSION=9.10.1.4
137+
CUDNN_VERSION=9.8.0.87
138138
echo "Installing CUDA 12.8.1 and cuDNN ${CUDNN_VERSION} and NCCL and cuSparseLt-0.6.3"
139139
# install CUDA 12.8.1 in the same container
140140
install_cuda 12.8.1 cuda_12.8.1_570.124.06_linux

‎.ci/docker/common/install_cudnn.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ if [[ -n "${CUDNN_VERSION}" ]]; then
55
mkdir tmp_cudnn
66
pushd tmp_cudnn
77
if [[ ${CUDA_VERSION:0:4} == "12.8" ]]; then
8-
CUDNN_NAME="cudnn-linux-x86_64-9.10.1.4_cuda12-archive"
8+
CUDNN_NAME="cudnn-linux-x86_64-9.8.0.87_cuda12-archive"
99
elif [[ ${CUDA_VERSION:0:4} == "12.6" ]]; then
10-
CUDNN_NAME="cudnn-linux-x86_64-9.10.1.4_cuda12-archive"
10+
CUDNN_NAME="cudnn-linux-x86_64-9.5.1.17_cuda12-archive"
1111
elif [[ ${CUDA_VERSION:0:2} == "11" ]]; then
1212
CUDNN_NAME="cudnn-linux-x86_64-9.1.0.70_cuda11-archive"
1313
else

‎.ci/manywheel/build_rocm.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,23 +192,23 @@ ARCH=$(echo $PYTORCH_ROCM_ARCH | sed 's/;/|/g') # Replace ; seperated arch list
192192
# rocBLAS library files
193193
ROCBLAS_LIB_SRC=$ROCM_HOME/lib/rocblas/library
194194
ROCBLAS_LIB_DST=lib/rocblas/library
195-
ARCH_SPECIFIC_FILES=$(ls $ROCBLAS_LIB_SRC | grep -E $ARCH)
196-
OTHER_FILES=$(ls $ROCBLAS_LIB_SRC | grep -v gfx)
197-
ROCBLAS_LIB_FILES=($ARCH_SPECIFIC_FILES $OTHER_FILES)
195+
ROCBLAS_ARCH_SPECIFIC_FILES=$(ls $ROCBLAS_LIB_SRC | grep -E $ARCH)
196+
ROCBLAS_OTHER_FILES=$(ls $ROCBLAS_LIB_SRC | grep -v gfx)
197+
ROCBLAS_LIB_FILES=($ROCBLAS_ARCH_SPECIFIC_FILES $OTHER_FILES)
198198

199199
# hipblaslt library files
200200
HIPBLASLT_LIB_SRC=$ROCM_HOME/lib/hipblaslt/library
201201
HIPBLASLT_LIB_DST=lib/hipblaslt/library
202-
ARCH_SPECIFIC_FILES=$(ls $HIPBLASLT_LIB_SRC | grep -E $ARCH)
203-
OTHER_FILES=$(ls $HIPBLASLT_LIB_SRC | grep -v gfx)
204-
HIPBLASLT_LIB_FILES=($ARCH_SPECIFIC_FILES $OTHER_FILES)
202+
HIPBLASLT_ARCH_SPECIFIC_FILES=$(ls $HIPBLASLT_LIB_SRC | grep -E $ARCH)
203+
HIPBLASLT_OTHER_FILES=$(ls $HIPBLASLT_LIB_SRC | grep -v gfx)
204+
HIPBLASLT_LIB_FILES=($HIPBLASLT_ARCH_SPECIFIC_FILES $HIPBLASLT_OTHER_FILES)
205205

206206
# hipsparselt library files
207207
HIPSPARSELT_LIB_SRC=$ROCM_HOME/lib/hipsparselt/library
208208
HIPSPARSELT_LIB_DST=lib/hipsparselt/library
209-
ARCH_SPECIFIC_FILES=$(ls $HIPSPARSELT_LIB_SRC | grep -E $ARCH)
210-
OTHER_FILES=$(ls $HIPSPARSELT_LIB_SRC | grep -v gfx)
211-
HIPSPARSELT_LIB_FILES=($ARCH_SPECIFIC_FILES $OTHER_FILES)
209+
HIPSPARSELT_ARCH_SPECIFIC_FILES=$(ls $HIPSPARSELT_LIB_SRC | grep -E $ARCH)
210+
#HIPSPARSELT_OTHER_FILES=$(ls $HIPSPARSELT_LIB_SRC | grep -v gfx)
211+
HIPSPARSELT_LIB_FILES=($HIPSPARSELT_ARCH_SPECIFIC_FILES $HIPSPARSELT_OTHER_FILES)
212212

213213
# ROCm library files
214214
ROCM_SO_PATHS=()

‎.ci/pytorch/build.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@ fi
5252
export USE_LLVM=/opt/llvm
5353
export LLVM_DIR=/opt/llvm/lib/cmake/llvm
5454

55-
if [[ "$BUILD_ENVIRONMENT" == *executorch* ]]; then
56-
# To build test_edge_op_registration
57-
export BUILD_EXECUTORCH=ON
58-
export USE_CUDA=0
59-
fi
60-
6155
if ! which conda; then
6256
# In ROCm CIs, we are doing cross compilation on build machines with
6357
# intel cpu and later run tests on machines with amd cpu.

‎.github/scripts/generate_binary_build_matrix.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"nvidia-cuda-nvrtc-cu12==12.6.77; platform_system == 'Linux' and platform_machine == 'x86_64' | "
6262
"nvidia-cuda-runtime-cu12==12.6.77; platform_system == 'Linux' and platform_machine == 'x86_64' | "
6363
"nvidia-cuda-cupti-cu12==12.6.80; platform_system == 'Linux' and platform_machine == 'x86_64' | "
64-
"nvidia-cudnn-cu12==9.10.1.4; platform_system == 'Linux' and platform_machine == 'x86_64' | "
64+
"nvidia-cudnn-cu12==9.5.1.17; platform_system == 'Linux' and platform_machine == 'x86_64' | "
6565
"nvidia-cublas-cu12==12.6.4.1; platform_system == 'Linux' and platform_machine == 'x86_64' | "
6666
"nvidia-cufft-cu12==11.3.0.4; platform_system == 'Linux' and platform_machine == 'x86_64' | "
6767
"nvidia-curand-cu12==10.3.7.77; platform_system == 'Linux' and platform_machine == 'x86_64' | "
@@ -78,7 +78,7 @@
7878
"nvidia-cuda-nvrtc-cu12==12.8.93; platform_system == 'Linux' and platform_machine == 'x86_64' | "
7979
"nvidia-cuda-runtime-cu12==12.8.90; platform_system == 'Linux' and platform_machine == 'x86_64' | "
8080
"nvidia-cuda-cupti-cu12==12.8.90; platform_system == 'Linux' and platform_machine == 'x86_64' | "
81-
"nvidia-cudnn-cu12==9.10.1.4; platform_system == 'Linux' and platform_machine == 'x86_64' | "
81+
"nvidia-cudnn-cu12==9.8.0.87; platform_system == 'Linux' and platform_machine == 'x86_64' | "
8282
"nvidia-cublas-cu12==12.8.4.1; platform_system == 'Linux' and platform_machine == 'x86_64' | "
8383
"nvidia-cufft-cu12==11.3.3.83; platform_system == 'Linux' and platform_machine == 'x86_64' | "
8484
"nvidia-curand-cu12==10.3.9.90; platform_system == 'Linux' and platform_machine == 'x86_64' | "

‎.github/workflows/build-magma-windows.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ concurrency:
1919
jobs:
2020
build-windows-magma:
2121
if: github.repository_owner == 'pytorch'
22-
runs-on: windows-2019
22+
runs-on: windows-2022
2323
strategy:
2424
matrix:
25-
cuda_version: ["128", "126", "118"]
25+
cuda_version: ["128", "126"]
2626
config: ["Release", "Debug"]
2727
env:
2828
CUDA_VERSION: ${{ matrix.cuda_version }}
2929
CONFIG: ${{ matrix.config }}
30+
VC_YEAR: "2022"
3031
steps:
3132
- name: Checkout pytorch/pytorch
3233
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

‎.github/workflows/build-manywheel-images-s390x.yml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,9 @@ name: Build manywheel docker images for s390x
33
on:
44
workflow_dispatch:
55
push:
6-
branches:
7-
- main
8-
- release/*
96
tags:
10-
# NOTE: Binary build pipelines should only get triggered on release candidate or nightly builds
11-
# Release candidate tags look like: v1.11.0-rc1
12-
- v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
7+
- ciflow/s390/*
138
paths:
14-
- .ci/docker/**
15-
- .github/workflows/build-manywheel-images-s390x.yml
16-
pull_request:
17-
paths:
18-
- .ci/docker/**
199
- .github/workflows/build-manywheel-images-s390x.yml
2010

2111

0 commit comments

Comments
 (0)