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

src/include/proxy.h

@@ -173,6 +173,7 @@ struct ncclProxyState {
   struct ncclSocket* listenSock;
   int stop;
   hipCtx_t cudaCtx;
+  int safeAbortFlag;
 
   // Used by main thread
   union ncclSocketAddress* peerAddresses;
@@ -192,6 +193,7 @@ struct ncclProxyConnection {
   struct ncclProxyArgs *proxyAppend;
   struct ncclProxyArgs **proxyAppendPtr;
   void* transportResources;
+  bool initFlag;
 };
 
 typedef ncclResult_t (*threadFunc_t)(struct ncclProxyArgs*);