Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Sudhanshu Sane
VTK-m
Commits
28128429
Commit
28128429
authored
Jan 09, 2019
by
Robert Maynard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-diy' into correct_more_diy2_warnings
* upstream-diy: diy 2019-01-09 (149953b0)
parents
831a0bf8
3c130d16
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/master.hpp
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/master.hpp
+6
-1
No files found.
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/master.hpp
View file @
28128429
...
...
@@ -671,6 +671,7 @@ diy::Master::
iexchange_
(
const
ICallback
<
Block
>&
f
)
{
auto
scoped
=
prof
.
scoped
(
"iexchange"
);
DIY_UNUSED
(
scoped
);
// prepare for next round
incoming_
.
erase
(
exchange_round_
);
...
...
@@ -696,7 +697,7 @@ iexchange_(const ICallback<Block>& f)
int
nundeq_after
=
0
;
int
nunenq_after
=
0
;
for
(
size_t
j
=
0
;
j
<
cp
.
link
()
->
size
();
j
++
)
for
(
size_t
j
=
0
;
j
<
static_cast
<
size_t
>
(
cp
.
link
()
->
size
()
)
;
j
++
)
{
if
(
cp
.
incoming
(
cp
.
link
()
->
target
(
j
).
gid
))
++
nundeq_after
;
...
...
@@ -737,6 +738,7 @@ diy::Master::
comm_exchange
(
GidSendOrder
&
gid_order
,
IExchangeInfo
*
iexchange
)
{
auto
scoped
=
prof
.
scoped
(
"comm-exchange"
);
DIY_UNUSED
(
scoped
);
send_outgoing_queues
(
gid_order
,
false
,
iexchange
);
while
(
nudge
());
// kick requests
check_incoming_queues
(
iexchange
);
...
...
@@ -846,6 +848,7 @@ diy::Master::
icommunicate
(
IExchangeInfo
*
iexchange
)
{
auto
scoped
=
prof
.
scoped
(
"icommunicate"
);
DIY_UNUSED
(
scoped
);
log
->
debug
(
"Entering icommunicate()"
);
...
...
@@ -877,6 +880,7 @@ send_outgoing_queues(GidSendOrder& gid_order,
IExchangeInfo
*
iexchange
)
{
auto
scoped
=
prof
.
scoped
(
"send-outgoing-queues"
);
DIY_UNUSED
(
scoped
);
while
(
inflight_sends
().
size
()
<
gid_order
.
limit
&&
!
gid_order
.
empty
())
{
...
...
@@ -1089,6 +1093,7 @@ diy::Master::
check_incoming_queues
(
IExchangeInfo
*
iexchange
)
{
auto
scoped
=
prof
.
scoped
(
"check-incoming-queues"
);
DIY_UNUSED
(
scoped
);
mpi
::
optional
<
mpi
::
status
>
ostatus
=
comm_
.
iprobe
(
mpi
::
any_source
,
mpi
::
any_tag
);
while
(
ostatus
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment