From 026ccaa614b8bb1307f9f388192fb87913db8da9 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Thu, 17 Jul 2025 12:33:34 -0700 Subject: [PATCH] [NCCL] Upgrade TF NCCL version to 2.26.5 PiperOrigin-RevId: 784275018 --- .../numpy1_requirements/requirements.in | 2 +- .../numpy1_requirements/requirements_lock_3_10.txt | 6 +++--- .../numpy1_requirements/requirements_lock_3_11.txt | 6 +++--- .../numpy1_requirements/requirements_lock_3_12.txt | 6 +++--- .../numpy1_requirements/requirements_lock_3_9.txt | 6 +++--- ci/official/requirements_updater/requirements.in | 2 +- requirements_lock_3_10.txt | 6 +++--- requirements_lock_3_11.txt | 6 +++--- requirements_lock_3_12.txt | 6 +++--- requirements_lock_3_13.txt | 6 +++--- requirements_lock_3_9.txt | 6 +++--- tensorflow/tools/pip_package/setup.py.tpl | 2 +- tensorflow/workspace2.bzl | 6 +++--- .../gpus/cuda/hermetic/cuda_redist_versions.bzl | 12 ++++++------ third_party/xla/third_party/nccl/archive.BUILD | 4 ++-- third_party/xla/workspace2.bzl | 6 +++--- 16 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ci/official/requirements_updater/numpy1_requirements/requirements.in b/ci/official/requirements_updater/numpy1_requirements/requirements.in index 195db8e432c..af0b82af5cf 100644 --- a/ci/official/requirements_updater/numpy1_requirements/requirements.in +++ b/ci/official/requirements_updater/numpy1_requirements/requirements.in @@ -46,7 +46,7 @@ nvidia-cufft-cu12 == 11.2.3.61 nvidia-curand-cu12 == 10.3.6.82 nvidia-cusolver-cu12 == 11.6.3.83 nvidia-cusparse-cu12 == 12.5.1.3 -nvidia-nccl-cu12 == 2.25.1 +nvidia-nccl-cu12 == 2.26.5 nvidia-nvjitlink-cu12 == 12.5.82 # The dependencies below are needed for TF wheel testing. tensorflow-io-gcs-filesystem==0.37.1 ; python_version <= "3.12" diff --git a/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_10.txt b/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_10.txt index 23083f173e1..16ed35d5038 100644 --- a/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_10.txt +++ b/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_10.txt @@ -480,9 +480,9 @@ nvidia-cusparse-cu12==12.5.1.3 \ # via # -r ci/official/requirements_updater/requirements.in # nvidia-cusolver-cu12 -nvidia-nccl-cu12==2.25.1 \ - --hash=sha256:362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a \ - --hash=sha256:4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8 +nvidia-nccl-cu12==2.26.5 \ + --hash=sha256:ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe \ + --hash=sha256:adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588 # via -r ci/official/requirements_updater/requirements.in nvidia-nvjitlink-cu12==12.5.82 \ --hash=sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27 \ diff --git a/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_11.txt b/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_11.txt index 39096b6776e..6c356e98aa2 100644 --- a/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_11.txt +++ b/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_11.txt @@ -480,9 +480,9 @@ nvidia-cusparse-cu12==12.5.1.3 \ # via # -r ci/official/requirements_updater/requirements.in # nvidia-cusolver-cu12 -nvidia-nccl-cu12==2.25.1 \ - --hash=sha256:362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a \ - --hash=sha256:4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8 +nvidia-nccl-cu12==2.26.5 \ + --hash=sha256:ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe \ + --hash=sha256:adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588 # via -r ci/official/requirements_updater/requirements.in nvidia-nvjitlink-cu12==12.5.82 \ --hash=sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27 \ diff --git a/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_12.txt b/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_12.txt index 770b84b74c6..199884e6d54 100644 --- a/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_12.txt +++ b/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_12.txt @@ -480,9 +480,9 @@ nvidia-cusparse-cu12==12.5.1.3 \ # via # -r ci/official/requirements_updater/requirements.in # nvidia-cusolver-cu12 -nvidia-nccl-cu12==2.25.1 \ - --hash=sha256:362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a \ - --hash=sha256:4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8 +nvidia-nccl-cu12==2.26.5 \ + --hash=sha256:ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe \ + --hash=sha256:adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588 # via -r ci/official/requirements_updater/requirements.in nvidia-nvjitlink-cu12==12.5.82 \ --hash=sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27 \ diff --git a/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_9.txt b/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_9.txt index ed92b6fe070..fa07c553999 100644 --- a/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_9.txt +++ b/ci/official/requirements_updater/numpy1_requirements/requirements_lock_3_9.txt @@ -504,9 +504,9 @@ nvidia-cusparse-cu12==12.5.1.3 \ # via # -r ci/official/requirements_updater/requirements.in # nvidia-cusolver-cu12 -nvidia-nccl-cu12==2.25.1 \ - --hash=sha256:362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a \ - --hash=sha256:4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8 +nvidia-nccl-cu12==2.26.5 \ + --hash=sha256:ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe \ + --hash=sha256:adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588 # via -r ci/official/requirements_updater/requirements.in nvidia-nvjitlink-cu12==12.5.82 \ --hash=sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27 \ diff --git a/ci/official/requirements_updater/requirements.in b/ci/official/requirements_updater/requirements.in index 9810058c875..5eaf6ac63db 100644 --- a/ci/official/requirements_updater/requirements.in +++ b/ci/official/requirements_updater/requirements.in @@ -46,7 +46,7 @@ nvidia-cufft-cu12 == 11.2.3.61 nvidia-curand-cu12 == 10.3.6.82 nvidia-cusolver-cu12 == 11.6.3.83 nvidia-cusparse-cu12 == 12.5.1.3 -nvidia-nccl-cu12 == 2.25.1 +nvidia-nccl-cu12 == 2.26.5 nvidia-nvjitlink-cu12 == 12.5.82 # The dependencies below are needed for TF wheel testing. tensorflow-io-gcs-filesystem==0.37.1 ; python_version <= "3.12" diff --git a/requirements_lock_3_10.txt b/requirements_lock_3_10.txt index d8e5a03f1db..0948f5fbb63 100644 --- a/requirements_lock_3_10.txt +++ b/requirements_lock_3_10.txt @@ -499,9 +499,9 @@ nvidia-cusparse-cu12==12.5.1.3 \ # via # -r ci/official/requirements_updater/requirements.in # nvidia-cusolver-cu12 -nvidia-nccl-cu12==2.25.1 \ - --hash=sha256:362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a \ - --hash=sha256:4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8 +nvidia-nccl-cu12==2.26.5 \ + --hash=sha256:ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe \ + --hash=sha256:adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588 # via -r ci/official/requirements_updater/requirements.in nvidia-nvjitlink-cu12==12.5.82 \ --hash=sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27 \ diff --git a/requirements_lock_3_11.txt b/requirements_lock_3_11.txt index 69b81600bd3..10bbf9a5f4e 100644 --- a/requirements_lock_3_11.txt +++ b/requirements_lock_3_11.txt @@ -499,9 +499,9 @@ nvidia-cusparse-cu12==12.5.1.3 \ # via # -r ci/official/requirements_updater/requirements.in # nvidia-cusolver-cu12 -nvidia-nccl-cu12==2.25.1 \ - --hash=sha256:362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a \ - --hash=sha256:4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8 +nvidia-nccl-cu12==2.26.5 \ + --hash=sha256:ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe \ + --hash=sha256:adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588 # via -r ci/official/requirements_updater/requirements.in nvidia-nvjitlink-cu12==12.5.82 \ --hash=sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27 \ diff --git a/requirements_lock_3_12.txt b/requirements_lock_3_12.txt index 44ccff6e69e..076595d281a 100644 --- a/requirements_lock_3_12.txt +++ b/requirements_lock_3_12.txt @@ -499,9 +499,9 @@ nvidia-cusparse-cu12==12.5.1.3 \ # via # -r ci/official/requirements_updater/requirements.in # nvidia-cusolver-cu12 -nvidia-nccl-cu12==2.25.1 \ - --hash=sha256:362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a \ - --hash=sha256:4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8 +nvidia-nccl-cu12==2.26.5 \ + --hash=sha256:ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe \ + --hash=sha256:adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588 # via -r ci/official/requirements_updater/requirements.in nvidia-nvjitlink-cu12==12.5.82 \ --hash=sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27 \ diff --git a/requirements_lock_3_13.txt b/requirements_lock_3_13.txt index 0ef9fb60717..8fe6c4fa955 100644 --- a/requirements_lock_3_13.txt +++ b/requirements_lock_3_13.txt @@ -499,9 +499,9 @@ nvidia-cusparse-cu12==12.5.1.3 \ # via # -r ci/official/requirements_updater/requirements.in # nvidia-cusolver-cu12 -nvidia-nccl-cu12==2.25.1 \ - --hash=sha256:362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a \ - --hash=sha256:4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8 +nvidia-nccl-cu12==2.26.5 \ + --hash=sha256:ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe \ + --hash=sha256:adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588 # via -r ci/official/requirements_updater/requirements.in nvidia-nvjitlink-cu12==12.5.82 \ --hash=sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27 \ diff --git a/requirements_lock_3_9.txt b/requirements_lock_3_9.txt index 7d4b4765201..8d926530191 100644 --- a/requirements_lock_3_9.txt +++ b/requirements_lock_3_9.txt @@ -513,9 +513,9 @@ nvidia-cusparse-cu12==12.5.1.3 \ # via # -r ci/official/requirements_updater/requirements.in # nvidia-cusolver-cu12 -nvidia-nccl-cu12==2.25.1 \ - --hash=sha256:362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a \ - --hash=sha256:4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8 +nvidia-nccl-cu12==2.26.5 \ + --hash=sha256:ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe \ + --hash=sha256:adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588 # via -r ci/official/requirements_updater/requirements.in nvidia-nvjitlink-cu12==12.5.82 \ --hash=sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27 \ diff --git a/tensorflow/tools/pip_package/setup.py.tpl b/tensorflow/tools/pip_package/setup.py.tpl index 90d23ec0bde..efef4421cec 100644 --- a/tensorflow/tools/pip_package/setup.py.tpl +++ b/tensorflow/tools/pip_package/setup.py.tpl @@ -155,7 +155,7 @@ EXTRA_PACKAGES = { 'nvidia-curand-cu12 >= 10.3.6.82, < 11.0', 'nvidia-cusolver-cu12 >= 11.6.3.83, < 12.0', 'nvidia-cusparse-cu12 >= 12.5.1.3, < 13.0', - 'nvidia-nccl-cu12 >= 2.25.1, < 3.0', + 'nvidia-nccl-cu12 >= 2.26.5, < 3.0', 'nvidia-nvjitlink-cu12 >= 12.5.82, < 13.0', ], 'gcs-filesystem': [ diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl index bebdb632d29..0efc7628d8c 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl @@ -534,9 +534,9 @@ def _tf_repositories(): name = "nccl_archive", build_file = "@local_xla//third_party:nccl/archive.BUILD", patch_file = ["@local_xla//third_party/nccl:archive.patch"], - sha256 = "7b154ad1f8ccafa795ed6696507d402b1b4ccac944c5fceb7f4e29b19a39cc47", - strip_prefix = "nccl-2.25.1-1", - urls = tf_mirror_urls("https://github.com/nvidia/nccl/archive/v2.25.1-1.tar.gz"), + sha256 = "0c5199ea56c70beb72a00eaf0d29887ac90243b47ebba048fba33ad86fcc2322", + strip_prefix = "nccl-2.26.5-1", + urls = tf_mirror_urls("https://github.com/nvidia/nccl/archive/v2.26.5-1.tar.gz"), ) tf_http_archive( diff --git a/third_party/xla/third_party/gpus/cuda/hermetic/cuda_redist_versions.bzl b/third_party/xla/third_party/gpus/cuda/hermetic/cuda_redist_versions.bzl index 76af01bdcd6..8852e477629 100644 --- a/third_party/xla/third_party/gpus/cuda/hermetic/cuda_redist_versions.bzl +++ b/third_party/xla/third_party/gpus/cuda/hermetic/cuda_redist_versions.bzl @@ -281,14 +281,14 @@ MIRRORED_TARS_NVSHMEM_REDIST_JSON_DICT = { CUDA_12_NCCL_WHEEL_DICT = { "x86_64-unknown-linux-gnu": { - "version": "2.25.1", - "url": "https://files.pythonhosted.org/packages/11/0c/8c78b7603f4e685624a3ea944940f1e75f36d71bd6504330511f4a0e1557/nvidia_nccl_cu12-2.25.1-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", - "sha256": "362aed5963fb9ea2ed2f264409baae30143498fd0e5c503aeaa1badd88cdc54a", + "version": "2.26.5", + "url": "https://files.pythonhosted.org/packages/48/fb/ec4ac065d9b0d56f72eaf1d9b0df601e33da28197b32ca351dc05b342611/nvidia_nccl_cu12-2.26.5-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", + "sha256": "ea5ed3e053c735f16809bee7111deac62ac35b10128a8c102960a0462ce16cbe", }, "aarch64-unknown-linux-gnu": { - "version": "2.25.1", - "url": "https://files.pythonhosted.org/packages/4b/28/f62adab24f2d4b2165b22145af56a7598ab535feb6ccd172f76b9106ebaa/nvidia_nccl_cu12-2.25.1-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", - "sha256": "4ab428bc915785cc66e8c57cb34c7a64cf739c46702b8db748b6ad6cc7180cf8", + "version": "2.26.5", + "url": "https://files.pythonhosted.org/packages/55/66/ed9d28946ead0fe1322df2f4fc6ea042340c0fe73b79a1419dc1fdbdd211/nvidia_nccl_cu12-2.26.5-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", + "sha256": "adb1bf4adcc5a47f597738a0700da6aef61f8ea4251b375540ae138c7d239588", }, } diff --git a/third_party/xla/third_party/nccl/archive.BUILD b/third_party/xla/third_party/nccl/archive.BUILD index 61d4975424e..e5b70218f63 100644 --- a/third_party/xla/third_party/nccl/archive.BUILD +++ b/third_party/xla/third_party/nccl/archive.BUILD @@ -22,9 +22,9 @@ exports_files(["LICENSE.txt"]) NCCL_MAJOR = 2 -NCCL_MINOR = 25 +NCCL_MINOR = 26 -NCCL_PATCH = 1 +NCCL_PATCH = 5 NCCL_VERSION = NCCL_MAJOR * 10000 + NCCL_MINOR * 100 + NCCL_PATCH # e.g., 21605 diff --git a/third_party/xla/workspace2.bzl b/third_party/xla/workspace2.bzl index 9e4166034d0..774548daa50 100644 --- a/third_party/xla/workspace2.bzl +++ b/third_party/xla/workspace2.bzl @@ -440,9 +440,9 @@ def _tf_repositories(): name = "nccl_archive", build_file = "//third_party:nccl/archive.BUILD", patch_file = ["//third_party/nccl:archive.patch"], - sha256 = "7b154ad1f8ccafa795ed6696507d402b1b4ccac944c5fceb7f4e29b19a39cc47", - strip_prefix = "nccl-2.25.1-1", - urls = tf_mirror_urls("https://github.com/nvidia/nccl/archive/v2.25.1-1.tar.gz"), + sha256 = "0c5199ea56c70beb72a00eaf0d29887ac90243b47ebba048fba33ad86fcc2322", + strip_prefix = "nccl-2.26.5-1", + urls = tf_mirror_urls("https://github.com/nvidia/nccl/archive/v2.26.5-1.tar.gz"), ) tf_http_archive(