[AUTOGENERATED] release/2.12_IFU_20260521

.ci/docker/build.sh

@@ -112,7 +112,10 @@ case "$tag" in
     GCC_VERSION=11
     KATEX=yes
     TRITON=yes
+<<<<<<< HEAD
     INSTALL_MINGW=yes
+=======
+>>>>>>> upstream/release/2.11
     ;;
   pytorch-linux-jammy-cuda13.0-cudnn9-py3-gcc11-inductor-benchmarks)
     CUDA_VERSION=13.0.2
@@ -159,8 +162,15 @@ case "$tag" in
     else
       ANACONDA_PYTHON_VERSION=3.12
     fi
+<<<<<<< HEAD
     GCC_VERSION=13
     ROCM_VERSION=7.2
+=======
+    GCC_VERSION=11
+    VISION=yes
+    ROCM_VERSION=7.2
+    NINJA_VERSION=1.9.0
+>>>>>>> upstream/release/2.11
     TRITON=yes
     KATEX=yes
     PYTORCH_ROCM_ARCH="gfx90a;gfx942;gfx950;gfx1100"

.ci/docker/ci_commit_pins/huggingface-requirements.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 transformers==5.5.3
+=======
+transformers==5.2.0
+>>>>>>> upstream/release/2.11
 soxr==0.5.0

.ci/docker/ci_commit_pins/triton.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 b4e20bbe55617cc798b986c2555a2bc7b303c737
+=======
+4ed888920c5a0871957f1cf912e557bc79fbe56c
+>>>>>>> upstream/release/2.11

.ci/docker/common/install_cuda.sh

@@ -132,9 +132,14 @@ function install_129 {
 }
 
 function install_128 {
+<<<<<<< HEAD
   CUDNN_VERSION=9.20.0.48
   CUSPARSELT_VERSION=0.7.1.0
   echo "Installing CUDA 12.8.1 and cuDNN ${CUDNN_VERSION} and NVSHMEM and NCCL and cuSparseLt-${CUSPARSELT_VERSION}"
+=======
+  CUDNN_VERSION=9.19.0.56
+  echo "Installing CUDA 12.8.1 and cuDNN ${CUDNN_VERSION} and NVSHMEM and NCCL and cuSparseLt-0.7.1"
+>>>>>>> upstream/release/2.11
   # install CUDA 12.8.1 in the same container
   install_cuda 12.8.1 cuda_12.8.1_570.124.06_linux
 
@@ -151,9 +156,14 @@ function install_128 {
 }
 
 function install_130 {
+<<<<<<< HEAD
   CUDNN_VERSION=9.20.0.48
   CUSPARSELT_VERSION=0.8.1.1
   echo "Installing CUDA 13.0 and cuDNN ${CUDNN_VERSION} and NVSHMEM and NCCL and cuSparseLt-${CUSPARSELT_VERSION}"
+=======
+  CUDNN_VERSION=9.19.0.56
+  echo "Installing CUDA 13.0 and cuDNN ${CUDNN_VERSION} and NVSHMEM and NCCL and cuSparseLt-0.7.1"
+>>>>>>> upstream/release/2.11
   # install CUDA 13.0 in the same container
   install_cuda 13.0.2 cuda_13.0.2_580.95.05_linux
 

.ci/docker/common/install_rocm.sh

@@ -203,6 +203,29 @@ EOF
       fi
     fi
 
+    # ROCm 7.2 needs a fix from procprof sdk that isn't available until 7.2.1
+    if [[ $(ver $ROCM_VERSION) -eq $(ver 7.2) ]]; then
+        git clone --no-checkout --filter=blob:none https://github.com/ROCm/rocm-systems.git
+        pushd rocm-systems/
+        git sparse-checkout init --cone
+        git sparse-checkout set projects/rocprofiler-sdk shared/rocprofiler-compute
+        git checkout develop
+        git checkout rocm-7.2.0
+        git config --global user.email "you@example.com"
+        git config --global user.name "Your Name"
+        git cherry-pick a71cc3cc88ed68b24c40cefec77d764053044862
+        sudo apt install -y cmake libdw-dev libsqlite3-dev
+        cmake                                         \
+              -B rocprofiler-sdk-build                \
+              -DCMAKE_INSTALL_PREFIX=/opt/rocm        \
+              -DCMAKE_PREFIX_PATH=/opt/rocm           \
+              -DGPU_TARGETS="${PYTORCH_ROCM_ARCH}"    \
+              projects/rocprofiler-sdk
+        cmake --build rocprofiler-sdk-build --target all --parallel $(nproc)
+        cmake --build rocprofiler-sdk-build --target install
+        popd
+    fi
+
     # ROCm 6.0 had a regression where journal_mode was enabled on the kdb files resulting in permission errors at runtime
     for kdb in /opt/rocm/share/miopen/db/*.kdb
     do

.ci/docker/common/install_triton.sh

@@ -21,7 +21,7 @@ elif [ -n "${TRITON_CPU}" ]; then
   TRITON_REPO="https://github.com/triton-lang/triton-cpu"
   TRITON_TEXT_FILE="triton-cpu"
 else
-  TRITON_REPO="https://github.com/triton-lang/triton"
+  TRITON_REPO="https://github.com/ROCm/triton"
   TRITON_TEXT_FILE="triton"
 fi
 

.ci/docker/requirements-ci.txt

@@ -117,9 +117,16 @@ ninja==1.11.1.4
 #Pinned versions: 1.11.1.4
 #test that import: run_test.py, test_cpp_extensions_aot.py,test_determination.py
 
+<<<<<<< HEAD
 numba==0.61.2 ; python_version < "3.14" and platform_machine != "s390x"
 numba==0.64.0 ; python_version >= "3.14" and platform_machine != "s390x"
 
+=======
+numba==0.49.0 ; python_version < "3.9" and platform_machine != "s390x"
+numba==0.60.0 ; python_version == "3.9" and platform_machine != "s390x"
+numba==0.61.2 ; python_version >= "3.10" and python_version < "3.14" and platform_machine != "s390x"
+numba==0.64.0 ; python_version >= "3.14" and platform_machine != "s390x"
+>>>>>>> upstream/release/2.11
 #Description: Just-In-Time Compiler for Numerical Functions
 #Pinned versions: 0.55.2, 0.60.0
 #test that import: test_numba_integration.py
@@ -137,8 +144,13 @@ numba==0.64.0 ; python_version >= "3.14" and platform_machine != "s390x"
 #test_nn.py, test_namedtensor.py, test_linalg.py, test_jit_cuda_fuser.py,
 #test_jit.py, test_indexing.py, test_datapipe.py, test_dataloader.py,
 #test_binary_ufuncs.py
+<<<<<<< HEAD
 numpy==2.1.2 ; python_version < "3.14"
 numpy==2.3.4; python_version >= "3.14"
+=======
+numpy==2.0.2 ; python_version == "3.9"
+numpy==2.1.2 ; python_version > "3.9"
+>>>>>>> upstream/release/2.11
 
 pandas==2.2.3; python_version < "3.14"
 pandas==2.3.3; python_version >= "3.14"
@@ -252,7 +264,12 @@ scikit-image==0.22.0
 #Pinned versions: 0.20.3
 #test that import:
 
+<<<<<<< HEAD
 scipy==1.14.1 ; python_version < "3.14"
+=======
+scipy==1.13.1 ; python_version == "3.9"
+scipy==1.14.1 ; python_version > "3.9" and python_version < "3.14"
+>>>>>>> upstream/release/2.11
 scipy==1.16.2 ; python_version >= "3.14"
 
 # Pin SciPy because of failing distribution tests (see #60347)
@@ -289,11 +306,14 @@ lintrunner==0.12.11
 #Pinned versions: 0.12.11
 #test that import:
 
+<<<<<<< HEAD
 spin==0.17
 #Description: developer CLI for common build/lint tasks
 #Pinned versions: 0.17
 #test that import:
 
+=======
+>>>>>>> upstream/release/2.11
 redis==7.4.0
 #Description: redis database
 #test that import: anything that tests OSS caching/mocking (inductor/test_codecache.py, inductor/test_max_autotune.py)
@@ -390,7 +410,7 @@ dataclasses_json==0.6.7
 #Pinned versions: 0.6.7
 #test that import:
 
-cmake==3.31.6
+cmake==4.0.0
 #Description: required for building
 
 tlparse==0.4.0

.ci/docker/requirements-docs.txt

@@ -2,9 +2,15 @@ sphinx==7.2.6
 #Description: This is used to generate PyTorch docs
 #Pinned versions: 7.2.6
 
+<<<<<<< HEAD
 pytorch_sphinx_theme2==0.4.9
 #Description: This is needed to generate PyTorch docs
 #Pinned versions: 0.4.9
+=======
+pytorch_sphinx_theme2==0.4.6
+#Description: This is needed to generate PyTorch docs
+#Pinned versions: 0.4.6
+>>>>>>> upstream/release/2.11
 
 sphinxcontrib.katex==0.9.11
 #Description: This is used to generate PyTorch docs

.ci/lumen_cli/cli/lib/core/vllm/vllm_test_library.yaml

@@ -20,7 +20,12 @@ vllm_basic_models_test:
     - pytest -v -s models/test_registry.py
     - pytest -v -s models/test_utils.py
     - pytest -v -s models/test_vision.py
+<<<<<<< HEAD
     - HF_DATASETS_OFFLINE=0 TRANSFORMERS_OFFLINE=0 pytest -v -s models/test_initialization.py
+=======
+    - pytest -v -s models/test_initialization.py -k 'not voxtral'
+    - HF_DATASETS_OFFLINE=0 TRANSFORMERS_OFFLINE=0 pytest -v -s models/test_initialization.py -k voxtral
+>>>>>>> upstream/release/2.11
 
 vllm_entrypoints_test:
   title: Entrypoints Test

.ci/manywheel/build_cuda.sh

@@ -114,7 +114,11 @@ case ${CUDA_VERSION} in
             TORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST//8.6;/}"  # Remove 8.6 for libtorch
         fi
         ;;
+<<<<<<< HEAD
     13.0|13.2)
+=======
+    13.0)
+>>>>>>> upstream/release/2.11
         TORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST};$([[ "$ARCH" == "aarch64" ]] && echo "11.0;" || echo "")12.0"
         export TORCH_NVCC_FLAGS="-compress-mode=size"
         export BUILD_BUNDLE_PTXAS=1

.ci/pytorch/binary_populate_env.sh

@@ -6,7 +6,9 @@ export TZ=UTC
 tagged_version() {
   GIT_DIR="${workdir}/pytorch/.git"
   GIT_DESCRIBE="git --git-dir ${GIT_DIR} describe --tags --match v[0-9]*.[0-9]*.[0-9]*"
-  if [[ ! -d "${GIT_DIR}" ]]; then
+  if [[ -n "${CIRCLE_TAG:-}" ]]; then
+    echo "${CIRCLE_TAG}"
+  elif [[ ! -d "${GIT_DIR}" ]]; then
     echo "Abort, abort! Git dir ${GIT_DIR} does not exists!"
     kill $$
   elif ${GIT_DESCRIBE} --exact >/dev/null; then
@@ -70,6 +72,8 @@ fi
 
 export PYTORCH_BUILD_NUMBER=1
 
+# This part is done in the builder scripts so commenting the duplicate code
+: <<'BLOCK_COMMENT'
 # Set triton version as part of PYTORCH_EXTRA_INSTALL_REQUIREMENTS
 TRITON_VERSION=$(cat $PYTORCH_ROOT/.ci/docker/triton_version.txt)
 TRITON_CONSTRAINT="platform_system == 'Linux'"
@@ -111,6 +115,7 @@ if [[ "$PACKAGE_TYPE" =~ .*wheel.* && -n "$PYTORCH_BUILD_VERSION" && "$PYTORCH_B
         export PYTORCH_EXTRA_INSTALL_REQUIREMENTS="${PYTORCH_EXTRA_INSTALL_REQUIREMENTS} | ${TRITON_REQUIREMENT}"
     fi
 fi
+BLOCK_COMMENT
 
 USE_GLOO_WITH_OPENSSL="OFF"
 if [[ "$GPU_ARCH_TYPE" =~ .*aarch64.* ]]; then

.ci/pytorch/common.sh

@@ -5,7 +5,11 @@
 source "$(dirname "${BASH_SOURCE[0]}")/common_utils.sh"
 set -ex -o pipefail
 
+<<<<<<< HEAD
 # Source ROCm environment variables (paths may vary between tarball/wheel installs)
+=======
+# for ROCm environment variables
+>>>>>>> upstream/release/2.11
 if [[ "${BUILD_ENVIRONMENT}" == *rocm* ]] && [[ -f /etc/rocm_env.sh ]]; then
   # shellcheck disable=SC1091
   source /etc/rocm_env.sh

.ci/pytorch/common_utils.sh

@@ -279,7 +279,11 @@ function install_torchrec_and_fbgemm() {
 
 function clone_pytorch_xla() {
   if [[ ! -d ./xla ]]; then
+<<<<<<< HEAD
     git clone --recursive -b r2.12 https://github.com/pytorch/xla.git
+=======
+    git clone --recursive -b r2.11 https://github.com/pytorch/xla.git
+>>>>>>> upstream/release/2.11
     pushd xla
     # pin the xla hash so that we don't get broken by changes to xla
     git checkout "$(cat ../.github/ci_commit_pins/xla.txt)"

.ci/pytorch/windows/internal/cuda_install.bat

@@ -43,25 +43,37 @@ goto cuda_download
 :cuda128
 set CUDA_INSTALL_EXE=cuda_12.8.0_571.96_windows.exe
 set "ARGS=cuda_profiler_api_12.8 thrust_12.8 nvcc_12.8 cuobjdump_12.8 nvprune_12.8 nvprof_12.8 cupti_12.8 cublas_12.8 cublas_dev_12.8 cudart_12.8 cufft_12.8 cufft_dev_12.8 curand_12.8 curand_dev_12.8 cusolver_12.8 cusolver_dev_12.8 cusparse_12.8 cusparse_dev_12.8 npp_12.8 npp_dev_12.8 nvrtc_12.8 nvrtc_dev_12.8 nvml_dev_12.8 nvjitlink_12.8 nvtx_12.8"
+<<<<<<< HEAD
 set CUDNN_FOLDER=cudnn-windows-x86_64-9.20.0.48_cuda12-archive
+=======
+set CUDNN_FOLDER=cudnn-windows-x86_64-9.19.0.56_cuda12-archive
+>>>>>>> upstream/release/2.11
 goto cuda_download
 
 :cuda129
 set CUDA_INSTALL_EXE=cuda_12.9.1_576.57_windows.exe
 set "ARGS=cuda_profiler_api_12.9 thrust_12.9 nvcc_12.9 cuobjdump_12.9 nvprune_12.9 nvprof_12.9 cupti_12.9 cublas_12.9 cublas_dev_12.9 cudart_12.9 cufft_12.9 cufft_dev_12.9 curand_12.9 curand_dev_12.9 cusolver_12.9 cusolver_dev_12.9 cusparse_12.9 cusparse_dev_12.9 npp_12.9 npp_dev_12.9 nvrtc_12.9 nvrtc_dev_12.9 nvml_dev_12.9 nvjitlink_12.9 nvtx_12.9"
+<<<<<<< HEAD
 set CUDNN_FOLDER=cudnn-windows-x86_64-9.20.0.48_cuda12-archive
+=======
+set CUDNN_FOLDER=cudnn-windows-x86_64-9.17.1.4_cuda12-archive
+>>>>>>> upstream/release/2.11
 goto cuda_download
 
 :cuda130
 set CUDA_INSTALL_EXE=cuda_13.0.0_windows.exe
 set "ARGS="
+<<<<<<< HEAD
 set CUDNN_FOLDER=cudnn-windows-x86_64-9.20.0.48_cuda13-archive
 goto cuda_download
 
 :cuda132
 set CUDA_INSTALL_EXE=cuda_13.2.1_windows.exe
 set "ARGS="
 set CUDNN_FOLDER=cudnn-windows-x86_64-9.20.0.48_cuda13-archive
+=======
+set CUDNN_FOLDER=cudnn-windows-x86_64-9.19.0.56_cuda13-archive
+>>>>>>> upstream/release/2.11
 goto cuda_download
 
 :: Common download logic for CUDA toolkit, cuDNN, and ZLIB
@@ -168,6 +180,7 @@ if %CUDA_VER% EQU 126 (
     set EXPECTED_CUDNN_VERSION=9.10.2
 )
 if %CUDA_VER% EQU 128 (
+<<<<<<< HEAD
     set CUDNN_FOLDER=cudnn-windows-x86_64-9.20.0.48_cuda12-archive
     set EXPECTED_CUDNN_VERSION=9.20.0
 )
@@ -182,6 +195,18 @@ if %CUDA_VER% EQU 130 (
 if %CUDA_VER% EQU 132 (
     set CUDNN_FOLDER=cudnn-windows-x86_64-9.20.0.48_cuda13-archive
     set EXPECTED_CUDNN_VERSION=9.20.0
+=======
+    set CUDNN_FOLDER=cudnn-windows-x86_64-9.19.0.56_cuda12-archive
+    set EXPECTED_CUDNN_VERSION=9.19.0
+)
+if %CUDA_VER% EQU 129 (
+    set CUDNN_FOLDER=cudnn-windows-x86_64-9.17.1.4_cuda12-archive
+    set EXPECTED_CUDNN_VERSION=9.17.1
+)
+if %CUDA_VER% EQU 130 (
+    set CUDNN_FOLDER=cudnn-windows-x86_64-9.19.0.56_cuda13-archive
+    set EXPECTED_CUDNN_VERSION=9.19.0
+>>>>>>> upstream/release/2.11
 )
 set "CUDNN_INSTALL_ZIP=%CUDNN_FOLDER%.zip"
 

.github/ci_commit_pins/vllm.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 ba4a78eb5d2ea30477b58a0bb8109b129f35c8b1
+=======
+a4047d4ea993fd52038433d87c16e603bee4f214
+>>>>>>> upstream/release/2.11

.github/ci_commit_pins/xla.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 r2.12
+=======
+r2.11
+>>>>>>> upstream/release/2.11