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
e9d7520b
Commit
e9d7520b
authored
8 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Code formatting
parent
4e460da8
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!292
Drift on demand
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/cell.c
+8
-8
8 additions, 8 deletions
src/cell.c
src/engine.c
+13
-13
13 additions, 13 deletions
src/engine.c
src/runner.c
+8
-7
8 additions, 7 deletions
src/runner.c
with
29 additions
and
28 deletions
src/cell.c
+
8
−
8
View file @
e9d7520b
...
@@ -907,10 +907,10 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
...
@@ -907,10 +907,10 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
if
(
l
==
NULL
)
error
(
"Missing link to send_xv task."
);
if
(
l
==
NULL
)
error
(
"Missing link to send_xv task."
);
scheduler_activate
(
s
,
l
->
t
);
scheduler_activate
(
s
,
l
->
t
);
if
(
cj
->
super
->
drift
)
if
(
cj
->
super
->
drift
)
scheduler_activate
(
s
,
cj
->
super
->
drift
);
scheduler_activate
(
s
,
cj
->
super
->
drift
);
else
else
error
(
"Drift task missing !"
);
error
(
"Drift task missing !"
);
for
(
l
=
cj
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
ci
->
nodeID
;
for
(
l
=
cj
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
ci
->
nodeID
;
l
=
l
->
next
)
l
=
l
->
next
)
...
@@ -939,10 +939,10 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
...
@@ -939,10 +939,10 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
if
(
l
==
NULL
)
error
(
"Missing link to send_xv task."
);
if
(
l
==
NULL
)
error
(
"Missing link to send_xv task."
);
scheduler_activate
(
s
,
l
->
t
);
scheduler_activate
(
s
,
l
->
t
);
if
(
ci
->
super
->
drift
)
if
(
ci
->
super
->
drift
)
scheduler_activate
(
s
,
ci
->
super
->
drift
);
scheduler_activate
(
s
,
ci
->
super
->
drift
);
else
else
error
(
"Drift task missing !"
);
error
(
"Drift task missing !"
);
for
(
l
=
ci
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
cj
->
nodeID
;
for
(
l
=
ci
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
cj
->
nodeID
;
l
=
l
->
next
)
l
=
l
->
next
)
...
...
This diff is collapsed.
Click to expand it.
src/engine.c
+
13
−
13
View file @
e9d7520b
...
@@ -674,10 +674,10 @@ void engine_addtasks_send(struct engine *e, struct cell *ci, struct cell *cj,
...
@@ -674,10 +674,10 @@ void engine_addtasks_send(struct engine *e, struct cell *ci, struct cell *cj,
/* Create the tasks and their dependencies? */
/* Create the tasks and their dependencies? */
if
(
t_xv
==
NULL
)
{
if
(
t_xv
==
NULL
)
{
if
(
ci
->
super
->
drift
==
NULL
)
if
(
ci
->
super
->
drift
==
NULL
)
ci
->
super
->
drift
=
scheduler_addtask
(
s
,
task_type_drift
,
task_subtype_none
,
0
,
0
,
ci
->
super
->
drift
=
scheduler_addtask
(
ci
->
super
,
NULL
,
0
);
s
,
task_type_drift
,
task_subtype_none
,
0
,
0
,
ci
->
super
,
NULL
,
0
);
t_xv
=
scheduler_addtask
(
s
,
task_type_send
,
task_subtype_none
,
t_xv
=
scheduler_addtask
(
s
,
task_type_send
,
task_subtype_none
,
4
*
ci
->
tag
,
0
,
ci
,
cj
,
0
);
4
*
ci
->
tag
,
0
,
ci
,
cj
,
0
);
...
@@ -2067,11 +2067,11 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
...
@@ -2067,11 +2067,11 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
if
(
l
==
NULL
)
error
(
"Missing link to send_xv task."
);
if
(
l
==
NULL
)
error
(
"Missing link to send_xv task."
);
scheduler_activate
(
s
,
l
->
t
);
scheduler_activate
(
s
,
l
->
t
);
if
(
cj
->
super
->
drift
)
if
(
cj
->
super
->
drift
)
scheduler_activate
(
s
,
cj
->
super
->
drift
);
scheduler_activate
(
s
,
cj
->
super
->
drift
);
else
else
error
(
"Drift task missing !"
);
error
(
"Drift task missing !"
);
for
(
l
=
cj
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
ci
->
nodeID
;
for
(
l
=
cj
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
ci
->
nodeID
;
l
=
l
->
next
)
l
=
l
->
next
)
;
;
...
@@ -2099,10 +2099,10 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
...
@@ -2099,10 +2099,10 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
if
(
l
==
NULL
)
error
(
"Missing link to send_xv task."
);
if
(
l
==
NULL
)
error
(
"Missing link to send_xv task."
);
scheduler_activate
(
s
,
l
->
t
);
scheduler_activate
(
s
,
l
->
t
);
if
(
ci
->
super
->
drift
)
if
(
ci
->
super
->
drift
)
scheduler_activate
(
s
,
ci
->
super
->
drift
);
scheduler_activate
(
s
,
ci
->
super
->
drift
);
else
else
error
(
"Drift task missing !"
);
error
(
"Drift task missing !"
);
for
(
l
=
ci
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
cj
->
nodeID
;
for
(
l
=
ci
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
cj
->
nodeID
;
l
=
l
->
next
)
l
=
l
->
next
)
...
...
This diff is collapsed.
Click to expand it.
src/runner.c
+
8
−
7
View file @
e9d7520b
...
@@ -1054,7 +1054,8 @@ void *runner_main(void *data) {
...
@@ -1054,7 +1054,8 @@ void *runner_main(void *data) {
#ifdef SWIFT_DEBUG_CHECKS
#ifdef SWIFT_DEBUG_CHECKS
#ifndef WITH_MPI
#ifndef WITH_MPI
if
(
cj
==
NULL
)
{
/* self */
if
(
cj
==
NULL
)
{
/* self */
if
(
!
cell_is_active
(
ci
,
e
)
&&
t
->
type
!=
task_type_sort
&&
t
->
type
!=
task_type_send
&&
t
->
type
!=
task_type_recv
)
if
(
!
cell_is_active
(
ci
,
e
)
&&
t
->
type
!=
task_type_sort
&&
t
->
type
!=
task_type_send
&&
t
->
type
!=
task_type_recv
)
error
(
error
(
"Task (type='%s/%s') should have been skipped ti_current=%d "
"Task (type='%s/%s') should have been skipped ti_current=%d "
"c->ti_end_min=%d"
,
"c->ti_end_min=%d"
,
...
@@ -1073,12 +1074,12 @@ void *runner_main(void *data) {
...
@@ -1073,12 +1074,12 @@ void *runner_main(void *data) {
}
else
{
/* pair */
}
else
{
/* pair */
if
(
!
cell_is_active
(
ci
,
e
)
&&
!
cell_is_active
(
cj
,
e
))
if
(
!
cell_is_active
(
ci
,
e
)
&&
!
cell_is_active
(
cj
,
e
))
if
(
t
->
type
!=
task_type_send
&&
t
->
type
!=
task_type_recv
)
if
(
t
->
type
!=
task_type_send
&&
t
->
type
!=
task_type_recv
)
error
(
error
(
"Task (type='%s/%s') should have been skipped ti_current=%d "
"Task (type='%s/%s') should have been skipped ti_current=%d "
"ci->ti_end_min=%d cj->ti_end_min=%d"
,
"ci->ti_end_min=%d cj->ti_end_min=%d"
,
taskID_names
[
t
->
type
],
subtaskID_names
[
t
->
subtype
],
e
->
ti_current
,
taskID_names
[
t
->
type
],
subtaskID_names
[
t
->
subtype
],
ci
->
ti_end_min
,
cj
->
ti_end_min
);
e
->
ti_current
,
ci
->
ti_end_min
,
cj
->
ti_end_min
);
}
}
#endif
#endif
#endif
#endif
...
...
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