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

examples, tests: add missing calls to starpu_shutdown()

Nathalie Furmento лет назад: 4
Родитель
Сommit
69bb30593f

+ 1 - 0
examples/reductions/dot_product.c

@@ -459,6 +459,7 @@ int main(void)
 	}
 
 enodev:
+	starpu_shutdown();
 	FPRINTF(stderr, "WARNING: No one can execute this task\n");
 	/* yes, we do not perform the computation but we did detect that no one
  	 * could perform the kernel, so this is not an error from StarPU */

+ 6 - 1
examples/sched_ctx/two_cpu_contexts.c

@@ -44,16 +44,21 @@ int main(void)
 	int *procs2 = NULL;
 	int i;
 	int n = 20;
+
 	int ret = starpu_init(NULL);
 	if (ret == -ENODEV)
 		return 77;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
-	ncpu = starpu_cpu_worker_get_count();
 
+	ncpu = starpu_cpu_worker_get_count();
 	/* actually we really need at least 2 CPU workers such to allocate 2
 	 * non overlapping contexts */
 	if (ncpu < 2)
+	{
+		starpu_shutdown();
 		return 77;
+	}
+
 	procs = calloc(ncpu, sizeof(int));
 	starpu_worker_get_ids_by_type(STARPU_CPU_WORKER, procs, ncpu);
 

+ 5 - 1
tests/datawizard/data_invalidation.c

@@ -148,7 +148,11 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-	if(starpu_cpu_worker_get_count() == 0) return STARPU_TEST_SKIPPED;
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
 
 	/* The buffer should never be explicitely allocated */
 	starpu_vector_data_register(&v_handle, (uint32_t)-1, (uintptr_t)NULL, VECTORSIZE, sizeof(char));

+ 8 - 1
tests/datawizard/interfaces/bcsr/bcsr_interface.c

@@ -182,8 +182,15 @@ main(int argc, char **argv)
 	conf.ncuda = 2;
 	conf.nopencl = 1;
 
-	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0)
+	int ret = starpu_initialize(&conf, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
+	}
 
 	register_data();
 

+ 9 - 5
tests/datawizard/interfaces/block/block_interface.c

@@ -137,8 +137,15 @@ main(int argc, char **argv)
 	conf.ncuda = 2;
 	conf.nopencl = 1;
 
-	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0)
-		goto enodev;
+	int ret = starpu_initialize(&conf, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
 
 	register_data();
 
@@ -151,8 +158,5 @@ main(int argc, char **argv)
 	data_interface_test_summary_print(stderr, &summary);
 
 	return data_interface_test_summary_success(&summary);
-
-enodev:
-	return STARPU_TEST_SKIPPED;
 }
 

+ 9 - 2
tests/datawizard/interfaces/coo/coo_interface.c

@@ -155,8 +155,15 @@ main(int argc, char **argv)
 	conf.ncuda = 2;
 	conf.nopencl = 1;
 
-	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0)
-		goto enodev;
+	int ret = starpu_initialize(&conf, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
 
 	register_data();
 

+ 9 - 2
tests/datawizard/interfaces/csr/csr_interface.c

@@ -146,8 +146,15 @@ int main(int argc, char **argv)
 	conf.ncuda = 2;
 	conf.nopencl = 1;
 
-	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0)
-		goto enodev;
+	int ret = starpu_initialize(&conf, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
 
 	register_data();
 

+ 9 - 2
tests/datawizard/interfaces/matrix/matrix_interface.c

@@ -120,8 +120,15 @@ int main(int argc, char **argv)
 	conf.ncuda = 2;
 	conf.nopencl = 1;
 
-	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0)
-		goto enodev;
+	int ret = starpu_initialize(&conf, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
 
 	register_data();
 

+ 8 - 3
tests/datawizard/interfaces/multiformat/multiformat_interface.c

@@ -138,11 +138,16 @@ int main(int argc, char **argv)
 	conf.ncuda = 2;
 	conf.nopencl = 1;
 
-	ret = starpu_initialize(&conf, &argc, &argv);
-	if (ret == -ENODEV || starpu_cpu_worker_get_count() == 0)
-		return STARPU_TEST_SKIPPED;
+	int ret = starpu_initialize(&conf, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
+
 	register_data();
 
 	run_tests(&multiformat_config, &summary);

+ 9 - 2
tests/datawizard/interfaces/tensor/tensor_interface.c

@@ -148,8 +148,15 @@ main(int argc, char **argv)
 	conf.ncuda = 2;
 	conf.nopencl = 1;
 
-	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0)
-		goto enodev;
+	int ret = starpu_initialize(&conf, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
 
 	register_data();
 

+ 7 - 1
tests/datawizard/interfaces/variable/variable_interface.c

@@ -99,8 +99,14 @@ int main(int argc, char **argv)
 	conf.nopencl = 1;
 
 	ret = starpu_initialize(&conf, &argc, &argv);
-	if (ret == -ENODEV || starpu_cpu_worker_get_count() == 0)
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
+	}
 
 	register_data();
 

+ 9 - 2
tests/datawizard/interfaces/vector/vector_interface.c

@@ -104,8 +104,15 @@ int main(int argc, char **argv)
 	conf.ncuda = 2;
 	conf.nopencl = 1;
 
-	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0)
-		goto enodev;
+	int ret = starpu_initialize(&conf, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
 
 	register_data();
 

+ 9 - 2
tests/datawizard/interfaces/void/void_interface.c

@@ -63,8 +63,15 @@ int main(int argc, char **argv)
 	conf.ncuda = 2;
 	conf.nopencl = 1;
 
-	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0)
-		goto enodev;
+	int ret = starpu_initialize(&conf, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if(starpu_cpu_worker_get_count() == 0)
+	{
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
 
 	register_data();