Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
75a9d6f7
Commit
75a9d6f7
authored
8 years ago
by
Peter W. Draper
Browse files
Options
Downloads
Patches
Plain Diff
Revert "move calls to MPI_Irecv to the enqueue_mapper."
This reverts commit
00499932
.
parent
00499932
No related branches found
No related tags found
1 merge request
!291
Space recycle
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/scheduler.c
+11
-30
11 additions, 30 deletions
src/scheduler.c
with
11 additions
and
30 deletions
src/scheduler.c
+
11
−
30
View file @
75a9d6f7
...
...
@@ -1027,25 +1027,6 @@ void scheduler_enqueue_mapper(void *map_data, int num_elements,
struct
task
*
tasks
=
s
->
tasks
;
for
(
int
ind
=
0
;
ind
<
num_elements
;
ind
++
)
{
struct
task
*
t
=
&
tasks
[
tid
[
ind
]];
#ifdef WITH_MPI
/* If this is a recv task, enqueue the MPI call. */
if
(
t
->
type
==
task_type_recv
)
{
int
err
;
if
(
t
->
subtype
==
task_subtype_tend
)
{
t
->
buff
=
malloc
(
sizeof
(
int
)
*
t
->
ci
->
pcell_size
);
err
=
MPI_Irecv
(
t
->
buff
,
t
->
ci
->
pcell_size
,
MPI_INT
,
t
->
ci
->
nodeID
,
t
->
flags
,
MPI_COMM_WORLD
,
&
t
->
req
);
}
else
{
err
=
MPI_Irecv
(
t
->
ci
->
parts
,
t
->
ci
->
count
,
part_mpi_type
,
t
->
ci
->
nodeID
,
t
->
flags
,
MPI_COMM_WORLD
,
&
t
->
req
);
}
if
(
err
!=
MPI_SUCCESS
)
{
mpi_error
(
err
,
"Failed to emit irecv for particle data."
);
}
}
#endif
if
(
atomic_dec
(
&
t
->
wait
)
==
1
&&
!
t
->
skip
)
{
scheduler_enqueue
(
s
,
t
);
}
...
...
@@ -1179,17 +1160,17 @@ void scheduler_enqueue(struct scheduler *s, struct task *t) {
break
;
case
task_type_recv
:
#ifdef WITH_MPI
//
if (t->subtype == task_subtype_tend) {
//
t->buff = malloc(sizeof(int) * t->ci->pcell_size);
//
err = MPI_Irecv(t->buff, t->ci->pcell_size, MPI_INT, t->ci->nodeID,
//
t->flags, MPI_COMM_WORLD, &t->req);
//
} else {
//
err = MPI_Irecv(t->ci->parts, t->ci->count, part_mpi_type,
//
t->ci->nodeID, t->flags, MPI_COMM_WORLD, &t->req);
//
}
//
if (err != MPI_SUCCESS) {
//
mpi_error(err, "Failed to emit irecv for particle data.");
//
}
if
(
t
->
subtype
==
task_subtype_tend
)
{
t
->
buff
=
malloc
(
sizeof
(
int
)
*
t
->
ci
->
pcell_size
);
err
=
MPI_Irecv
(
t
->
buff
,
t
->
ci
->
pcell_size
,
MPI_INT
,
t
->
ci
->
nodeID
,
t
->
flags
,
MPI_COMM_WORLD
,
&
t
->
req
);
}
else
{
err
=
MPI_Irecv
(
t
->
ci
->
parts
,
t
->
ci
->
count
,
part_mpi_type
,
t
->
ci
->
nodeID
,
t
->
flags
,
MPI_COMM_WORLD
,
&
t
->
req
);
}
if
(
err
!=
MPI_SUCCESS
)
{
mpi_error
(
err
,
"Failed to emit irecv for particle data."
);
}
// message( "receiving %i parts with tag=%i from %i to %i." ,
// t->ci->count , t->flags , t->ci->nodeID , s->nodeID );
// fflush(stdout);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment