From c08092fdf2add819f24c46534fef29286615d8fd Mon Sep 17 00:00:00 2001
From: Nikita Shulga <nshulga@fb.com>
Date: Wed, 3 Aug 2022 23:26:48 +0000
Subject: [PATCH] Update NCCL to v2.13.4-1 (#82775)

Also, update slimming script to include two instances of net.o that new library generates
Pull Request resolved: https://github.com/pytorch/pytorch/pull/82775
Approved by: https://github.com/ngimel
---
 cmake/External/nccl.cmake | 4 +++-
 third_party/nccl/nccl     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmake/External/nccl.cmake b/cmake/External/nccl.cmake
index 9a763476ce4..92bacc82574 100644
--- a/cmake/External/nccl.cmake
+++ b/cmake/External/nccl.cmake
@@ -53,7 +53,9 @@ if(NOT __NCCL_INCLUDED)
         COMMAND cd objects
         COMMAND "${CMAKE_AR}" x "${__NCCL_BUILD_DIR}/lib/libnccl_static.a"
         COMMAND for obj in all_gather_* all_reduce_* broadcast_* reduce_*.o$<SEMICOLON> do "${CMAKE_OBJCOPY}" --remove-relocations .nvFatBinSegment --remove-section __nv_relfatbin $$obj$<SEMICOLON> done
-       COMMAND "${CMAKE_AR}" cr "${__NCCL_BUILD_DIR}/lib/libnccl_slim_static.a" "*.o"
+        COMMAND "${CMAKE_AR}" cr "${__NCCL_BUILD_DIR}/lib/libnccl_slim_static.a" "*.o"
+        COMMAND "${CMAKE_AR}" xN 1 "${__NCCL_BUILD_DIR}/lib/libnccl_static.a" net.o
+        COMMAND "${CMAKE_AR}" q "${__NCCL_BUILD_DIR}/lib/libnccl_slim_static.a" net.o
         COMMAND cd -
         COMMAND "${CMAKE_COMMAND}" -E remove_directory "${__NCCL_BUILD_DIR}/objects"
         WORKING_DIRECTORY "${__NCCL_BUILD_DIR}"
diff --git a/third_party/nccl/nccl b/third_party/nccl/nccl
index 7e515921295..19ab67d1727 160000
--- a/third_party/nccl/nccl
+++ b/third_party/nccl/nccl
@@ -1 +1 @@
-Subproject commit 7e515921295adaab72adf56ea71a0fafb0ecb5f3
+Subproject commit 19ab67d1727d337d10d0a48cbaf5cd119b8d88f1