Merge remote-tracking branch 'origin/develop' into pset-shared-resource

This commit is contained in:
Ye Luo 2021-03-01 14:55:33 -06:00
commit 2d2de42078
1 changed files with 1 additions and 5 deletions

View File

@ -411,7 +411,7 @@ private:
ncclUniqueId id;
if (tgrp_.rank() == 0)
ncclGetUniqueId(&id);
MPI_Bcast((void*)&id, sizeof(id), MPI_BYTE, 0, &tgrp_);
MPI_Bcast((void*)&id, sizeof(id), MPI_BYTE, 0, tgrp_.get());
NCCLCHECK(ncclCommInitRank(&nccl_TGcomm_, tgrp_.size(), id, tgrp_.rank()));
}
#endif
@ -436,10 +436,6 @@ public:
auto t = TGMap.find(nn);
if (t == TGMap.end())
{
#if defined(ENABLE_CUDA) || defined(ENABLE_HIP)
if (gTG_.getTotalNodes() % nn != 0)
APP_ABORT("Error: nnodes must divide the total number of processors. \n\n\n");
#endif
auto p = TGMap.insert(
std::make_pair(nn, afqmc::TaskGroup_(gTG_, std::string("TaskGroup_") + std::to_string(nn), nn, ncores)));
if (!p.second)