From 2a974f5ca2aa12b178046b2206b43f1fd69d9fae Mon Sep 17 00:00:00 2001 From: Sylvain Jeaugey Date: Thu, 8 Dec 2016 09:11:43 -0800 Subject: [PATCH] Fix 1.3.2 compilation --- src/common_coll.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/common_coll.h b/src/common_coll.h index 63896d7..54050f8 100644 --- a/src/common_coll.h +++ b/src/common_coll.h @@ -85,7 +85,6 @@ struct KernelArgs { T * __restrict__ ThisOutput; DevRing* ring; - int nRings; }; template @@ -93,21 +92,19 @@ void ArgsSetup(KernelArgs *args, const void* sendbuff, void* recvbuff, const int root, const int count, ncclComm *comm) { args->nRanks = comm->nRanks; args->root = root; - args->buffSize = comm->buffSizePerRing; + args->buffSize = comm->buffSize; args->N = count; args->opIndex = comm->opSched; args->opCounter = comm->opCounter; - args->doneCount = &comm->devMem->doneCount; args->ThisInput = (const T*)sendbuff; args->ThisOutput = (T*)recvbuff; args->ring = comm->devRing; args->pushrecv = comm->globalMemSpace; - args->nRings = comm->nRings; } #define LAUNCH_KERNEL(K, THREADS, UNROLL, FUNC, T, \ args, stream) do { \ - dim3 grid(args.nRings, 1, 1); \ + dim3 grid(1, 1, 1); \ dim3 block(THREADS+1, 1, 1); \ void* argptrs[] = {&args}; \ CUDACHECK(cudaLaunchKernel( \