Merge remote-tracking branch 'remotes/nccl/master' into rccl_2.5.6

src/include/info.h

@@ -1,5 +1,6 @@
 /*************************************************************************
  * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
+ * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
  *
  * See LICENSE.txt for license information
  ************************************************************************/
@@ -8,6 +9,7 @@
 #define NCCL_INFO_H_
 
 #include "nccl.h"
+#include "core.h"
 
 typedef enum {
   ncclPatternRing,
@@ -21,7 +23,7 @@ typedef enum {
 
 // Used to pass NCCL call information between functions
 struct ncclInfo {
-  ncclColl_t coll;
+  ncclFunc_t coll;
   const char* opName;
   // NCCL Coll Args
   const void* sendbuff;
@@ -36,7 +38,11 @@ struct ncclInfo {
   int chunkSteps;
   int sliceSteps;
   // Computed later
+  int algorithm;
+  int protocol;
   ncclPattern_t pattern;
+  int nChannels;
+  int nThreads;
   size_t nBytes;
   int nstepsPerLoop;
   int nchunksPerLoop;