ソースを参照

Use simpler code to fake cholesky kernels

Samuel Thibault 12 年 前
コミット
9360f01062
共有2 個のファイルを変更した9 個の追加7 個の削除を含む
  1. 0 4
      examples/cholesky/cholesky.h
  2. 9 3
      examples/cholesky/cholesky_implicit.c

+ 0 - 4
examples/cholesky/cholesky.h

@@ -77,10 +77,6 @@ void chol_cpu_codelet_update_u22(void **, void *);
 void chol_cublas_codelet_update_u11(void *descr[], void *_args);
 void chol_cublas_codelet_update_u21(void *descr[], void *_args);
 void chol_cublas_codelet_update_u22(void *descr[], void *_args);
-#elif defined(STARPU_SIMGRID)
-#define chol_cublas_codelet_update_u11 ((void*)1)
-#define chol_cublas_codelet_update_u21 ((void*)1)
-#define chol_cublas_codelet_update_u22 ((void*)1)
 #endif
 
 extern struct starpu_perfmodel chol_model_11;

+ 9 - 3
examples/cholesky/cholesky_implicit.c

@@ -27,8 +27,10 @@ static struct starpu_codelet cl11 =
 	.where = STARPU_CPU|STARPU_CUDA,
 	.type = STARPU_SEQ,
 	.cpu_funcs = {chol_cpu_codelet_update_u11, NULL},
-#if defined(STARPU_USE_CUDA) || defined (STARPU_SIMGRID)
+#ifdef STARPU_USE_CUDA
 	.cuda_funcs = {chol_cublas_codelet_update_u11, NULL},
+#elif defined(STARPU_SIMGRID)
+	.cuda_funcs = {(void*)1, NULL},
 #endif
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
@@ -40,8 +42,10 @@ static struct starpu_codelet cl21 =
 	.where = STARPU_CPU|STARPU_CUDA,
 	.type = STARPU_SEQ,
 	.cpu_funcs = {chol_cpu_codelet_update_u21, NULL},
-#if defined(STARPU_USE_CUDA) || defined (STARPU_SIMGRID)
+#ifdef STARPU_USE_CUDA
 	.cuda_funcs = {chol_cublas_codelet_update_u21, NULL},
+#elif defined(STARPU_SIMGRID)
+	.cuda_funcs = {(void*)1, NULL},
 #endif
 	.nbuffers = 2,
 	.modes = {STARPU_R, STARPU_RW},
@@ -54,8 +58,10 @@ static struct starpu_codelet cl22 =
 	.type = STARPU_SEQ,
 	.max_parallelism = INT_MAX,
 	.cpu_funcs = {chol_cpu_codelet_update_u22, NULL},
-#if defined(STARPU_USE_CUDA) || defined (STARPU_SIMGRID)
+#ifdef STARPU_USE_CUDA
 	.cuda_funcs = {chol_cublas_codelet_update_u22, NULL},
+#elif defined(STARPU_SIMGRID)
+	.cuda_funcs = {(void*)1, NULL},
 #endif
 	.nbuffers = 3,
 	.modes = {STARPU_R, STARPU_R, STARPU_RW},