From a7a60a06ec3ee445e9377e7b6d0ebf90ad4b7649 Mon Sep 17 00:00:00 2001
From: Wenkai Du <wenkai.du@amd.com>
Date: Wed, 24 Jan 2024 16:23:53 -0800
Subject: [PATCH] Fix sendrecv merge

[ROCm/rccl commit: 4aafb2a3c50fd648d1fa122f068f932d58f73f7e]
---
 projects/rccl/src/device/sendrecv.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/rccl/src/device/sendrecv.h b/projects/rccl/src/device/sendrecv.h
index 3597ec858d..2a6ad52678 100644
--- a/projects/rccl/src/device/sendrecv.h
+++ b/projects/rccl/src/device/sendrecv.h
@@ -84,8 +84,8 @@ struct RunWork<ncclFuncSendRecv, T, RedOp, NCCL_ALGO_RING, NCCL_PROTO_SIMPLE> {
       int chunkSize = args->chunkSize/sizeof(T);
       if (args->proto == NCCL_PROTO_LL) chunkSize /= 2;
       int const peer = args->peer;
-      Primitives<T, RedOp, FanAsymmetric<0, 1>, 1, Proto, 1> prims
-        (tid, nthreads, nullptr, &peer, buff, nullptr, /*redOpArg(ignored)=*/0, group, 1, 1, nullptr, ncclShmem.comm.p2pChunkSize/sizeof(T));
+      Primitives<T, RedOp, FanAsymmetric<0, 1>, 0, Proto, 1> prims
+        (tid, nthreads, nullptr, &peer, buff, nullptr, /*redOpArg(ignored)=*/0, group, args->connIndex, args->connIndex, nullptr, ncclShmem.comm.p2pChunkSize/sizeof(T));
 
 #if defined(ENABLE_NPKIT)
       if (isNpKitThread) {
@@ -146,8 +146,8 @@ struct RunWork<ncclFuncSendRecv, T, RedOp, NCCL_ALGO_RING, NCCL_PROTO_SIMPLE> {
       int chunkSize = args->chunkSize/sizeof(T);
       if (args->proto == NCCL_PROTO_LL) chunkSize /= 2; // This is to account for chunkEffectiveSize
       int const peer = args->peer;
-      Primitives<T, RedOp, FanAsymmetric<1, 0>, 1, Proto, 1> prims
-        (tid, nthreads, &peer, nullptr, nullptr, buff, /*redOpArg(ignored)=*/0, group, 1, 1, nullptr, ncclShmem.comm.p2pChunkSize/sizeof(T));
+      Primitives<T, RedOp, FanAsymmetric<1, 0>, 0, Proto, 1> prims
+        (tid, nthreads, &peer, nullptr, nullptr, buff, /*redOpArg(ignored)=*/0, group, args->connIndex, args->connIndex, nullptr, ncclShmem.comm.p2pChunkSize/sizeof(T));
 
 #if defined(ENABLE_NPKIT)
       if (isNpKitThread) {