Explorar el Código

tests: minor fixes following icc warnings

Nathalie Furmento hace 13 años
padre
commit
7445ed6406

+ 1 - 1
tests/datawizard/increment_redux.c

@@ -235,7 +235,7 @@ int main(int argc, char **argv)
 			task->cl = &increment_cl;
 			task->handles[0] = handle;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}

+ 1 - 1
tests/datawizard/increment_redux_lazy.c

@@ -216,7 +216,7 @@ int main(int argc, char **argv)
 			task->cl = &increment_cl;
 			task->handles[0] = handle;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}

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

@@ -154,13 +154,15 @@ data_interface_test_summary_success(data_interface_test_summary *s)
 
 enum operation
 {
-	CPU_TO_CPU,
+	CPU_TO_CPU
 #ifdef STARPU_USE_CUDA
+	,
 	CPU_TO_CUDA,
 	CUDA_TO_CUDA,
-	CUDA_TO_CPU,
+	CUDA_TO_CPU
 #endif /* !STARPU_USE_CUDA */
 #ifdef STARPU_USE_OPENCL
+	,
 	CPU_TO_OPENCL,
 	OPENCL_TO_CPU
 #endif /* !STARPU_USE_OPENCL */

+ 2 - 2
tests/datawizard/manual_reduction.c

@@ -202,7 +202,7 @@ int main(int argc, char **argv)
 		task->execute_on_a_specific_worker = 1;
 		task->workerid = (unsigned)workerid;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
 		task->handles[0] = variable_handle;
 		task->handles[1] = per_worker_handle[worker];
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}

+ 1 - 1
tests/datawizard/wt_host.c

@@ -114,7 +114,7 @@ int main(int argc, char **argv)
 		task->cl = &increment_cl;
 		task->handles[0] = handle;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}

+ 3 - 3
tests/errorcheck/starpu_init_noworker.c

@@ -60,9 +60,9 @@ int main(int argc, char **argv)
 		unsigned ncuda = starpu_cuda_worker_get_count();
 		unsigned nopencl = starpu_opencl_worker_get_count();
 		FPRINTF(stderr, "StarPU has found :\n");
-		FPRINTF(stderr, "\t%d CPU cores\n", ncpu);
-		FPRINTF(stderr, "\t%d CUDA devices\n", ncuda);
-		FPRINTF(stderr, "\t%d OpenCL devices\n", nopencl);
+		FPRINTF(stderr, "\t%u CPU cores\n", ncpu);
+		FPRINTF(stderr, "\t%u CUDA devices\n", ncuda);
+		FPRINTF(stderr, "\t%u OpenCL devices\n", nopencl);
 		return EXIT_FAILURE;
 	}
 

+ 1 - 1
tests/main/execute_on_a_specific_worker.c

@@ -138,7 +138,7 @@ int main(int argc, char **argv)
 			task->execute_on_a_specific_worker = 1;
 			task->workerid = worker;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}

+ 1 - 1
tests/microbenchs/async_tasks_overhead.c

@@ -136,7 +136,7 @@ int main(int argc, char **argv)
 	gettimeofday(&start, NULL);
 	for (i = 0; i < ntasks; i++)
 	{
-		int ret = starpu_task_submit(tasks[i]);
+		ret = starpu_task_submit(tasks[i]);
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}

+ 1 - 2
tests/microbenchs/matrix_as_vector.c

@@ -188,8 +188,7 @@ int check_size_on_device(uint32_t where, char *device_name)
 		if (ret != EXIT_SUCCESS) break;
 	}
 	return ret;
-
-};
+}
 
 int main(int argc, char **argv)
 {

+ 2 - 2
tests/microbenchs/prefetch_data_on_node.c

@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 			task->cl = select_codelet_with_random_mode();
 			task->synchronous = 1;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
 
 			task->synchronous = 0;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}

+ 1 - 1
tests/overlap/overlap.c

@@ -120,7 +120,7 @@ int main(int argc, char **argv)
 		task->callback_func = callback;
 		task->callback_arg = NULL;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}

+ 1 - 1
tests/parallel_tasks/parallel_kernels.c

@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 
 			task->handles[0] = v_handle;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}