Move src/core/policies/sched_policy.* into src/core/

src/Makefile.am

@@ -59,7 +59,7 @@ noinst_HEADERS = 						\
 	core/dependencies/htable.h				\
 	core/dependencies/implicit_data_deps.h			\
 	core/policies/eager_central_priority_policy.h		\
-	core/policies/sched_policy.h				\
+	core/sched_policy.h					\
 	core/policies/random_policy.h				\
 	core/policies/eager_central_policy.h			\
 	core/policies/deque_modeling_policy.h			\
@@ -139,7 +139,7 @@ libstarpu_la_SOURCES = 						\
 	core/policies/eager_central_policy.c			\
 	core/policies/eager_central_priority_policy.c		\
 	core/policies/work_stealing_policy.c			\
-	core/policies/sched_policy.c				\
+	core/sched_policy.c					\
 	core/policies/deque_modeling_policy.c			\
 	core/policies/random_policy.c				\
 	core/policies/deque_modeling_policy_data_aware.c	\

src/core/dependencies/data_concurrency.c

@@ -16,7 +16,7 @@
 
 #include <core/dependencies/data_concurrency.h>
 #include <datawizard/coherency.h>
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 #include <common/starpu_spinlock.h>
 #include <datawizard/sort_data_handles.h>
 

src/core/dependencies/dependencies.c

@@ -20,7 +20,7 @@
 #include <core/dependencies/tags.h>
 #include <core/dependencies/htable.h>
 #include <core/jobs.h>
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 #include <core/dependencies/data_concurrency.h>
 
 /* We assume that j->sync_mutex is taken by the caller */

src/core/dependencies/tags.c

@@ -20,7 +20,7 @@
 #include <core/dependencies/tags.h>
 #include <core/dependencies/htable.h>
 #include <core/jobs.h>
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 #include <core/dependencies/data_concurrency.h>
 
 static starpu_htbl_node_t *tag_htbl = NULL;

src/core/dependencies/task_deps.c

@@ -21,7 +21,7 @@
 #include <core/dependencies/htable.h>
 #include <core/jobs.h>
 #include <core/task.h>
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 #include <core/dependencies/data_concurrency.h>
 
 static starpu_cg_t *create_cg_task(unsigned ntags, starpu_job_t j)

src/core/policies/deque_modeling_policy.c

@@ -15,7 +15,9 @@
  */
 
 #include <common/config.h>
-#include <core/policies/deque_modeling_policy.h>
+#include <core/workers.h>
+#include <core/mechanisms/fifo_queues.h>
+#include <core/mechanisms/deque_queues.h>
 #include <core/perfmodel/perfmodel.h>
 
 static unsigned nworkers;

src/core/policies/sched_policy.c

@@ -19,13 +19,7 @@
 #include <starpu.h>
 #include <common/config.h>
 #include <common/utils.h>
-#include <core/policies/sched_policy.h>
-#include <core/policies/eager_central_policy.h>
-#include <core/policies/eager_central_priority_policy.h>
-#include <core/policies/work_stealing_policy.h>
-#include <core/policies/deque_modeling_policy.h>
-#include <core/policies/random_policy.h>
-#include <core/policies/deque_modeling_policy_data_aware.h>
+#include <core/sched_policy.h>
 
 static struct starpu_sched_policy_s policy;
 
@@ -40,6 +34,14 @@ int _starpu_get_prefetch_flag(void)
  *	Predefined policies
  */
 
+extern struct starpu_sched_policy_s _starpu_sched_ws_policy;
+extern struct starpu_sched_policy_s _starpu_sched_prio_policy;
+extern struct starpu_sched_policy_s _starpu_sched_no_prio_policy;
+extern struct starpu_sched_policy_s _starpu_sched_random_policy;
+extern struct starpu_sched_policy_s _starpu_sched_dm_policy;
+extern struct starpu_sched_policy_s _starpu_sched_dmda_policy;
+extern struct starpu_sched_policy_s _starpu_sched_eager_policy;
+
 #define NPREDEFINED_POLICIES	7
 
 static struct starpu_sched_policy_s *predefined_policies[NPREDEFINED_POLICIES] = {

src/core/workers.h

@@ -25,7 +25,7 @@
 #include <common/fxt.h>
 #include <core/jobs.h>
 #include <core/perfmodel/perfmodel.h>
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 #include <core/topology.h>
 #include <core/errorcheck.h>
 

src/datawizard/copy_driver.c

@@ -17,7 +17,7 @@
 #include <starpu.h>
 #include <common/config.h>
 #include <common/utils.h>
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 #include <datawizard/datastats.h>
 #include <common/fxt.h>
 #include "copy_driver.h"

src/datawizard/memory_nodes.c

@@ -16,7 +16,7 @@
 
 #include <pthread.h>
 #include <common/config.h>
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 #include <datawizard/datastats.h>
 #include <common/fxt.h>
 #include "copy_driver.h"

src/drivers/cpu/driver_cpu.c

@@ -22,7 +22,7 @@
 #include <common/utils.h>
 #include <core/debug.h>
 #include "driver_cpu.h"
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 
 static int execute_job_on_cpu(starpu_job_t j, struct starpu_worker_s *cpu_args)
 {

src/drivers/cuda/driver_cuda.c

@@ -22,7 +22,7 @@
 #include <core/debug.h>
 #include <drivers/driver_common/driver_common.h>
 #include "driver_cuda.h"
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 #include <profiling/profiling.h>
 
 /* the number of CUDA devices */

src/drivers/gordon/driver_gordon.c

@@ -23,7 +23,7 @@
 #include <common/utils.h>
 #include "driver_gordon.h"
 #include "gordon_interface.h"
-#include <core/policies/sched_policy.h>
+#include <core/sched_policy.h>
 
 static unsigned progress_thread_is_inited = 0;