Commit 2a090ea5 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Fixes to enum->int conversion for the Intel compiler.

parent 9d545a60
...@@ -365,7 +365,7 @@ void scheduler_write_dependencies(struct scheduler *s, int verbose) { ...@@ -365,7 +365,7 @@ void scheduler_write_dependencies(struct scheduler *s, int verbose) {
const struct task *ta = &s->tasks[i]; const struct task *ta = &s->tasks[i];
/* Current index */ /* Current index */
int ind = ta->type * task_subtype_count + ta->subtype; const int ind = ta->type * task_subtype_count + ta->subtype;
struct task_dependency *cur = &task_dep[ind]; struct task_dependency *cur = &task_dep[ind];
...@@ -389,7 +389,7 @@ void scheduler_write_dependencies(struct scheduler *s, int verbose) { ...@@ -389,7 +389,7 @@ void scheduler_write_dependencies(struct scheduler *s, int verbose) {
cur->implicit_out[k] = tb->implicit; cur->implicit_out[k] = tb->implicit;
/* statistics */ /* statistics */
int count = scheduler_get_number_relation(s, ta, tb); const int count = scheduler_get_number_relation(s, ta, tb);
cur->number_link[k] = count; cur->number_link[k] = count;
cur->number_rank[k] = 1; cur->number_rank[k] = 1;
...@@ -468,16 +468,16 @@ void scheduler_write_dependencies(struct scheduler *s, int verbose) { ...@@ -468,16 +468,16 @@ void scheduler_write_dependencies(struct scheduler *s, int verbose) {
} }
/* Define a few variables */ /* Define a few variables */
int ta_type = task_dep[i].type_in; const int ta_type = task_dep[i].type_in;
int ta_subtype = task_dep[i].subtype_in; const int ta_subtype = task_dep[i].subtype_in;
int ta_implicit = task_dep[i].implicit_in; const int ta_implicit = task_dep[i].implicit_in;
int tb_type = task_dep[i].type_out[j]; const int tb_type = task_dep[i].type_out[j];
int tb_subtype = task_dep[i].subtype_out[j]; const int tb_subtype = task_dep[i].subtype_out[j];
int tb_implicit = task_dep[i].implicit_out[j]; const int tb_implicit = task_dep[i].implicit_out[j];
int count = task_dep[i].number_link[j]; const int count = task_dep[i].number_link[j];
int number_rank = task_dep[i].number_rank[j]; const int number_rank = task_dep[i].number_rank[j];
/* text to write */ /* text to write */
char ta_name[200]; char ta_name[200];
......
...@@ -671,8 +671,7 @@ void task_get_group_name(int type, int subtype, char *cluster) { ...@@ -671,8 +671,7 @@ void task_get_group_name(int type, int subtype, char *cluster) {
* @param subtype The #task type. * @param subtype The #task type.
* @param name (return) The formatted string * @param name (return) The formatted string
*/ */
void task_get_full_name(enum task_types type, enum task_subtypes subtype, void task_get_full_name(int type, int subtype, char *name) {
char *name) {
#ifdef SWIFT_DEBUG_CHECKS #ifdef SWIFT_DEBUG_CHECKS
/* Check input */ /* Check input */
......
...@@ -203,8 +203,7 @@ float task_overlap(const struct task *ta, const struct task *tb); ...@@ -203,8 +203,7 @@ float task_overlap(const struct task *ta, const struct task *tb);
int task_lock(struct task *t); int task_lock(struct task *t);
void task_do_rewait(struct task *t); void task_do_rewait(struct task *t);
void task_print(const struct task *t); void task_print(const struct task *t);
void task_get_full_name(enum task_types type, enum task_subtypes subtype, void task_get_full_name(int type, int subtype, char *name);
char *name);
void task_get_group_name(int type, int subtype, char *cluster); void task_get_group_name(int type, int subtype, char *cluster);
#ifdef WITH_MPI #ifdef WITH_MPI
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment