Merge remote-tracking branch 'nccl/master' into 2.7.8

[ROCm/rccl commit: 7e3f841fab]
2020-08-06 23:35:44 +00:00
parent bbc4b72ebe dca19952fd
commit 14ad6ff3b4
24 changed files with 55 additions and 204 deletions
@@ -41,7 +41,6 @@ struct ncclSendMem {
      char pad1[CACHE_LINE_SIZE-sizeof(uint64_t)];
      void* ptrExchange;
      char pad2[CACHE_LINE_SIZE-sizeof(void*)];
-      uint64_t opCount;
    };
    char pad3[MEM_ALIGN];
  };
@@ -53,7 +52,6 @@ struct ncclRecvMem {
    struct {
      uint64_t tail;
      char pad1[CACHE_LINE_SIZE-sizeof(uint64_t)];
-      uint64_t opCount;
      char pad2[CACHE_LINE_SIZE-sizeof(uint64_t)];
      int sizesFifo[NCCL_STEPS];
    };
@@ -113,9 +111,6 @@ struct ncclComm {
  // Whether there has been a fatal error in this communicator.
  ncclResult_t fatalError;

-  // Error reported by GPU
-  volatile ncclDevError_t* fatalDevError;
-
  // Flag to ask NCCL kernels to abort
  volatile uint32_t *abortFlag;