Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'update-diy'

Browse Source 
Update diy

Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com
Merge-request: !1800
This commit is contained in:
Ben Boeckel 2019-08-23 08:59:51 -04:00
commit 427f961f6e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/resolve.hpp vendored
View File

@ -20,7 +20,7 @@ record_local_gids(const diy::Master& master, diy::DynamicAssigner& assigner)
{
// figure out local ranks
std::vector<std::tuple<int,int>> local_gids;
for (int i = 0; i < master.size(); ++i)
for (int i = 0; i < static_cast<int>(master.size()); ++i)
local_gids.emplace_back(std::make_tuple(master.communicator().rank(), master.gid(i)));
assigner.set_ranks(local_gids);
@ -32,7 +32,7 @@ update_links(diy::Master& master, const diy::DynamicAssigner& assigner)
{
// figure out all the gids we need
std::vector<int> nbr_gids;
for (int i = 0; i < master.size(); ++i)
for (int i = 0; i < static_cast<int>(master.size()); ++i)
{
auto* link = master.link(i);
for (auto blockid : link->neighbors())
@ -52,7 +52,7 @@ update_links(diy::Master& master, const diy::DynamicAssigner& assigner)
gid_to_proc[nbr_gids[i]] = nbr_procs[i];
// fix the procs in links
for (int i = 0; i < master.size(); ++i)
for (int i = 0; i < static_cast<int>(master.size()); ++i)
{
auto* link = master.link(i);
for (auto& blockid : link->neighbors())