tests: update location for helper.h and use STARPU_ASSERT

tests/core/declare_deps_after_submission.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NLOOPS	128
 

tests/core/declare_deps_after_submission_synchronous.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NLOOPS	128
 

tests/core/declare_deps_in_callback.c

@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NLOOPS	128
 

tests/core/empty_task.c

@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 65536;
 

tests/core/empty_task_chain.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	4
 

tests/core/empty_task_sync_point.c

@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static starpu_tag_t tagA = 0x0042;
 static starpu_tag_t tagB = 0x1042;

tests/core/empty_task_sync_point_tasks.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {

tests/core/execute_on_a_specific_worker.c

@@ -21,7 +21,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	1000
 

tests/core/get_current_task.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 65536;
 

tests/core/insert_task.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 void func_cpu(void *descr[], void *_args)
 {

tests/core/multiformat_data_release.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NX 16
 

tests/core/multiformat_handle_conversion.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NX 4
 

tests/core/multithreaded.c

@@ -23,7 +23,7 @@
 #include <pthread.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 pthread_t threads[16];
 

tests/core/multithreaded_init.c

@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <pthread.h>
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NUM_THREADS 5
 

tests/core/regenerate.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 65536;
 static unsigned cnt = 0;

tests/core/restart.c

@@ -22,7 +22,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	10
 

tests/core/starpu_task_wait.c

@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 65536;
 

tests/core/starpu_task_wait_for_all.c

@@ -20,7 +20,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 65536;
 

tests/core/static_restartable.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 65536;
 

tests/core/static_restartable_tag.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 65536;
 static starpu_tag_t tag = 0x32;

tests/core/static_restartable_using_initializer.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 /* This is equivalent to calling starpu_task_init later on */
 struct starpu_task task = STARPU_TASK_INITIALIZER;

tests/core/subgraph_repeat.c

@@ -19,7 +19,7 @@
 #include <starpu.h>
 #include <pthread.h>
 
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned niter = 16384;
 

tests/core/subgraph_repeat_regenerate.c

@@ -19,7 +19,7 @@
 #include <starpu.h>
 #include <pthread.h>
 
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned niter = 16384;
 

tests/core/tag_wait_api.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {

tests/core/task_wait_api.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {

tests/core/wait_all_regenerable_tasks.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 1024;
 

tests/datawizard/acquire_cb.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 unsigned token = 0;
 starpu_data_handle_t token_handle;

tests/datawizard/acquire_cb_insert.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N 16
 #define M 4

tests/datawizard/acquire_release.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 10000;
 

tests/datawizard/acquire_release2.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 40000;
 
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 
 	starpu_data_unregister(token_handle);
         FPRINTF(stderr, "Token: %u\n", token);
-        assert(token==ntasks);
+        STARPU_ASSERT(token==ntasks);
 
 	starpu_shutdown();
 

tests/datawizard/copy.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned nloops = 1000;
 

tests/datawizard/critical_section_with_void_interface.c

@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <starpu.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 starpu_data_handle_t void_handle;
 

tests/datawizard/data_implicit_deps.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <starpu.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define VECTORSIZE	1024
 

tests/datawizard/data_invalidation.c

@@ -20,7 +20,7 @@
 #include <starpu.h>
 #include <starpu_cuda.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NLOOPS		1000
 #define VECTORSIZE	1024

tests/datawizard/data_lookup.c

@@ -20,7 +20,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static void task(void **buffers, void *args)
 {
@@ -70,20 +70,20 @@ static int test_lazy_allocation()
 
 	/* Make sure we have a local pointer to it.  */
 	pointer = starpu_handle_get_local_ptr(handle);
-	assert(pointer != NULL);
+	STARPU_ASSERT(pointer != NULL);
 	for(i = 0; i < count; i++)
 	{
 		float *numbers = (float *)pointer;
-		assert(numbers[i] == i);
+		STARPU_ASSERT(numbers[i] == i);
 	}
 
 	/* Make sure the pointer/handle mapping is up-to-date.  */
-	assert(starpu_data_lookup(pointer) == handle);
+	STARPU_ASSERT(starpu_data_lookup(pointer) == handle);
 
 	starpu_data_release(handle);
 	starpu_data_unregister(handle);
 
-	assert(starpu_data_lookup(pointer) == NULL);
+	STARPU_ASSERT(starpu_data_lookup(pointer) == NULL);
 	return 0;
 }
 
@@ -111,7 +111,7 @@ static void test_filters()
 		.nchildren = CHILDREN_COUNT
 	};
 	starpu_data_partition(handle, &f);
-	assert(starpu_data_get_nb_children(handle) == CHILDREN_COUNT);
+	STARPU_ASSERT(starpu_data_get_nb_children(handle) == CHILDREN_COUNT);
 
 	for (i = 0; i < CHILDREN_COUNT; i++)
 	{
@@ -119,10 +119,10 @@ static void test_filters()
 
 		child = starpu_data_get_sub_data(handle, 1, i);
 		children_pointers[i] = (int *) starpu_handle_get_local_ptr(child);
-		assert(children_pointers[i] != NULL);
+		STARPU_ASSERT(children_pointers[i] != NULL);
 
 		/* Make sure we have a pointer -> handle mapping for CHILD.  */
-		assert(starpu_data_lookup(children_pointers[i]) == child);
+		STARPU_ASSERT(starpu_data_lookup(children_pointers[i]) == child);
 	}
 
 	starpu_data_unpartition(handle, 0);
@@ -131,11 +131,11 @@ static void test_filters()
 	{
 		if (children_pointers[i] != ptr)
 			/* Make sure the pointer -> handle mapping is gone.  */
-			assert(starpu_data_lookup(children_pointers[i]) == NULL);
+			STARPU_ASSERT(starpu_data_lookup(children_pointers[i]) == NULL);
 	}
 
 	/* Make sure the parent's mapping is back.  */
-	assert(starpu_data_lookup(ptr) == handle);
+	STARPU_ASSERT(starpu_data_lookup(ptr) == handle);
 
 	starpu_data_unregister(handle);
 	starpu_free(ptr);
@@ -181,7 +181,7 @@ int main(int argc, char *argv[])
 		starpu_data_handle_t handle;
 
 		handle = starpu_data_lookup(variables[i]);
-		assert(handle == variable_handles[i]);
+		STARPU_ASSERT(handle == variable_handles[i]);
 	}
 
 	for(i = 0; i < VECTOR_COUNT; i++)
@@ -189,7 +189,7 @@ int main(int argc, char *argv[])
 		starpu_data_handle_t handle;
 
 		handle = starpu_data_lookup(vectors[i]);
-		assert(handle == vector_handles[i]);
+		STARPU_ASSERT(handle == vector_handles[i]);
 	}
 
 	/* Unregister them.  */
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
 		starpu_data_handle_t handle;
 
 		handle = starpu_data_lookup(variables[i]);
-		assert(handle == NULL);
+		STARPU_ASSERT(handle == NULL);
 		starpu_free(variables[i]);
 	}
 
@@ -220,7 +220,7 @@ int main(int argc, char *argv[])
 		starpu_data_handle_t handle;
 
 		handle = starpu_data_lookup(vectors[i]);
-		assert(handle == NULL);
+		STARPU_ASSERT(handle == NULL);
 		starpu_free(vectors[i]);
 	}
 

tests/datawizard/dining_philosophers.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 /* number of philosophers */
 #define N	16

tests/datawizard/double_parameter.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {

tests/datawizard/dsm_stress.c

@@ -21,7 +21,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	10000
 

tests/datawizard/handle_to_pointer.c

@@ -72,21 +72,21 @@ int main(int argc, char *argv[])
 	starpu_init(NULL);
 
 	err = starpu_malloc((void **)&pointer, count * sizeof(int));
-	assert((err == 0) && (pointer != NULL));
+	STARPU_ASSERT((err == 0) && (pointer != NULL));
 
 	starpu_variable_data_register(&handle, 0, (uintptr_t)pointer,
 				      sizeof(int));
-	assert(starpu_handle_to_pointer(handle, 0) == pointer);
+	STARPU_ASSERT(starpu_handle_to_pointer(handle, 0) == pointer);
 	starpu_data_unregister(handle);
 
 	starpu_vector_data_register(&handle, 0, (uintptr_t)pointer,
 				    count, sizeof(int));
-	assert(starpu_handle_to_pointer(handle, 0) == pointer);
+	STARPU_ASSERT(starpu_handle_to_pointer(handle, 0) == pointer);
 	starpu_data_unregister(handle);
 
 	starpu_matrix_data_register(&handle, 0, (uintptr_t)pointer, 0,
 				    count, 1, sizeof(int));
-	assert(starpu_handle_to_pointer(handle, 0) == pointer);
+	STARPU_ASSERT(starpu_handle_to_pointer(handle, 0) == pointer);
 	starpu_data_unregister(handle);
 
 	starpu_free(pointer);
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 	/* Lazy allocation.  */
 	starpu_vector_data_register(&handle, -1, 0 /* NULL */,
 				    count, sizeof(int));
-	assert(starpu_handle_to_pointer(handle, 0) == NULL);
+	STARPU_ASSERT(starpu_handle_to_pointer(handle, 0) == NULL);
 
 	/* Pass the handle to a task.  */
 	starpu_insert_task(&cl,
@@ -108,11 +108,11 @@ int main(int argc, char *argv[])
 
 	/* Make sure we have a local pointer to it.  */
 	pointer = (int *) starpu_handle_to_pointer(handle, 0);
-	assert(pointer != NULL);
+	STARPU_ASSERT(pointer != NULL);
 	for(i = 0; i < count; i++)
 	{
 		int *numbers = (int *)pointer;
-		assert(numbers[i] == i);
+		STARPU_ASSERT(numbers[i] == i);
 	}
 	starpu_data_release(handle);
 

tests/datawizard/increment_redux.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #ifdef STARPU_USE_CUDA
 #include <starpu_cuda.h>

tests/datawizard/increment_redux_v2.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #ifdef STARPU_USE_CUDA
 #include <starpu_cuda.h>

tests/datawizard/interfaces/csr/csr_interface.c

@@ -15,7 +15,7 @@
  */
 #include <starpu.h>
 #include "../test_interfaces.h"
-#include "../../../common/helper.h"
+#include "../../../helper.h"
 
 #define WIDTH  8
 #define HEIGHT 4

tests/datawizard/interfaces/matrix/matrix_interface.c

@@ -15,7 +15,7 @@
  */
 #include <starpu.h>
 #include "../test_interfaces.h"
-#include "../../../common/helper.h"
+#include "../../../helper.h"
 
 #define WIDTH  16
 #define HEIGHT 16

tests/datawizard/interfaces/multiformat/advanced/generic.c

@@ -15,7 +15,7 @@
  */
 #include <starpu_data_interfaces.h>
 #include "generic.h"
-#include "../../../../common/helper.h"
+#include "../../../../helper.h"
 
 struct stats global_stats;
 

tests/datawizard/interfaces/multiformat/advanced/multiformat_cuda_opencl.c

@@ -16,7 +16,7 @@
 #include <starpu.h>
 
 #include "generic.h"
-#include "../../../../common/helper.h"
+#include "../../../../helper.h"
 
 extern struct stats global_stats;
 static int vector[NX];

tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets.c

@@ -15,7 +15,7 @@
  */
 #include <starpu.h>
 #include "multiformat_types.h"
-#include "../../../common/helper.h"
+#include "../../../helper.h"
 
 #ifdef STARPU_USE_CUDA
 void cuda_to_cpu(void *buffers[], void *arg)

tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets_cuda.cu

@@ -16,7 +16,7 @@
 #include <starpu.h>
 #include <starpu_cuda.h>
 #include "multiformat_types.h"
-#include "../../../common/helper.h"
+#include "../../../helper.h"
 
 static __global__ void cpu_to_cuda_cuda(struct point *src,
 	struct struct_of_arrays *dst, unsigned n)

tests/datawizard/interfaces/multiformat/multiformat_cuda.cu

@@ -17,7 +17,7 @@
 #include <starpu_cuda.h>
 #include "multiformat_types.h"
 #include "../test_interfaces.h"
-#include "../../../common/helper.h"
+#include "../../../helper.h"
 
 extern struct test_config multiformat_config;
 

tests/datawizard/interfaces/multiformat/multiformat_interface.c

@@ -16,7 +16,7 @@
 #include <starpu.h>
 #include "multiformat_types.h"
 #include "../test_interfaces.h"
-#include "../../../common/helper.h"
+#include "../../../helper.h"
 
 static void test_multiformat_cpu_func(void *buffers[], void *args);
 #ifdef STARPU_USE_CUDA

tests/datawizard/interfaces/test_interfaces.c

@@ -24,7 +24,7 @@
 #include <assert.h>
 
 #include "test_interfaces.h"
-#include "../../common/helper.h"
+#include "../../helper.h"
 
 /*
  * This is definitely note thrad-safe.
@@ -184,7 +184,7 @@ get_field(struct data_interface_test_summary *s, int async, enum operation op)
 		return async?&s->opencl_to_cpu_async:&s->opencl_to_cpu;
 #endif /* !STARPU_USE_OPENCL */
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 }
 
@@ -212,7 +212,7 @@ set_field(struct data_interface_test_summary *s, int async,
 			*field = TASK_SUBMISSION_FAILURE;
 			break;
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 }
 

tests/datawizard/interfaces/vector/test_vector_interface.c

@@ -15,7 +15,7 @@
  */
 #include <starpu.h>
 #include "../test_interfaces.h"
-#include "../../../common/helper.h"
+#include "../../../helper.h"
 
 /* Prototypes */
 static void register_data(void);

tests/datawizard/lazy_allocation.c

@@ -20,7 +20,7 @@
 #include <starpu.h>
 #include <starpu_cuda.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define VECTORSIZE	1024
 

tests/datawizard/manual_reduction.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #ifdef STARPU_USE_CUDA
 #include <cuda.h>

tests/datawizard/mpi_like.c

@@ -18,7 +18,7 @@
 #include <starpu.h>
 #include <errno.h>
 #include <pthread.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NTHREADS	4
 #define NITER		128

tests/datawizard/mpi_like_async.c

@@ -17,7 +17,7 @@
 
 #include <starpu.h>
 #include <pthread.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NTHREADS	16
 #define NITER		128

tests/datawizard/readers_and_writers.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned book = 0;
 static starpu_data_handle_t book_handle;

tests/datawizard/reclaim.c

@@ -25,7 +25,7 @@
 #ifdef STARPU_HAVE_HWLOC
 #include <hwloc.h>
 #endif
-#include "../common/helper.h"
+#include "../helper.h"
 
 #ifdef STARPU_SLOW_MACHINE
 #  define BLOCK_SIZE (64*1024)
@@ -95,9 +95,9 @@ int main(int argc, char **argv)
 	for (i = 0; i < mb; i++)
 	{
 		host_ptr_array[i] = (float *) malloc(BLOCK_SIZE);
-		assert(host_ptr_array[i]);
+		STARPU_ASSERT(host_ptr_array[i]);
 		starpu_variable_data_register(&handle_array[i], 0, (uintptr_t)host_ptr_array[i], BLOCK_SIZE);
-		assert(handle_array[i]);
+		STARPU_ASSERT(handle_array[i]);
 	}
 
 	for (taskid = 0; taskid < ntasks; taskid++)

tests/datawizard/scratch.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <starpu.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NLOOPS		128
 #define VECTORSIZE	1024

tests/datawizard/sync_and_notify_data.c

@@ -24,7 +24,7 @@
 #include <gordon.h>
 #endif
 
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	100
 #define K	256

tests/datawizard/sync_and_notify_data_implicit.c

@@ -24,7 +24,7 @@
 #include <gordon.h>
 #endif
 
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	100
 #define K	256

tests/datawizard/sync_with_data_with_mem.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <starpu.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NBUFFERS	64
 #define NITER		128

tests/datawizard/sync_with_data_with_mem_non_blocking.c

@@ -21,7 +21,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NBUFFERS	64
 #define NITER		128

tests/datawizard/sync_with_data_with_mem_non_blocking_implicit.c

@@ -21,7 +21,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NBUFFERS	64
 #define NITER		128

tests/datawizard/unpartition.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <starpu.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NITER		1000
 #define VECTORSIZE	1024

tests/datawizard/user_interaction_implicit.c

@@ -21,7 +21,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NBUFFERS	16
 #define NITER		128

tests/datawizard/write_only_tmp_buffer.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <starpu.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define VECTORSIZE	1024
 

tests/errorcheck/invalid_blocking_calls.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define TAG	0x42
 

tests/errorcheck/invalid_tasks.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #ifdef STARPU_USE_CPU
 static void dummy_func(void *descr[], void *arg)

tests/experiments/bandwidth_cuda/cuda_bandwidth.c

@@ -88,8 +88,8 @@ static void parse_args(int argc, char **argv)
 		}
 	}
 
-	assert(CPU_LD >= MATRIXSIZE);
-	assert(GPU_LD >= MATRIXSIZE);
+	STARPU_ASSERT(CPU_LD >= MATRIXSIZE);
+	STARPU_ASSERT(GPU_LD >= MATRIXSIZE);
 }
 
 
@@ -124,11 +124,11 @@ void benchmark_memcpy(void)
 		h_A = malloc(CPUBUFFERSIZE);
 	}
 
-	assert(h_A);
+	STARPU_ASSERT(h_A);
 
 	/* malloc a buffer on the device */
 	cublasAlloc(GPU_LD*GPU_LD, sizeof(float), &d_A);
-	assert(d_A);
+	STARPU_ASSERT(d_A);
 
 	gettimeofday(&tv_start, NULL);	
 

tests/experiments/latency/cuda_latency.c

@@ -56,16 +56,16 @@ void send_data(unsigned src, unsigned dst)
 #ifdef DO_TRANSFER_GPU_TO_RAM
 #ifdef ASYNC
 	cures = cudaMemcpyAsync(cpu_buffer, gpu_buffer[src], buffer_size, cudaMemcpyDeviceToHost, stream[src]);
-	assert(!cures);
+	STARPU_ASSERT(!cures);
 
 	cures = cudaStreamSynchronize(stream[src]);
-	assert(!cures);
+	STARPU_ASSERT(!cures);
 #else
 	cures = cudaMemcpy(cpu_buffer, gpu_buffer[src], buffer_size, cudaMemcpyDeviceToHost);
-	assert(!cures);
+	STARPU_ASSERT(!cures);
 
 	cures = cudaThreadSynchronize();
-	assert(!cures);
+	STARPU_ASSERT(!cures);
 #endif
 #endif
 
@@ -95,15 +95,15 @@ void recv_data(unsigned src, unsigned dst)
 #ifdef DO_TRANSFER_RAM_TO_GPU
 #ifdef ASYNC
 	cures = cudaMemcpyAsync(gpu_buffer[dst], cpu_buffer, buffer_size, cudaMemcpyHostToDevice, stream[dst]);
-	assert(!cures);
+	STARPU_ASSERT(!cures);
 	cures = cudaThreadSynchronize();
-	assert(!cures);
+	STARPU_ASSERT(!cures);
 #else
 	cures = cudaMemcpy(gpu_buffer[dst], cpu_buffer, buffer_size, cudaMemcpyHostToDevice);
-	assert(!cures);
+	STARPU_ASSERT(!cures);
 
 	cures = cudaThreadSynchronize();
-	assert(!cures);
+	STARPU_ASSERT(!cures);
 #endif
 #endif
 }
@@ -127,7 +127,7 @@ void *launch_gpu_thread(void *arg)
 	{
 		cudaError_t cures;
 		cures = cudaHostAlloc(&cpu_buffer, buffer_size, cudaHostAllocPortable);
-		assert(!cures);
+		STARPU_ASSERT(!cures);
 		cudaThreadSynchronize();
 	}
 

tests/helper/cublas_init.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <starpu.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 struct timeval start;
 struct timeval end;

tests/helper/execute_on_all.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <starpu.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 void func(void *arg)
 {

tests/helper/pinned_memory.c

@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NITER	10
 #define SIZE	(4*1024*1024*sizeof(float))

tests/helper/starpu_create_sync_task.c

@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NITER	10
 

tests/helper/starpu_data_cpy.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 int var1, var2;
 starpu_data_handle_t var1_handle, var2_handle;

tests/microbenchs/async_tasks_overhead.c

@@ -22,7 +22,7 @@
 
 #include <starpu.h>
 #include <starpu_profiling.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 65536;
 

tests/microbenchs/local_pingpong.c

@@ -22,7 +22,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <debug/starpu_debug_helpers.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static size_t vector_size = 1;
 

tests/microbenchs/prefetch_data_on_node.c

@@ -21,7 +21,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	1000
 

tests/microbenchs/redundant_buffer.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <starpu.h>
 #include <stdlib.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	10000
 

tests/microbenchs/sync_tasks_overhead.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 static unsigned ntasks = 65536;
 

tests/microbenchs/tasks_overhead.c

@@ -21,7 +21,7 @@
 #include <pthread.h>
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 starpu_data_handle_t data_handles[8];
 float *buffers[8];

tests/opt/datawizard/wt_broadcast.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../../common/helper.h"
+#include "../../helper.h"
 
 #ifdef STARPU_USE_CUDA
 #include <starpu_cuda.h>

tests/opt/datawizard/wt_host.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../../common/helper.h"
+#include "../../helper.h"
 
 #ifdef STARPU_USE_CUDA
 #include <starpu_cuda.h>

tests/overlap/overlap.c

@@ -22,7 +22,7 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define NTASKS	10000
 #define VECTORSIZE	1024

tests/parallel_tasks/explicit_combined_worker.c

@@ -18,7 +18,7 @@
 #include <starpu.h>
 #include <limits.h>
 #include <unistd.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	1000
 #define VECTORSIZE	1024
@@ -26,7 +26,7 @@
 static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
 	int worker_size = starpu_combined_worker_get_size();
-	assert(worker_size > 0);
+	STARPU_ASSERT(worker_size > 0);
 	usleep(1000/worker_size);
 #if 0
 	int id = starpu_worker_get_id();

tests/parallel_tasks/parallel_kernels.c

@@ -18,7 +18,7 @@
 #include <starpu.h>
 #include <limits.h>
 #include <unistd.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	1000
 #define VECTORSIZE	1024
@@ -26,7 +26,7 @@
 static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
 	int worker_size = starpu_combined_worker_get_size();
-	assert(worker_size > 0);
+	STARPU_ASSERT(worker_size > 0);
 	usleep(1000/worker_size);
 #if 0
 	int id = starpu_worker_get_id();

tests/parallel_tasks/parallel_kernels_spmd.c

@@ -18,7 +18,7 @@
 #include <starpu.h>
 #include <limits.h>
 #include <unistd.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	1000
 #define VECTORSIZE	1024
@@ -26,7 +26,7 @@
 static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
 	int worker_size = starpu_combined_worker_get_size();
-	assert(worker_size > 0);
+	STARPU_ASSERT(worker_size > 0);
 
 	usleep(1000/worker_size);
 #if 0

tests/parallel_tasks/spmd_pgreedy.c

@@ -17,7 +17,7 @@
 #include <starpu.h>
 #include <limits.h>
 #include <unistd.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #define N	1000
 #define VECTORSIZE	1024
@@ -28,7 +28,7 @@ static unsigned *v;
 static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
 	int worker_size = starpu_combined_worker_get_size();
-	assert(worker_size > 0);
+	STARPU_ASSERT(worker_size > 0);
 
 //	fprintf(stderr, "WORKERSIZE : %d\n", worker_size);
 

tests/perfmodels/non_linear_regression_based.c

@@ -15,7 +15,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #ifdef STARPU_USE_CUDA
 static void memset_cuda(void *descr[], void *arg)

tests/perfmodels/regression_based.c

@@ -16,7 +16,7 @@
  */
 
 #include <starpu.h>
-#include "../common/helper.h"
+#include "../helper.h"
 
 #ifdef STARPU_USE_CUDA
 static void memset_cuda(void *descr[], void *arg)