Revert "Port alltoall[v]" (#325)

This reverts commit f4d5d3d620.

src/include/collectives.h

@@ -9,12 +9,7 @@
 #define NCCL_COLLECTIVES_H_
 
 #define FUNC_INDEX_P2P (NCCL_NUM_FUNCTIONS*NCCL_NUM_ALGORITHMS*NCCL_NUM_PROTOCOLS*ncclNumTypes*ncclNumOps)
-#define FUNC_INDEX_A2A (FUNC_INDEX_P2P+1)
-#define FUNC_INDEX_A2AV (FUNC_INDEX_P2P+2)
-
-#define FUNC_INDEX(func, redop, ncclType, al, pr) ((func >= NCCL_NUM_FUNCTIONS) \
-  ? (func-NCCL_NUM_FUNCTIONS+NCCL_NUM_FUNCTIONS*NCCL_NUM_ALGORITHMS*NCCL_NUM_PROTOCOLS*ncclNumTypes*ncclNumOps) \
-  : ((((((func)*ncclNumOps + (redop))*ncclNumTypes) + (ncclType))*NCCL_NUM_ALGORITHMS+(al))*NCCL_NUM_PROTOCOLS+(pr)))
+#define FUNC_INDEX(func, redop, ncclType, al, pr) ((((((func)*ncclNumOps + (redop))*ncclNumTypes) + (ncclType))*NCCL_NUM_ALGORITHMS+(al))*NCCL_NUM_PROTOCOLS+(pr))
 
 #define NCCL_FUNC_NAME(func, algo, proto, redop, type) \
   ncclFunction_##func##_##algo##_##proto##_##redop##_##type
@@ -65,8 +60,6 @@
   DECL(ReduceScatter) \
   DECL(AllReduce) \
   DECL5(SendRecv, RING, SIMPLE, Sum, int8_t) \
-  DECL5(AllToAll, RING, SIMPLE, Sum, int8_t) \
-  DECL5(AllToAllv, RING, SIMPLE, Sum, int8_t) \
 
 DECL_ALL
 
@@ -88,12 +81,4 @@ DECL_ALL
 #define REDUCE_SLICESTEPS 1
 #define REDUCE_CHUNKSTEPS 1
 #define SENDRECV_SLICEFACTOR 1
-#define GATHER_SLICESTEPS 4
-#define GATHER_CHUNKSTEPS 4
-#define SCATTER_SLICESTEPS 4
-#define SCATTER_CHUNKSTEPS 4
-#define ALLTOALL_SLICESTEPS 4
-#define ALLTOALL_CHUNKSTEPS 4
-#define ALLTOALLV_SLICESTEPS 4
-#define ALLTOALLV_CHUNKSTEPS 4
 #endif

src/include/comm.h

@@ -163,7 +163,6 @@ struct ncclComm {
   int p2pRecvCount;
 
   // [RCCL]
-  bool alltoallDisable;            // RCCL AllToAll/Scatter/Gather API
   CliqueManager* cliqueManager;    // CliqueManager handles pointer collection / distribution for clique-based kernels
   int rootPid;                     // Process ID of root
   // [/RCCL]

src/include/devcomm.h

@@ -27,8 +27,8 @@
 
 
 #define NCCL_NUM_FUNCTIONS 5 // SendRecv not included for now
-typedef enum { ncclFuncBroadcast, ncclFuncReduce, ncclFuncAllGather, ncclFuncReduceScatter, ncclFuncAllReduce, ncclFuncSendRecv, ncclFuncAllToAll, ncclFuncAllToAllv } ncclFunc_t;
-extern const char* ncclFuncStr[];
+typedef enum { ncclFuncBroadcast, ncclFuncReduce, ncclFuncAllGather, ncclFuncReduceScatter, ncclFuncAllReduce, ncclFuncSendRecv} ncclFunc_t;
+extern const char* ncclFuncStr[NCCL_NUM_FUNCTIONS+1];
 
 #define NCCL_NUM_ALGORITHMS 3 // Tree/Ring/CollNet
 #define NCCL_ALGO_TREE 0
@@ -191,11 +191,6 @@ struct ncclWorkElem {
       int32_t delta;
       uint16_t nThreads;
     } p2p;
-    struct {
-      size_t count;
-      uint8_t bid;
-      uint8_t nChannels;
-    } a2av;
     // [RCCL] Clique-based arguments
     //        NOTE: Follows same field structure as coll
     //              because nChannels is accessed from "coll" struct.
@@ -232,7 +227,6 @@ struct ncclChannel {
       struct ncclWork* workFifo;
       int workCount;
       uint64_t workFifoTail; // Only used by CPU
-      size_t* a2avParams;
 
 #ifdef ENABLE_PROFILING
       struct timeval tvs;

src/include/info.h

@@ -20,8 +20,7 @@ typedef enum {
   ncclPatternTreeDown,
   ncclPatternTreeUpDown,
   ncclPatternCollTreeUp,
-  ncclPatternCollTreeDown,
-  ncclPatternAll
+  ncclPatternCollTreeDown
 } ncclPattern_t;
 
 // Used to pass NCCL call information between functions
@@ -40,11 +39,6 @@ struct ncclInfo {
   // Algorithm details
   int chunkSteps;
   int sliceSteps;
-  // For alltoallv
-  const size_t *sendcounts;
-  const size_t *sdispls;
-  const size_t *recvcounts;
-  const size_t *rdispls;
   // Computed later
   int algorithm;
   int protocol;