Renaming modular strategies : tree-.. => modular-..

src/Makefile.am

@@ -259,14 +259,14 @@ libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES = 		\
 	sched_policies/component_best_implementation.c		\
 	sched_policies/component_perfmodel_select.c				\
 	sched_policies/component_composed.c				\
-	sched_policies/tree_eager.c				\
-	sched_policies/tree_eager_prefetching.c				\
-	sched_policies/tree_prio.c				\
-	sched_policies/tree_prio_prefetching.c				\
-	sched_policies/tree_random.c				\
-	sched_policies/tree_random_prefetching.c			\
-	sched_policies/tree_heft.c				\
-	sched_policies/tree_heft2.c
+	sched_policies/modular_eager.c				\
+	sched_policies/modular_eager_prefetching.c				\
+	sched_policies/modular_prio.c				\
+	sched_policies/modular_prio_prefetching.c				\
+	sched_policies/modular_random.c				\
+	sched_policies/modular_random_prefetching.c			\
+	sched_policies/modular_heft.c				\
+	sched_policies/modular_heft2.c
 
 
 if STARPU_HAVE_LEVELDB

src/core/sched_policy.c

@@ -35,17 +35,17 @@ int starpu_get_prefetch_flag(void)
 
 static struct starpu_sched_policy *predefined_policies[] =
 {
-	&_starpu_sched_tree_eager_policy,
-	&_starpu_sched_tree_eager_prefetching_policy,
-	&_starpu_sched_tree_prio_policy,
-	&_starpu_sched_tree_prio_prefetching_policy,
-	&_starpu_sched_tree_random_policy,
-	&_starpu_sched_tree_random_prio_policy,
-	&_starpu_sched_tree_random_prefetching_policy,
-	&_starpu_sched_tree_random_prio_prefetching_policy,
-	//&_starpu_sched_tree_ws_policy,
-	&_starpu_sched_tree_heft_policy,
-	&_starpu_sched_tree_heft2_policy,
+	&_starpu_sched_modular_eager_policy,
+	&_starpu_sched_modular_eager_prefetching_policy,
+	&_starpu_sched_modular_prio_policy,
+	&_starpu_sched_modular_prio_prefetching_policy,
+	&_starpu_sched_modular_random_policy,
+	&_starpu_sched_modular_random_prio_policy,
+	&_starpu_sched_modular_random_prefetching_policy,
+	&_starpu_sched_modular_random_prio_prefetching_policy,
+	//&_starpu_sched_modular_ws_policy,
+	&_starpu_sched_modular_heft_policy,
+	&_starpu_sched_modular_heft2_policy,
 	&_starpu_sched_eager_policy,
 	&_starpu_sched_prio_policy,
 	&_starpu_sched_random_policy,
@@ -167,7 +167,7 @@ struct starpu_sched_policy *_starpu_select_sched_policy(struct _starpu_machine_c
 		return selected_policy;
 
 	/* If no policy was specified, we use the greedy policy as a default */
-	return &_starpu_sched_tree_eager_prefetching_policy;
+	return &_starpu_sched_modular_eager_prefetching_policy;
 }
 
 void _starpu_init_sched_policy(struct _starpu_machine_config *config, struct _starpu_sched_ctx *sched_ctx, struct starpu_sched_policy *selected_policy)

src/core/sched_policy.h

@@ -68,15 +68,15 @@ extern struct starpu_sched_policy _starpu_sched_dmda_sorted_policy;
 extern struct starpu_sched_policy _starpu_sched_eager_policy;
 extern struct starpu_sched_policy _starpu_sched_parallel_heft_policy;
 extern struct starpu_sched_policy _starpu_sched_peager_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_eager_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_eager_prefetching_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_prio_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_prio_prefetching_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_random_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_random_prio_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_random_prefetching_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_random_prio_prefetching_policy;
-//extern struct starpu_sched_policy _starpu_sched_tree_ws_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_heft_policy;
-extern struct starpu_sched_policy _starpu_sched_tree_heft2_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_eager_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_eager_prefetching_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_prio_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_prio_prefetching_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_random_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_random_prio_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_random_prefetching_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_random_prio_prefetching_policy;
+//extern struct starpu_sched_policy _starpu_sched_modular_ws_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_heft_policy;
+extern struct starpu_sched_policy _starpu_sched_modular_heft2_policy;
 #endif // __SCHED_POLICY_H__

src/sched_policies/component_worker.c

@@ -608,6 +608,7 @@ static struct starpu_sched_component * starpu_sched_component_worker_create(int
 	starpu_bitmap_or(component->workers_in_ctx, component->workers);
 	_worker_components[workerid] = component;
 
+	/*
 #ifdef STARPU_HAVE_HWLOC
 	struct _starpu_machine_config *config = _starpu_get_machine_config();
 	struct _starpu_machine_topology *topology = &config->topology;
@@ -615,6 +616,7 @@ static struct starpu_sched_component * starpu_sched_component_worker_create(int
 	STARPU_ASSERT(obj);
 	component->obj = obj;
 #endif
+	*/
 
 	return component;
 }

src/sched_policies/tree_eager.c

@@ -49,7 +49,7 @@ static void deinitialize_eager_center_policy(unsigned sched_ctx_id)
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_eager_policy =
+struct starpu_sched_policy _starpu_sched_modular_eager_policy =
 {
 	.init_sched = initialize_eager_center_policy,
 	.deinit_sched = deinitialize_eager_center_policy,
@@ -60,6 +60,6 @@ struct starpu_sched_policy _starpu_sched_tree_eager_policy =
 	.pre_exec_hook = starpu_sched_component_worker_pre_exec_hook,
 	.post_exec_hook = starpu_sched_component_worker_post_exec_hook,
 	.pop_every_task = NULL,
-	.policy_name = "tree-eager",
-	.policy_description = "eager tree policy"
+	.policy_name = "modular-eager",
+	.policy_description = "eager modular policy"
 };

src/sched_policies/tree_eager_prefetching.c

@@ -74,7 +74,7 @@ static void deinitialize_eager_prefetching_center_policy(unsigned sched_ctx_id)
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_eager_prefetching_policy =
+struct starpu_sched_policy _starpu_sched_modular_eager_prefetching_policy =
 {
 	.init_sched = initialize_eager_prefetching_center_policy,
 	.deinit_sched = deinitialize_eager_prefetching_center_policy,
@@ -85,6 +85,6 @@ struct starpu_sched_policy _starpu_sched_tree_eager_prefetching_policy =
 	.pre_exec_hook = starpu_sched_component_worker_pre_exec_hook,
 	.post_exec_hook = starpu_sched_component_worker_post_exec_hook,
 	.pop_every_task = NULL,
-	.policy_name = "tree-eager-prefetching",
-	.policy_description = "eager with prefetching tree policy"
+	.policy_name = "modular-eager-prefetching",
+	.policy_description = "eager with prefetching modular policy"
 };

src/sched_policies/tree_heft.c

@@ -145,7 +145,7 @@ static void deinitialize_heft_center_policy(unsigned sched_ctx_id)
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_heft_policy =
+struct starpu_sched_policy _starpu_sched_modular_heft_policy =
 {
 	.init_sched = initialize_heft_center_policy,
 	.deinit_sched = deinitialize_heft_center_policy,
@@ -156,6 +156,6 @@ struct starpu_sched_policy _starpu_sched_tree_heft_policy =
 	.pre_exec_hook = starpu_sched_component_worker_pre_exec_hook,
 	.post_exec_hook = starpu_sched_component_worker_post_exec_hook,
 	.pop_every_task = NULL,
-	.policy_name = "tree-heft",
-	.policy_description = "heft tree policy"
+	.policy_name = "modular-heft",
+	.policy_description = "heft modular policy"
 };

src/sched_policies/tree_heft2.c

@@ -112,7 +112,7 @@ static void deinitialize_heft2_center_policy(unsigned sched_ctx_id)
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_heft2_policy =
+struct starpu_sched_policy _starpu_sched_modular_heft2_policy =
 {
 	.init_sched = initialize_heft2_center_policy,
 	.deinit_sched = deinitialize_heft2_center_policy,
@@ -123,6 +123,6 @@ struct starpu_sched_policy _starpu_sched_tree_heft2_policy =
 	.pre_exec_hook = starpu_sched_component_worker_pre_exec_hook,
 	.post_exec_hook = starpu_sched_component_worker_post_exec_hook,
 	.pop_every_task = NULL,
-	.policy_name = "tree-heft2",
-	.policy_description = "heft tree2 policy"
+	.policy_name = "modular-heft2",
+	.policy_description = "heft modular2 policy"
 };

src/sched_policies/tree_prio.c

@@ -46,7 +46,7 @@ static void deinitialize_prio_center_policy(unsigned sched_ctx_id)
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_prio_policy =
+struct starpu_sched_policy _starpu_sched_modular_prio_policy =
 {
 	.init_sched = initialize_prio_center_policy,
 	.deinit_sched = deinitialize_prio_center_policy,
@@ -57,6 +57,6 @@ struct starpu_sched_policy _starpu_sched_tree_prio_policy =
 	.pre_exec_hook = starpu_sched_component_worker_pre_exec_hook,
 	.post_exec_hook = starpu_sched_component_worker_post_exec_hook,
 	.pop_every_task = NULL,
-	.policy_name = "tree-prio",
-	.policy_description = "prio tree policy"
+	.policy_name = "modular-prio",
+	.policy_description = "prio modular policy"
 };

src/sched_policies/tree_prio_prefetching.c

@@ -70,7 +70,7 @@ static void deinitialize_prio_prefetching_center_policy(unsigned sched_ctx_id)
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_prio_prefetching_policy =
+struct starpu_sched_policy _starpu_sched_modular_prio_prefetching_policy =
 {
 	.init_sched = initialize_prio_prefetching_center_policy,
 	.deinit_sched = deinitialize_prio_prefetching_center_policy,
@@ -81,6 +81,6 @@ struct starpu_sched_policy _starpu_sched_tree_prio_prefetching_policy =
 	.pre_exec_hook = starpu_sched_component_worker_pre_exec_hook,
 	.post_exec_hook = starpu_sched_component_worker_post_exec_hook,
 	.pop_every_task = NULL,
-	.policy_name = "tree-prio-prefetching",
-	.policy_description = "prio prefetching tree policy"
+	.policy_name = "modular-prio-prefetching",
+	.policy_description = "prio prefetching modular policy"
 };

src/sched_policies/tree_random.c

@@ -49,7 +49,7 @@ static void deinitialize_random_fifo_center_policy(unsigned sched_ctx_id)
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_random_policy =
+struct starpu_sched_policy _starpu_sched_modular_random_policy =
 {
 	.init_sched = initialize_random_fifo_center_policy,
 	.deinit_sched = deinitialize_random_fifo_center_policy,
@@ -60,8 +60,8 @@ struct starpu_sched_policy _starpu_sched_tree_random_policy =
 	.pre_exec_hook = NULL,
 	.post_exec_hook = NULL,
 	.pop_every_task = NULL,
-	.policy_name = "tree-random",
-	.policy_description = "random tree policy"
+	.policy_name = "modular-random",
+	.policy_description = "random modular policy"
 };
 
 /* Random scheduler with a priority queue for its scheduling window */
@@ -95,7 +95,7 @@ static void deinitialize_random_prio_center_policy(unsigned sched_ctx_id)
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_random_prio_policy =
+struct starpu_sched_policy _starpu_sched_modular_random_prio_policy =
 {
 	.init_sched = initialize_random_prio_center_policy,
 	.deinit_sched = deinitialize_random_prio_center_policy,
@@ -106,6 +106,6 @@ struct starpu_sched_policy _starpu_sched_tree_random_prio_policy =
 	.pre_exec_hook = NULL,
 	.post_exec_hook = NULL,
 	.pop_every_task = NULL,
-	.policy_name = "tree-random-prio",
-	.policy_description = "random-prio tree policy"
+	.policy_name = "modular-random-prio",
+	.policy_description = "random-prio modular policy"
 };

src/sched_policies/tree_random_prefetching.c

@@ -73,7 +73,7 @@ static void deinitialize_random_fifo_prefetching_center_policy(unsigned sched_ct
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_random_prefetching_policy =
+struct starpu_sched_policy _starpu_sched_modular_random_prefetching_policy =
 {
 	.init_sched = initialize_random_fifo_prefetching_center_policy,
 	.deinit_sched = deinitialize_random_fifo_prefetching_center_policy,
@@ -84,8 +84,8 @@ struct starpu_sched_policy _starpu_sched_tree_random_prefetching_policy =
 	.pre_exec_hook = NULL,
 	.post_exec_hook = NULL,
 	.pop_every_task = NULL,
-	.policy_name = "tree-random-prefetching",
-	.policy_description = "random prefetching tree policy"
+	.policy_name = "modular-random-prefetching",
+	.policy_description = "random prefetching modular policy"
 };
 
 /* Random scheduler with priority queues for its scheduling window and its workers. */
@@ -140,7 +140,7 @@ static void deinitialize_random_prio_prefetching_center_policy(unsigned sched_ct
 	starpu_sched_ctx_delete_worker_collection(sched_ctx_id);
 }
 
-struct starpu_sched_policy _starpu_sched_tree_random_prio_prefetching_policy =
+struct starpu_sched_policy _starpu_sched_modular_random_prio_prefetching_policy =
 {
 	.init_sched = initialize_random_prio_prefetching_center_policy,
 	.deinit_sched = deinitialize_random_prio_prefetching_center_policy,
@@ -151,6 +151,6 @@ struct starpu_sched_policy _starpu_sched_tree_random_prio_prefetching_policy =
 	.pre_exec_hook = NULL,
 	.post_exec_hook = NULL,
 	.pop_every_task = NULL,
-	.policy_name = "tree-random-prio-prefetching",
-	.policy_description = "random-prio prefetching tree policy"
+	.policy_name = "modular-random-prio-prefetching",
+	.policy_description = "random-prio prefetching modular policy"
 };

src/sched_policies/tree_ws.c

@@ -45,7 +45,7 @@ static void deinitialize_ws_center_policy(unsigned sched_ctx_id)
 }
 
 
-struct starpu_sched_policy _starpu_sched_tree_ws_policy =
+struct starpu_sched_policy _starpu_sched_modular_ws_policy =
 {
 	.init_sched = initialize_ws_center_policy,
 	.deinit_sched = deinitialize_ws_center_policy,
@@ -56,6 +56,6 @@ struct starpu_sched_policy _starpu_sched_tree_ws_policy =
 	.pre_exec_hook = NULL,
 	.post_exec_hook = NULL,
 	.pop_every_task = NULL,
-	.policy_name = "tree-ws",
-	.policy_description = "work stealing tree policy"
+	.policy_name = "modular-ws",
+	.policy_description = "work stealing modular policy"
 };