Browse Source

default value for enum starpu_archtype

Andra Hugo 12 years ago
parent
commit
2423b1c5c1

+ 1 - 0
configure.ac

@@ -238,6 +238,7 @@ AC_ARG_ENABLE([sched_ctx_hypervisor],
   [enable_sched_ctx_hypervisor="yes"],
   [enable_sched_ctx_hypervisor="no"])
 
+#for pkgconfig
 AC_SUBST(STARPU_SCHED_CTX_HYPERVISOR)
 if test "x$enable_sched_ctx_hypervisor" = "xyes"; then
   AC_DEFINE(STARPU_USE_SCHED_CTX_HYPERVISOR, [1], [enable sched_ctx_hypervisor lib])

+ 2 - 2
include/starpu.h

@@ -68,13 +68,13 @@ extern "C"
 
 enum starpu_archtype
 {
-#ifdef STARPU_ARCHTYPE_DEFAULT_VALUE
+#ifdef STARPU_USE_SCHED_CTX_HYPERVISOR
 	STARPU_ANY_WORKER, /* any worker, used in the hypervisor */
 #endif
 	STARPU_CPU_WORKER,    /* CPU core */
 	STARPU_CUDA_WORKER,   /* NVIDIA CUDA device */
 	STARPU_OPENCL_WORKER, /* OpenCL device */
-	STARPU_GORDON_WORKER,  /* Cell SPU */
+	STARPU_GORDON_WORKER  /* Cell SPU */
 };
 
 struct starpu_driver

+ 0 - 1
include/starpu_config.h.in

@@ -73,7 +73,6 @@
 #undef STARPU_NMAX_SCHED_CTXS
 #undef STARPU_MAXIMPLEMENTATIONS
 #undef STARPU_USE_SCHED_CTX_HYPERVISOR
-
 /* Define to 1 if you have the <glpk.h> header file. */
 #undef HAVE_GLPK_H
 

+ 0 - 2
sched_ctx_hypervisor/include/sched_ctx_hypervisor.h

@@ -17,8 +17,6 @@
 #ifndef STARPU_SCHED_CTX_HYPERVISOR_H
 #define STARPU_SCHED_CTX_HYPERVISOR_H
 
-#define STARPU_ARCHTYPE_DEFAULT_VALUE -1
-
 #include <starpu.h>
 #include <pthread.h>
 

+ 0 - 1
src/core/workers.c

@@ -1137,7 +1137,6 @@ enum starpu_archtype starpu_worker_get_type(int id)
 int starpu_worker_get_ids_by_type(enum starpu_archtype type, int *workerids, int maxsize)
 {
 	unsigned nworkers = starpu_worker_get_count();
-
 	int cnt = 0;
 
 	unsigned id;