瀏覽代碼

StarPU: Use character _ instead of - in filenames

Nathalie Furmento 15 年之前
父節點
當前提交
df88473141
共有 39 個文件被更改,包括 59 次插入59 次删除
  1. 21 21
      src/Makefile.am
  2. 1 1
      src/common/starpu-spinlock.c
  3. 0 0
      src/common/starpu_spinlock.h
  4. 2 2
      src/core/dependencies/data-concurrency.c
  5. 0 0
      src/core/dependencies/data_concurrency.h
  6. 1 1
      src/core/dependencies/tags.c
  7. 1 1
      src/core/dependencies/tags.h
  8. 1 1
      src/core/dependencies/task-deps.c
  9. 1 1
      src/core/jobs.c
  10. 1 1
      src/core/policies/deque-modeling-policy.c
  11. 0 0
      src/core/policies/deque_modeling_policy.h
  12. 1 1
      src/core/policies/deque-modeling-policy-data-aware.c
  13. 0 0
      src/core/policies/deque_modeling_policy_data_aware.h
  14. 1 1
      src/core/policies/eager-central-policy.c
  15. 0 0
      src/core/policies/eager_central_policy.h
  16. 1 1
      src/core/policies/eager-central-priority-policy.c
  17. 0 0
      src/core/policies/eager_central_priority_policy.h
  18. 1 1
      src/core/policies/no-prio-policy.c
  19. 0 0
      src/core/policies/no_prio_policy.h
  20. 1 1
      src/core/policies/random-policy.c
  21. 0 0
      src/core/policies/random_policy.h
  22. 7 7
      src/core/policies/sched_policy.c
  23. 1 1
      src/core/policies/work-stealing-policy.c
  24. 0 0
      src/core/policies/work_stealing_policy.h
  25. 2 2
      src/datawizard/coherency.c
  26. 1 1
      src/datawizard/coherency.h
  27. 1 1
      src/datawizard/copy-driver.c
  28. 0 0
      src/datawizard/copy_driver.h
  29. 2 2
      src/datawizard/data_request.h
  30. 1 1
      src/datawizard/datawizard.h
  31. 1 1
      src/datawizard/interfaces/bcsr_interface.c
  32. 1 1
      src/datawizard/interfaces/block_interface.c
  33. 1 1
      src/datawizard/interfaces/csr_interface.c
  34. 1 1
      src/datawizard/interfaces/matrix_interface.c
  35. 1 1
      src/datawizard/interfaces/variable_interface.c
  36. 1 1
      src/datawizard/interfaces/vector_interface.c
  37. 1 1
      src/datawizard/memalloc.h
  38. 1 1
      src/datawizard/memory_nodes.c
  39. 2 2
      src/datawizard/user_interactions.c

+ 21 - 21
src/Makefile.am

@@ -27,18 +27,18 @@ libstarpu_la_LIBADD = -lm $(HWLOC_LIBS)
 libstarpu_la_LDFLAGS = --no-undefined
 
 noinst_HEADERS = 						\
-	core/dependencies/data-concurrency.h			\
+	core/dependencies/data_concurrency.h			\
 	core/dependencies/cg.h					\
 	core/dependencies/tags.h				\
 	core/dependencies/htable.h				\
-	core/policies/eager-central-priority-policy.h		\
+	core/policies/eager_central_priority_policy.h		\
 	core/policies/sched_policy.h				\
-	core/policies/random-policy.h				\
-	core/policies/eager-central-policy.h			\
-	core/policies/deque-modeling-policy.h			\
-	core/policies/no-prio-policy.h				\
-	core/policies/deque-modeling-policy-data-aware.h	\
-	core/policies/work-stealing-policy.h			\
+	core/policies/random_policy.h				\
+	core/policies/eager_central_policy.h			\
+	core/policies/deque_modeling_policy.h			\
+	core/policies/no_prio_policy.h				\
+	core/policies/deque_modeling_policy_data_aware.h	\
+	core/policies/work_stealing_policy.h			\
 	core/mechanisms/priority_queues.h			\
 	core/mechanisms/fifo_queues.h				\
 	core/mechanisms/deque_queues.h				\
@@ -60,7 +60,7 @@ noinst_HEADERS = 						\
 	datawizard/write_back.h					\
 	datawizard/datastats.h					\
 	datawizard/memalloc.h					\
-	datawizard/copy-driver.h				\
+	datawizard/copy_driver.h				\
 	datawizard/coherency.h					\
 	datawizard/sort_data_handles.h				\
 	datawizard/memory_nodes.h				\
@@ -70,7 +70,7 @@ noinst_HEADERS = 						\
 	common/htable32.h					\
 	common/list.h						\
 	common/rwlock.h						\
-	common/starpu-spinlock.h				\
+	common/starpu_spinlock.h				\
 	common/fxt.h						\
 	common/utils.h						\
 	drivers/cpu/driver_cpu.h				\
@@ -82,7 +82,7 @@ libstarpu_la_SOURCES = 						\
 	common/hash.c 						\
 	common/htable32.c					\
 	common/rwlock.c						\
-	common/starpu-spinlock.c				\
+	common/starpu_spinlock.c				\
 	common/timing.c						\
 	common/fxt.c						\
 	common/utils.c						\
@@ -95,9 +95,9 @@ libstarpu_la_SOURCES = 						\
 	core/progress_hook.c					\
 	core/dependencies/cg.c					\
 	core/dependencies/tags.c				\
-	core/dependencies/task-deps.c				\
+	core/dependencies/task_deps.c				\
 	core/dependencies/htable.c				\
-	core/dependencies/data-concurrency.c			\
+	core/dependencies/data_concurrency.c			\
 	core/mechanisms/queues.c				\
 	core/mechanisms/deque_queues.c				\
 	core/mechanisms/priority_queues.c			\
@@ -106,20 +106,20 @@ libstarpu_la_SOURCES = 						\
 	core/perfmodel/perfmodel_bus.c				\
 	core/perfmodel/perfmodel.c				\
 	core/perfmodel/regression.c				\
-	core/policies/no-prio-policy.c				\
-	core/policies/eager-central-policy.c			\
-	core/policies/eager-central-priority-policy.c		\
-	core/policies/work-stealing-policy.c			\
+	core/policies/no_prio_policy.c				\
+	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/policies/deque-modeling-policy.c			\
-	core/policies/random-policy.c				\
-	core/policies/deque-modeling-policy-data-aware.c	\
+	core/policies/deque_modeling_policy.c			\
+	core/policies/random_policy.c				\
+	core/policies/deque_modeling_policy_data_aware.c	\
 	datawizard/memory_nodes.c				\
 	datawizard/write_back.c					\
 	datawizard/coherency.c					\
 	datawizard/data_request.c				\
 	datawizard/progress.c					\
-	datawizard/copy-driver.c				\
+	datawizard/copy_driver.c				\
 	datawizard/hierarchy.c					\
 	datawizard/sort_data_handles.c				\
 	datawizard/memalloc.c					\

+ 1 - 1
src/common/starpu-spinlock.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <common/starpu-spinlock.h>
+#include <common/starpu_spinlock.h>
 #include <common/config.h>
 #include <starpu_util.h>
 

src/common/starpu-spinlock.h → src/common/starpu_spinlock.h


+ 2 - 2
src/core/dependencies/data-concurrency.c

@@ -14,10 +14,10 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <core/dependencies/data-concurrency.h>
+#include <core/dependencies/data_concurrency.h>
 #include <datawizard/coherency.h>
 #include <core/policies/sched_policy.h>
-#include <common/starpu-spinlock.h>
+#include <common/starpu_spinlock.h>
 #include <datawizard/sort_data_handles.h>
 
 static unsigned _submit_job_enforce_data_deps(starpu_job_t j, unsigned start_buffer_index);

src/core/dependencies/data-concurrency.h → src/core/dependencies/data_concurrency.h


+ 1 - 1
src/core/dependencies/tags.c

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

+ 1 - 1
src/core/dependencies/tags.h

@@ -19,7 +19,7 @@
 
 #include <starpu.h>
 #include <common/config.h>
-#include <common/starpu-spinlock.h>
+#include <common/starpu_spinlock.h>
 #include <core/dependencies/cg.h>
 
 #define STARPU_TAG_SIZE        (sizeof(starpu_tag_t)*8)

+ 1 - 1
src/core/dependencies/task-deps.c

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

+ 1 - 1
src/core/jobs.c

@@ -17,7 +17,7 @@
 #include <core/jobs.h>
 #include <core/task.h>
 #include <core/workers.h>
-#include <core/dependencies/data-concurrency.h>
+#include <core/dependencies/data_concurrency.h>
 #include <common/config.h>
 
 size_t _starpu_job_get_data_size(starpu_job_t j)

+ 1 - 1
src/core/policies/deque-modeling-policy.c

@@ -15,7 +15,7 @@
  */
 
 #include <common/config.h>
-#include <core/policies/deque-modeling-policy.h>
+#include <core/policies/deque_modeling_policy.h>
 #include <core/perfmodel/perfmodel.h>
 
 static unsigned nworkers;

src/core/policies/deque-modeling-policy.h → src/core/policies/deque_modeling_policy.h


+ 1 - 1
src/core/policies/deque-modeling-policy-data-aware.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <core/policies/deque-modeling-policy-data-aware.h>
+#include <core/policies/deque_modeling_policy_data_aware.h>
 #include <core/perfmodel/perfmodel.h>
 
 static unsigned nworkers;

src/core/policies/deque-modeling-policy-data-aware.h → src/core/policies/deque_modeling_policy_data_aware.h


+ 1 - 1
src/core/policies/eager-central-policy.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <core/policies/eager-central-policy.h>
+#include <core/policies/eager_central_policy.h>
 
 /*
  *	This is just the trivial policy where every worker use the same

src/core/policies/eager-central-policy.h → src/core/policies/eager_central_policy.h


+ 1 - 1
src/core/policies/eager-central-priority-policy.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <core/policies/eager-central-priority-policy.h>
+#include <core/policies/eager_central_priority_policy.h>
 
 /* the former is the actual queue, the latter some container */
 static struct starpu_jobq_s *jobq;

src/core/policies/eager-central-priority-policy.h → src/core/policies/eager_central_priority_policy.h


+ 1 - 1
src/core/policies/no-prio-policy.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <core/policies/no-prio-policy.h>
+#include <core/policies/no_prio_policy.h>
 
 /*
  *	This is just the trivial policy where every worker use the same

src/core/policies/no-prio-policy.h → src/core/policies/no_prio_policy.h


+ 1 - 1
src/core/policies/random-policy.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <core/policies/random-policy.h>
+#include <core/policies/random_policy.h>
 
 /* XXX 32 is set randomly */
 static unsigned nworkers;

src/core/policies/random-policy.h → src/core/policies/random_policy.h


+ 7 - 7
src/core/policies/sched_policy.c

@@ -20,13 +20,13 @@
 #include <common/config.h>
 #include <core/mechanisms/queues.h>
 #include <core/policies/sched_policy.h>
-#include <core/policies/no-prio-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/policies/no_prio_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>
 
 static struct starpu_sched_policy_s policy;
 

+ 1 - 1
src/core/policies/work-stealing-policy.c

@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <core/policies/work-stealing-policy.h>
+#include <core/policies/work_stealing_policy.h>
 
 /* save the general machine configuration */
 //static struct starpu_machine_config_s *machineconfig;

src/core/policies/work-stealing-policy.h → src/core/policies/work_stealing_policy.h


+ 2 - 2
src/datawizard/coherency.c

@@ -16,9 +16,9 @@
 
 #include <common/config.h>
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/write_back.h>
-#include <core/dependencies/data-concurrency.h>
+#include <core/dependencies/data_concurrency.h>
 
 uint32_t _starpu_select_node_to_handle_request(uint32_t src_node, uint32_t dst_node) 
 {

+ 1 - 1
src/datawizard/coherency.h

@@ -27,7 +27,7 @@
 #include <starpu.h>
 
 #include <pthread.h>
-#include <common/starpu-spinlock.h>
+#include <common/starpu_spinlock.h>
 #include <common/rwlock.h>
 #include <common/timing.h>
 #include <common/fxt.h>

+ 1 - 1
src/datawizard/copy-driver.c

@@ -19,7 +19,7 @@
 #include <core/policies/sched_policy.h>
 #include <datawizard/datastats.h>
 #include <common/fxt.h>
-#include "copy-driver.h"
+#include "copy_driver.h"
 #include "memalloc.h"
 
 void _starpu_wake_all_blocked_workers_on_node(unsigned nodeid)

src/datawizard/copy-driver.h → src/datawizard/copy_driver.h


+ 2 - 2
src/datawizard/data_request.h

@@ -19,9 +19,9 @@
 
 #include <semaphore.h>
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <common/list.h>
-#include <common/starpu-spinlock.h>
+#include <common/starpu_spinlock.h>
 
 #define DATA_REQ_ALLOCATE	(1<<0)
 #define DATA_REQ_COPY		(1<<1)

+ 1 - 1
src/datawizard/datawizard.h

@@ -19,7 +19,7 @@
 
 #include <datawizard/coherency.h>
 #include <datawizard/hierarchy.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/footprint.h>
 
 #include <datawizard/progress.h>

+ 1 - 1
src/datawizard/interfaces/bcsr_interface.c

@@ -18,7 +18,7 @@
 #include <common/config.h>
 
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/hierarchy.h>
 #include <common/hash.h>
 

+ 1 - 1
src/datawizard/interfaces/block_interface.c

@@ -17,7 +17,7 @@
 #include <starpu.h>
 #include <common/config.h>
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/hierarchy.h>
 
 #include <common/hash.h>

+ 1 - 1
src/datawizard/interfaces/csr_interface.c

@@ -17,7 +17,7 @@
 #include <starpu.h>
 #include <common/config.h>
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/hierarchy.h>
 
 #include <common/hash.h>

+ 1 - 1
src/datawizard/interfaces/matrix_interface.c

@@ -17,7 +17,7 @@
 #include <starpu.h>
 #include <common/config.h>
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/hierarchy.h>
 
 #include <common/hash.h>

+ 1 - 1
src/datawizard/interfaces/variable_interface.c

@@ -18,7 +18,7 @@
 #include <starpu.h>
 #include <common/config.h>
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/hierarchy.h>
 
 #include <common/hash.h>

+ 1 - 1
src/datawizard/interfaces/vector_interface.c

@@ -17,7 +17,7 @@
 #include <starpu.h>
 #include <common/config.h>
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/hierarchy.h>
 
 #include <common/hash.h>

+ 1 - 1
src/datawizard/memalloc.h

@@ -23,7 +23,7 @@
 #include <common/list.h>
 #include <datawizard/interfaces/data_interface.h>
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/progress.h>
 
 LIST_TYPE(starpu_mem_chunk,

+ 1 - 1
src/datawizard/memory_nodes.c

@@ -19,7 +19,7 @@
 #include <core/policies/sched_policy.h>
 #include <datawizard/datastats.h>
 #include <common/fxt.h>
-#include "copy-driver.h"
+#include "copy_driver.h"
 #include "memalloc.h"
 
 static starpu_mem_node_descr descr;

+ 2 - 2
src/datawizard/user_interactions.c

@@ -16,9 +16,9 @@
 
 #include <common/config.h>
 #include <datawizard/coherency.h>
-#include <datawizard/copy-driver.h>
+#include <datawizard/copy_driver.h>
 #include <datawizard/write_back.h>
-#include <core/dependencies/data-concurrency.h>
+#include <core/dependencies/data_concurrency.h>
 
 int starpu_request_data_allocation(starpu_data_handle handle, uint32_t node)
 {