Browse Source

disable policies not yet updated with new synchro scheme
mark tests/examples relying on such policies as expected_fail

Olivier Aumage 8 years ago
parent
commit
2330260513

+ 2 - 0
examples/fortran90/marshalling.c

@@ -159,6 +159,8 @@ int starpu_my_init_c()
 	struct starpu_conf conf;
 	starpu_conf_init(&conf);
 	conf.sched_policy_name = "dmda";
+#warning "dmda needs update with new synchro scheme"
+	exit(77);
 
 	ret = starpu_init(&conf);
 	/*     int ret = starpu_init(NULL); */

+ 4 - 0
examples/mandelbrot/mandelbrot.c

@@ -497,7 +497,11 @@ int main(int argc, char **argv)
 	conf.ncuda = 0;
 
 	if (use_spmd_p)
+	{
 		conf.sched_policy_name = "peager";
+#warning "peager needs update with new synchro scheme"
+		return 77;
+	}
 
 	ret = starpu_init(&conf);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");

+ 2 - 0
examples/openmp/vector_scal_omp.c

@@ -98,6 +98,8 @@ int main(int argc, char **argv)
 	 * sections, so only enable one combined worker at a time.  */
 	conf.single_combined_worker = 1;
 	conf.sched_policy_name = "pheft";
+#warning "pheft needs update with new synchro scheme"
+	return 77;
 
 	ret = starpu_init(&conf);
 	if (ret == -ENODEV) return 77;

+ 3 - 0
examples/scheduler/heteroprio_test.c

@@ -110,6 +110,9 @@ int main(int argc, char** argv)
 	assert(ret == 0);
 
 	conf.sched_policy_name = "heteroprio";
+#warning "heteroprio needs update with new synchro scheme"
+	return 77;
+
 	conf.sched_policy_init = &initSchedulerCallback;
 	ret = starpu_init(&conf);
 	if (ret == -ENODEV)

+ 2 - 0
examples/spmd/vector_scal_spmd.c

@@ -112,6 +112,8 @@ int main(int argc, char **argv)
 	starpu_conf_init(&conf);
 	conf.single_combined_worker = 1;
 	conf.sched_policy_name = "pheft";
+#warning "pheft needs update with new synchro scheme"
+	return 77;
 
 	ret = starpu_init(&conf);
 	if (ret == -ENODEV) return 77;

+ 6 - 2
src/core/sched_policy.c

@@ -52,6 +52,7 @@ int starpu_get_prefetch_flag(void)
 
 static struct starpu_sched_policy *predefined_policies[] =
 {
+#if 0
 	&_starpu_sched_modular_eager_policy,
 	&_starpu_sched_modular_eager_prefetching_policy,
 	&_starpu_sched_modular_prio_policy,
@@ -64,8 +65,6 @@ static struct starpu_sched_policy *predefined_policies[] =
 	&_starpu_sched_modular_heft_policy,
 	&_starpu_sched_modular_heft_prio_policy,
 	&_starpu_sched_modular_heft2_policy,
-	&_starpu_sched_eager_policy,
-	&_starpu_sched_prio_policy,
 	&_starpu_sched_random_policy,
 	&_starpu_sched_lws_policy,
 	&_starpu_sched_ws_policy,
@@ -78,6 +77,11 @@ static struct starpu_sched_policy *predefined_policies[] =
 	&_starpu_sched_peager_policy,
 	&_starpu_sched_heteroprio_policy,
 	&_starpu_sched_graph_test_policy,
+#else
+	&_starpu_sched_eager_policy,
+	&_starpu_sched_prio_policy,
+#warning TODO: update sched policies with new synchro scheme
+#endif
 	NULL
 };
 

+ 2 - 0
tests/parallel_tasks/cuda_only.c

@@ -66,6 +66,8 @@ int main(int argc, char **argv)
         struct starpu_conf conf;
 	starpu_conf_init(&conf);
 	conf.sched_policy_name = "pheft";
+#warning "pheft needs update with new synchro scheme"
+	return 77;
 
 	ret = starpu_init(&conf);
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;

+ 2 - 0
tests/parallel_tasks/explicit_combined_worker.c

@@ -69,6 +69,8 @@ int main(int argc, char **argv)
 	ret = starpu_conf_init(&conf);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_conf_init");
 	conf.sched_policy_name = "pheft";
+#warning "pheft needs update with new synchro scheme"
+	return 77;
 	conf.calibrate = 1;
 
 	ret = starpu_init(&conf);

+ 2 - 0
tests/parallel_tasks/parallel_kernels.c

@@ -75,6 +75,8 @@ int main(int argc, char **argv)
         struct starpu_conf conf;
 	starpu_conf_init(&conf);
 	conf.sched_policy_name = "pheft";
+#warning "pheft needs update with new synchro scheme"
+	return 77;
 	conf.calibrate = 1;
 
 	ret = starpu_init(&conf);

+ 2 - 0
tests/parallel_tasks/parallel_kernels_spmd.c

@@ -77,6 +77,8 @@ int main(int argc, char **argv)
         struct starpu_conf conf;
 	starpu_conf_init(&conf);
 	conf.sched_policy_name = "pheft";
+#warning "pheft needs update with new synchro scheme"
+	return 77;
 	conf.calibrate = 1;
 
 	ret = starpu_init(&conf);

+ 2 - 0
tests/parallel_tasks/spmd_peager.c

@@ -72,6 +72,8 @@ int main(int argc, char **argv)
         struct starpu_conf conf;
 	starpu_conf_init(&conf);
         conf.sched_policy_name = "peager";
+#warning "peager needs update with new synchro scheme"
+	return 77;
 
 	ret = starpu_init(&conf);
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;