瀏覽代碼

examples: minor fixes following icc warnings

Nathalie Furmento 12 年之前
父節點
當前提交
d87bb4efeb

+ 1 - 1
examples/incrementer/incrementer.c

@@ -94,7 +94,7 @@ int main(int argc, char **argv)
 
 		task->handles[0] = float_array_handle;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (STARPU_UNLIKELY(ret == -ENODEV))
 		{
 			FPRINTF(stderr, "No worker may execute this task\n");

+ 0 - 1
examples/lu/xlu_pivot.c

@@ -312,7 +312,6 @@ static int dw_codelet_facto_pivot(starpu_data_handle_t *dataAp,
 	gettimeofday(&start, NULL);
 	ret = starpu_task_submit(entry_task);
 	if (ret != -ENODEV) STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
-	return ret;
 
 	/* stall the application until the end of computations */
 	starpu_tag_wait_array(ndeps, tags);

+ 1 - 1
examples/mult/xgemm.c

@@ -304,7 +304,7 @@ int main(int argc, char **argv)
 			task->handles[1] = starpu_data_get_sub_data(B_handle, 1, x);
 			task->handles[2] = starpu_data_get_sub_data(C_handle, 2, x, y);
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV)
 			{
 			     ret = 77;

+ 1 - 1
examples/pi/pi.c

@@ -155,7 +155,7 @@ int main(int argc, char **argv)
 		task->handles[0] = sobol_qrng_direction_handle;
 		task->handles[1] = starpu_data_get_sub_data(cnt_array_handle, 1, i);
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		STARPU_ASSERT(!ret);
 	}
 

+ 8 - 8
examples/pi/pi_redux.c

@@ -46,7 +46,7 @@ static unsigned do_warmup = 0;
 #ifdef STARPU_HAVE_CURAND
 /* RNG for the CURAND library */
 static curandGenerator_t curandgens[STARPU_NMAXWORKERS];
-#endif 
+#endif
 
 /* state for the erand48 function : note the huge padding to avoid false-sharing */
 #define PADDING	1024
@@ -132,7 +132,7 @@ static void pi_func_cpu(void *descr[], void *cl_arg __attribute__ ((unused)))
 
 	unsigned short *worker_xsub;
 	worker_xsub = &xsubi[PADDING*workerid];
-	
+
 	struct drand48_data *buffer;
 	buffer = &randbuffer[PADDING*workerid];
 
@@ -165,7 +165,7 @@ extern void pi_redux_cuda_kernel(float *x, float *y, unsigned n, unsigned long *
 #ifdef STARPU_HAVE_CURAND
 static void pi_func_cuda(void *descr[], void *cl_arg __attribute__ ((unused)))
 {
-	curandStatus_t res;	
+	curandStatus_t res;
 
 	int workerid = starpu_worker_get_id();
 
@@ -260,7 +260,7 @@ static void redux_cuda_func(void *descr[], void *cl_arg)
 	unsigned long *d_b = (unsigned long *)STARPU_VARIABLE_GET_PTR(descr[1]);
 
 	unsigned long h_a, h_b;
-	
+
 	cudaMemcpyAsync(&h_a, d_a, sizeof(h_a), cudaMemcpyDeviceToHost, starpu_cuda_get_local_stream());
 	cudaMemcpyAsync(&h_b, d_b, sizeof(h_b), cudaMemcpyDeviceToHost, starpu_cuda_get_local_stream());
 	cudaStreamSynchronize(starpu_cuda_get_local_stream());
@@ -269,7 +269,7 @@ static void redux_cuda_func(void *descr[], void *cl_arg)
 
 	cudaMemcpyAsync(d_a, &h_a, sizeof(h_a), cudaMemcpyHostToDevice, starpu_cuda_get_local_stream());
 	cudaStreamSynchronize(starpu_cuda_get_local_stream());
-};
+}
 #endif
 
 static void redux_cpu_func(void *descr[], void *cl_arg)
@@ -278,7 +278,7 @@ static void redux_cpu_func(void *descr[], void *cl_arg)
 	unsigned long *b = (unsigned long *)STARPU_VARIABLE_GET_PTR(descr[1]);
 
 	*a = *a + *b;
-};
+}
 
 static struct starpu_codelet redux_codelet =
 {
@@ -340,7 +340,7 @@ int main(int argc, char **argv)
 		task->handles[0] = xy_scratchpad_handle;
 		task->handles[1] = shot_cnt_handle;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		STARPU_ASSERT(!ret);
 	}
 
@@ -356,7 +356,7 @@ int main(int argc, char **argv)
 		task->handles[0] = xy_scratchpad_handle;
 		task->handles[1] = shot_cnt_handle;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		STARPU_ASSERT(!ret);
 	}
 

+ 3 - 3
examples/profiling/profiling.c

@@ -70,10 +70,10 @@ int main(int argc, char **argv)
 		/* We will destroy the task structure by hand so that we can
 		 * query the profiling info before the task is destroyed. */
 		task->destroy = 0;
-		
+
 		tasks[i] = task;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (STARPU_UNLIKELY(ret == -ENODEV))
 		{
 			FPRINTF(stderr, "No worker may execute this task\n");
@@ -111,7 +111,7 @@ int main(int argc, char **argv)
 	for (worker = 0; worker < starpu_worker_get_count(); worker++)
 	{
 		struct starpu_worker_profiling_info worker_info;
-		int ret = starpu_worker_get_profiling_info(worker, &worker_info);
+		ret = starpu_worker_get_profiling_info(worker, &worker_info);
 		STARPU_ASSERT(!ret);
 
 		double total_time = starpu_timing_timespec_to_us(&worker_info.total_time);

+ 4 - 4
examples/reductions/dot_product.c

@@ -347,7 +347,7 @@ int main(int argc, char **argv)
 	assert(x && y);
 
         starpu_srand48(0);
-	
+
 	DOT_TYPE reference_dot = 0.0;
 
 	unsigned long i;
@@ -357,8 +357,8 @@ int main(int argc, char **argv)
 		y[i] = (float)starpu_drand48();
 
 		reference_dot += (DOT_TYPE)x[i]*(DOT_TYPE)y[i];
-	} 
-	
+	}
+
 	unsigned block;
 	for (block = 0; block < nblocks; block++)
 	{
@@ -386,7 +386,7 @@ int main(int argc, char **argv)
 		task->handles[1] = y_handles[block];
 		task->handles[2] = dot_handle;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (ret == -ENODEV) goto enodev;
 		STARPU_ASSERT(!ret);
 	}