Home Explore Help
Sign In
exa2pro
/
starpu-max
Watch 19
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

small modif

Andra Hugo 13 years ago
parent
6ce209bcf7
commit
ee61988c30
1 changed files with 0 additions and 4 deletions
Split View Show Diff Stats
  1. 0 4
      src/sched_policies/parallel_heft.c

+ 0 - 4
src/sched_policies/parallel_heft.c
View File 

@@ -406,11 +406,7 @@ static int _parallel_heft_push_task(struct starpu_task *task, unsigned prio, uns
 
 
 			//	fprintf(stderr, "FITNESS worker %d -> %e local_exp_end %e - local_data_penalty %e\n", worker, fitness[worker][nimpl], local_exp_end[worker][nimpl] - best_exp_end, local_data_penalty[worker][nimpl]);
 
 			}
 
-<<<<<<< .mine
 
 			worker_ctx++;
 
-=======
 
-				worker_ctx++;
 
->>>>>>> .r6169
 
 		}
 
 	}