Merge remote-tracking branch 'nccl/p2p' into p2p

2020-04-02 15:06:36 -07:00
parent 6e9e05972b 119a0ecf60
commit c2dc7b613b
4 changed files with 126 additions and 10 deletions
@@ -29,13 +29,13 @@
 } while(0)

 #define NCCLCHECK(cmd) do {                         \
-  ncclResult_t r = cmd;                             \
-  if (r!= ncclSuccess) {                            \
+  ncclResult_t res = cmd;                           \
+  if (res != ncclSuccess) {                         \
    char hostname[1024];                            \
    getHostName(hostname, 1024);                    \
    printf("%s: Test NCCL failure %s:%d '%s'\n",    \
         hostname,                                  \
-        __FILE__,__LINE__,ncclGetErrorString(r));   \
+        __FILE__,__LINE__,ncclGetErrorString(res)); \
    return testNcclError;                           \
  }                                                 \
 } while(0)
@@ -124,6 +124,8 @@ struct threadArgs {
  double* bw;
  int* bw_count;

+  int reportErrors;
+
  struct testColl* collTest;
 };