starpufft: revert r7146 as it breaks compatibility

starpufft/starpufft.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2011  Université de Bordeaux 1
- * Copyright (C) 2010, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -39,11 +39,11 @@ starpufft(plan) starpufft(plan_dft_c2r_1d)(int n, unsigned flags); \
 void *starpufft(malloc)(size_t n); \
 void starpufft(free)(void *p); \
 \
-int starpufft(execute)(starpufft(plan) p, void *in, void *out); \
-int starpufft(start)(starpufft(plan) p, void *in, void *out, struct starpu_task **task); \
+void starpufft(execute)(starpufft(plan) p, void *in, void *out); \
+struct starpu_task *starpufft(start)(starpufft(plan) p, void *in, void *out); \
 \
-int starpufft(execute_handle)(starpufft(plan) p, starpu_data_handle_t in, starpu_data_handle_t out); \
-int starpufft(start_handle)(starpufft(plan) p, starpu_data_handle_t in, starpu_data_handle_t out, struct starpu_task **ptask); \
+void starpufft(execute_handle)(starpufft(plan) p, starpu_data_handle_t in, starpu_data_handle_t out); \
+struct starpu_task *starpufft(start_handle)(starpufft(plan) p, starpu_data_handle_t in, starpu_data_handle_t out); \
 \
 void starpufft(cleanup)(starpufft(plan) p); \
 void starpufft(destroy_plan)(starpufft(plan) p); \

starpufft/starpufftx.c

@@ -200,9 +200,10 @@ static int can_execute(unsigned workerid, struct starpu_task *task, unsigned nim
 #include "starpufftx1d.c"
 #include "starpufftx2d.c"
 
-int
-STARPUFFT(start)(STARPUFFT(plan) plan, void *_in, void *_out, struct starpu_task **task)
+struct starpu_task *
+STARPUFFT(start)(STARPUFFT(plan) plan, void *_in, void *_out)
 {
+	struct starpu_task *task;
 	int z;
 
 	plan->in = _in;
@@ -223,8 +224,7 @@ STARPUFFT(start)(STARPUFFT(plan) plan, void *_in, void *_out, struct starpu_task
 					for (z = 0; z < plan->totsize1; z++)
 						plan->twist1_tasks[z]->handles[0] = plan->in_handle;
 				}
-				int ret = STARPUFFT(start1dC2C)(plan, plan->in_handle, plan->out_handle, task);
-				if (ret == -ENODEV) return ret;
+				task = STARPUFFT(start1dC2C)(plan, plan->in_handle, plan->out_handle);
 				break;
 			default:
 				STARPU_ABORT();
@@ -241,14 +241,13 @@ STARPUFFT(start)(STARPUFFT(plan) plan, void *_in, void *_out, struct starpu_task
 				for (z = 0; z < plan->totsize1; z++)
 					plan->twist1_tasks[z]->handles[0] = plan->in_handle;
 			}
-			int ret = STARPUFFT(start2dC2C)(plan, plan->in_handle, plan->out_handle, task);
-			if (ret == -ENODEV) return ret;
+			task = STARPUFFT(start2dC2C)(plan, plan->in_handle, plan->out_handle);
 			break;
 		default:
 			STARPU_ABORT();
 			break;
 	}
-	return 0;
+	return task;
 }
 
 void
@@ -263,13 +262,13 @@ STARPUFFT(cleanup)(STARPUFFT(plan) plan)
 	}
 }
 
-int
-STARPUFFT(start_handle)(STARPUFFT(plan) plan, starpu_data_handle_t in, starpu_data_handle_t out, struct starpu_task **ptask)
+struct starpu_task *
+STARPUFFT(start_handle)(STARPUFFT(plan) plan, starpu_data_handle_t in, starpu_data_handle_t out)
 {
-     return STARPUFFT(start1dC2C)(plan, in, out, ptask);
+	return STARPUFFT(start1dC2C)(plan, in, out);
 }
 
-int
+void
 STARPUFFT(execute)(STARPUFFT(plan) plan, void *in, void *out)
 {
 	int ret;
@@ -279,9 +278,7 @@ STARPUFFT(execute)(STARPUFFT(plan) plan, void *in, void *out)
 
 	gettimeofday(&start, NULL);
 
-	struct starpu_task *task;
-	ret = STARPUFFT(start)(plan, in, out, &task);
-	if (ret == -ENODEV) return ret;
+	struct starpu_task *task = STARPUFFT(start)(plan, in, out);
 	gettimeofday(&submit_tasks, NULL);
 	ret = starpu_task_wait(task);
 	STARPU_ASSERT(ret == 0);
@@ -291,17 +288,14 @@ STARPUFFT(execute)(STARPUFFT(plan) plan, void *in, void *out)
 	gettimeofday(&end, NULL);
 }
 
-int
+void
 STARPUFFT(execute_handle)(STARPUFFT(plan) plan, starpu_data_handle_t in, starpu_data_handle_t out)
 {
 	int ret;
 
-	struct starpu_task *task;
-	ret = STARPUFFT(start_handle)(plan, in, out, &task);
-	if (ret == -ENODEV) return ret;
+	struct starpu_task *task = STARPUFFT(start_handle)(plan, in, out);
 	ret = starpu_task_wait(task);
 	STARPU_ASSERT(ret == 0);
-	return 0;
 }
 
 /* Destroy FFTW plans, unregister and free buffers, and free tags */

starpufft/starpufftx1d.c

@@ -772,8 +772,8 @@ if (PARALLEL) {
 }
 
 /* Actually submit all the tasks. */
-static int
-STARPUFFT(start1dC2C)(STARPUFFT(plan) plan, starpu_data_handle_t in, starpu_data_handle_t out, struct starpu_task **ptask)
+static struct starpu_task *
+STARPUFFT(start1dC2C)(STARPUFFT(plan) plan, starpu_data_handle_t in, starpu_data_handle_t out)
 {
 	STARPU_ASSERT(plan->type == C2C);
 	int z;
@@ -802,8 +802,7 @@ if (PARALLEL) {
 	ret = starpu_task_submit(plan->end_task);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 
-	*ptask = plan->end_task;
-	return 0;
+	return plan->end_task;
 } else /* !PARALLEL */ {
 	struct starpu_task *task;
 
@@ -816,10 +815,8 @@ if (PARALLEL) {
 	task->cl_arg = plan;
 
 	ret = starpu_task_submit(task);
-	if (ret == -ENODEV) return ret;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
-	*ptask = task;
-	return 0;
+	return task;
 }
 }
 

starpufft/starpufftx2d.c

@@ -770,8 +770,8 @@ if (PARALLEL) {
 }
 
 /* Actually submit all the tasks. */
-static int
-STARPUFFT(start2dC2C)(STARPUFFT(plan) plan, starpu_data_handle_t in, starpu_data_handle_t out, struct starpu_task **ptask)
+static struct starpu_task *
+STARPUFFT(start2dC2C)(STARPUFFT(plan) plan, starpu_data_handle_t in, starpu_data_handle_t out)
 {
 	STARPU_ASSERT(plan->type == C2C);
 	int z;
@@ -798,10 +798,9 @@ if (PARALLEL) {
 	}
 
 	ret = starpu_task_submit(plan->end_task);
-	if (ret == -ENODEV) return ret;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
-	*ptask = plan->end_task;
-	return 0;
+
+	return plan->end_task;
 } else /* !PARALLEL */ {
 	struct starpu_task *task;
 
@@ -814,10 +813,8 @@ if (PARALLEL) {
 	task->cl_arg = plan;
 
 	ret = starpu_task_submit(task);
-	if (ret == -ENODEV) return ret;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
-	*ptask = task;
-	return 0;
+	return task;
 }
 }