Revert "Nccl update to 2.25.1 for cuda 12.4-12.8 (#146073)"

This reverts commit eecee5863e698d19458b33df7bfecbda0a04557a.

Reverted https://github.com/pytorch/pytorch/pull/146073 on behalf of https://github.com/atalman due to breaks Locally building benchmarks ([comment](https://github.com/pytorch/pytorch/pull/146073#issuecomment-2667054179))
This commit is contained in:
PyTorch MergeBot
2025-02-18 22:23:35 +00:00
parent 3f35664ee8
commit 7622e29a37
19 changed files with 111 additions and 137 deletions

View File

@ -2,18 +2,12 @@ from __future__ import annotations
import os
import platform
import subprocess
from glob import glob
from pathlib import Path
from .setup_helpers.cmake import CMake, USE_NINJA
from .setup_helpers.env import check_negative_env_flag, IS_64BIT, IS_WINDOWS
repo_root = Path(__file__).absolute().parent.parent
third_party_path = os.path.join(repo_root, "third_party")
def _get_vc_env(vc_arch: str) -> dict[str, str]:
try:
from setuptools import distutils # type: ignore[import]
@ -85,31 +79,6 @@ def _create_build_env() -> dict[str, str]:
return my_env
def read_nccl_pin() -> str:
nccl_file = "nccl-cu12.txt"
if os.getenv("DESIRED_CUDA", "").startswith("11") or os.getenv(
"CUDA_VERSION", ""
).startswith("11"):
nccl_file = "nccl-cu11.txt"
nccl_pin_path = os.path.join(
repo_root, ".ci", "docker", "ci_commit_pins", nccl_file
)
with open(nccl_pin_path) as f:
return f.read().strip()
def checkout_nccl() -> None:
release_tag = read_nccl_pin()
print(f"-- Checkout nccl release tag: {release_tag}")
nccl_basedir = os.path.join(third_party_path, "nccl")
if not os.path.exists(nccl_basedir):
subprocess.check_call(
["git", "clone", "https://github.com/NVIDIA/nccl.git", "nccl"],
cwd=third_party_path,
)
subprocess.check_call(["git", "checkout", release_tag], cwd=nccl_basedir)
def build_pytorch(
version: str | None,
cmake_python_library: str | None,
@ -119,7 +88,6 @@ def build_pytorch(
cmake: CMake,
) -> None:
my_env = _create_build_env()
checkout_nccl()
build_test = not check_negative_env_flag("BUILD_TEST")
cmake.generate(
version, cmake_python_library, build_python, build_test, my_env, rerun_cmake