Просмотр исходного кода

tests: minor fixes:
- return EXIT_FAILURE instead of aborting when computation error
- do not print messages if environment variable STARPU_SSILENT is set

Nathalie Furmento лет назад: 13
Родитель
Сommit
be3048e262

+ 1 - 1
tests/datawizard/gpu_register.c

@@ -120,7 +120,7 @@ int main(int argc, char **argv)
 
 	for (i = 0; i < size; i++) {
 		if (foo[i] != i*2) {
-			fprintf(stderr,"value %d is %d instead of %d\n", i, foo[i], 2*i);
+			FPRINTF(stderr,"value %d is %d instead of %d\n", i, foo[i], 2*i);
 			return EXIT_FAILURE;
 		}
 	}

+ 1 - 1
tests/datawizard/reclaim.c

@@ -112,7 +112,7 @@ int main(int argc, char **argv)
 		if (host_ptr_array[i] == NULL)
 		{
 			mb = i;
-			fprintf(stderr, "Cannot allocate more than %d buffers\n", mb);
+			FPRINTF(stderr, "Cannot allocate more than %d buffers\n", mb);
 			break;
 		}
 		starpu_variable_data_register(&handle_array[i], 0, (uintptr_t)host_ptr_array[i], BLOCK_SIZE);

+ 4 - 3
tests/datawizard/user_interaction_implicit.c

@@ -72,6 +72,7 @@ int main(int argc, char **argv)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_wait_for_all");
 
 	/* do some cleanup */
+	ret = EXIT_SUCCESS;
 	for (b = 0; b < NBUFFERS; b++)
 	{
 		starpu_data_unregister(buffers[b].handle);
@@ -79,12 +80,12 @@ int main(int argc, char **argv)
 		/* check result */
 		if (buffers[b].val != NITER)
 		{
-			fprintf(stderr, "buffer[%u] = %u should be %d\n", b, buffers[b].val, NITER);
-			STARPU_ABORT();
+			FPRINTF(stderr, "buffer[%u] = %u should be %d\n", b, buffers[b].val, NITER);
+			ret = EXIT_FAILURE;
 		}
 	}
 
 	starpu_shutdown();
 
-	return EXIT_SUCCESS;
+	return ret;
 }

+ 1 - 1
tests/datawizard/write_only_tmp_buffer.c

@@ -72,7 +72,7 @@ static void display_var(void *descr[], __attribute__ ((unused)) void *_args)
 	char *buf = (char *)STARPU_VECTOR_GET_PTR(descr[0]);
 	if (*buf != 42)
 	{
-		fprintf(stderr, "Value = %c (should be %c)\n", *buf, 42);
+		FPRINTF(stderr, "Value = %c (should be %c)\n", *buf, 42);
 		exit(-1);
 	}
 }

+ 6 - 4
tests/datawizard/wt_broadcast.c

@@ -128,14 +128,16 @@ int main(int argc, char **argv)
 
 	starpu_data_unregister(handle);
 
+	ret = EXIT_SUCCESS;
 	if (var != ntasks*nloops)
-		fprintf(stderr, "VAR is %d should be %d\n", var, ntasks);
-
-	STARPU_ASSERT(var == ntasks*nloops);
+	{
+		FPRINTF(stderr, "VAR is %d should be %d\n", var, ntasks);
+		ret = EXIT_FAILURE;
+	}
 
 	starpu_shutdown();
 
-	return EXIT_SUCCESS;
+	return ret;
 
 enodev:
 	starpu_data_unregister(handle);

+ 6 - 4
tests/datawizard/wt_host.c

@@ -128,14 +128,16 @@ int main(int argc, char **argv)
 
 	starpu_data_unregister(handle);
 
+	ret = EXIT_SUCCESS;
 	if (var != ntasks*nloops)
-		fprintf(stderr, "VAR is %d should be %d\n", var, ntasks);
-
-	STARPU_ASSERT(var == ntasks*nloops);
+	{
+		ret = EXIT_FAILURE;
+		FPRINTF(stderr, "VAR is %d should be %d\n", var, ntasks);
+	}
 
 	starpu_shutdown();
 
-	return EXIT_SUCCESS;
+	return ret;
 
 enodev:
 	starpu_data_unregister(handle);

+ 1 - 1
tests/main/execute_on_a_specific_worker.c

@@ -55,7 +55,7 @@ static void callback(void *arg)
 static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
 //	int id = starpu_worker_get_id();
-//	fprintf(stderr, "worker #%d\n", id);
+//	FPRINTF(stderr, "worker #%d\n", id);
 }
 
 static struct starpu_codelet cl_r =

+ 1 - 1
tests/parallel_tasks/explicit_combined_worker.c

@@ -34,7 +34,7 @@ static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 #if 0
 	int id = starpu_worker_get_id();
 	int combined_id = starpu_combined_worker_get_id();
-	fprintf(stderr, "worker id %d - combined id %d - worker size %d\n", id, combined_id, worker_size);
+	FPRINTF(stderr, "worker id %d - combined id %d - worker size %d\n", id, combined_id, worker_size);
 #endif
 }
 

+ 1 - 1
tests/parallel_tasks/parallel_kernels.c

@@ -34,7 +34,7 @@ static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 #if 0
 	int id = starpu_worker_get_id();
 	int combined_id = starpu_combined_worker_get_id();
-	fprintf(stderr, "worker id %d - combined id %d - worker size %d\n", id, combined_id, worker_size);
+	FPRINTF(stderr, "worker id %d - combined id %d - worker size %d\n", id, combined_id, worker_size);
 #endif
 }
 

+ 1 - 1
tests/parallel_tasks/parallel_kernels_spmd.c

@@ -36,7 +36,7 @@ static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 	int id = starpu_worker_get_id();
 	int combined_id = starpu_combined_worker_get_id();
 	int rank = starpu_combined_worker_get_rank();
-	fprintf(stderr, "worker id %d - combined id %d - worker size %d - SPMD rank %d\n", id, combined_id, worker_size, rank);
+	FPRINTF(stderr, "worker id %d - combined id %d - worker size %d - SPMD rank %d\n", id, combined_id, worker_size, rank);
 #endif
 }
 

+ 2 - 2
tests/parallel_tasks/spmd_pgreedy.c

@@ -33,14 +33,14 @@ static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 	int worker_size = starpu_combined_worker_get_size();
 	STARPU_ASSERT(worker_size > 0);
 
-//	fprintf(stderr, "WORKERSIZE : %d\n", worker_size);
+//	FPRINTF(stderr, "WORKERSIZE : %d\n", worker_size);
 
 	usleep(1000/worker_size);
 #if 0
 	int id = starpu_worker_get_id();
 	int combined_id = starpu_combined_worker_get_id();
 	int rank = starpu_combined_worker_get_rank();
-	fprintf(stderr, "worker id %d - combined id %d - worker size %d - SPMD rank %d\n", id, combined_id, worker_size, rank);
+	FPRINTF(stderr, "worker id %d - combined id %d - worker size %d - SPMD rank %d\n", id, combined_id, worker_size, rank);
 #endif
 }