Browse Source

Replaces a bunch of "#if STARPU_USE_" by "#ifdef STARPU_USE_"

Cyril Roelandt 13 years ago
parent
commit
d07084a07f

+ 2 - 2
examples/basic_examples/multiformat.c

@@ -222,11 +222,11 @@ check_it(void)
 	for (i = 0; i < N_ELEMENTS; i++)
 	{
 		float expected_value = i + 1.0;
-#if STARPU_USE_CUDA
+#ifdef STARPU_USE_CUDA
 		if (ncuda > 0)
 			expected_value *= array_of_structs[i].y;
 #endif
-#if STARPU_USE_OPENCL
+#ifdef STARPU_USE_OPENCL
 		if (nopencl > 0)
 			expected_value *= array_of_structs[i].y;
 #endif

+ 2 - 2
src/core/sched_policy.c

@@ -379,12 +379,12 @@ struct starpu_task *_starpu_create_conversion_task(starpu_data_handle_t handle,
 			STARPU_ASSERT(0);
 		}
 		break;
-#if STARPU_USE_CUDA
+#ifdef STARPU_USE_CUDA
 	case STARPU_CUDA_RAM:
 		conversion_task->cl = format_interface->ops->cpu_to_cuda_cl;
 		break;
 #endif
-#if STARPU_USE_OPENCL
+#ifdef STARPU_USE_OPENCL
 	case STARPU_OPENCL_RAM:
 		conversion_task->cl = format_interface->ops->cpu_to_opencl_cl;
 		break;

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

@@ -202,7 +202,7 @@ static int multiformat_compare(void *data_interface_a, void *data_interface_b)
 #ifdef STARPU_USE_CUDA
 			&& (multiformat_a->ops->cuda_elemsize == multiformat_b->ops->cuda_elemsize)
 #endif
-#if STARPU_USE_OPENCL
+#ifdef STARPU_USE_OPENCL
 			&& (multiformat_a->ops->opencl_elemsize == multiformat_b->ops->opencl_elemsize)
 #endif
 		);

+ 1 - 1
tests/core/multiformat_data_release.c

@@ -156,7 +156,7 @@ create_and_submit(int where)
 #ifdef STARPU_USE_CUDA
 		.cuda_funcs   = {cuda_func, NULL},
 #endif
-#if STARPU_USE_OPENCL
+#ifdef STARPU_USE_OPENCL
 		.opencl_funcs = {opencl_func, NULL},
 #endif
 		.nbuffers    = 1

+ 1 - 1
tests/core/multiformat_handle_conversion.c

@@ -154,7 +154,7 @@ create_and_submit_tasks(int where, starpu_data_handle_t handles[])
 #ifdef STARPU_USE_CUDA
 		.cuda_funcs  = {cuda_func, NULL},
 #endif
-#if STARPU_USE_OPENCL
+#ifdef STARPU_USE_OPENCL
 		.opencl_funcs = {opencl_func, NULL},
 #endif
 		.nbuffers    = 1

+ 2 - 2
tests/datawizard/interfaces/test_interfaces.c

@@ -504,7 +504,7 @@ run_cuda(int async)
 }
 #endif /* !STARPU_USE_CUDA */
 
-#if STARPU_USE_OPENCL
+#ifdef STARPU_USE_OPENCL
 static void
 run_opencl(int async)
 {
@@ -516,7 +516,7 @@ run_opencl(int async)
 	if (err != SUCCESS)
 		return;
 
-#if STARPU_USE_CPU
+#ifdef STARPU_USE_CPU
 	err = opencl_to_ram();
 	set_field(&summary, async, OPENCL_TO_CPU, err);
 #endif /*!STARPU_USE_CPU */