Переглянути джерело

minor fixes for warnings detected by Intel Compiler

Nathalie Furmento 14 роки тому
батько
коміт
a9f4293583

+ 1 - 1
examples/cholesky/cholesky_implicit.c

@@ -268,7 +268,7 @@ int main(int argc, char **argv)
 	                                float orig = (1.0f/(1.0f+i+j)) + ((i == j)?1.0f*size:0.0f);
 	                                float err = abs(test_mat[j +i*size] - orig);
 	                                if (err > 0.00001) {
-	                                        FPRINTF(stderr, "Error[%d, %d] --> %2.2f != %2.2f (err %2.2f)\n", i, j, test_mat[j +i*size], orig, err);
+	                                        FPRINTF(stderr, "Error[%u, %u] --> %2.2f != %2.2f (err %2.2f)\n", i, j, test_mat[j +i*size], orig, err);
 	                                        assert(0);
 	                                }
 	                        }

+ 1 - 1
examples/filters/fblock.c

@@ -38,7 +38,7 @@ extern void opencl_func(void *buffers[], void *cl_arg);
 void print_block(int *block, int nx, int ny, int nz, unsigned ldy, unsigned ldz)
 {
         int i, j, k;
-        FPRINTF(stderr, "block=%p nx=%d ny=%d nz=%d ldy=%d ldz=%d\n", block, nx, ny, nz, ldy, ldz);
+        FPRINTF(stderr, "block=%p nx=%d ny=%d nz=%d ldy=%u ldz=%u\n", block, nx, ny, nz, ldy, ldz);
         for(k=0 ; k<nz ; k++) {
                 for(j=0 ; j<ny ; j++) {
                         for(i=0 ; i<nx ; i++) {

+ 4 - 4
examples/heat/dw_factolu_kernels.c

@@ -57,7 +57,7 @@ void display_stat_heat(void)
 			char name[32];
 			starpu_worker_get_name(worker, name, 32);
 			
-			FPRINTF(stderr, "\t\t%s -> %d / %d (%2.2f %%)\n", name, count_11_per_worker[worker], count_11_total, (100.0*count_11_per_worker[worker])/count_11_total);
+			FPRINTF(stderr, "\t\t%s -> %u / %u (%2.2f %%)\n", name, count_11_per_worker[worker], count_11_total, (100.0*count_11_per_worker[worker])/count_11_total);
 		}
 	}
 
@@ -69,7 +69,7 @@ void display_stat_heat(void)
 			char name[32];
 			starpu_worker_get_name(worker, name, 32);
 			
-			FPRINTF(stderr, "\t\t%s -> %d / %d (%2.2f %%)\n", name, count_12_per_worker[worker], count_12_total, (100.0*count_12_per_worker[worker])/count_12_total);
+			FPRINTF(stderr, "\t\t%s -> %u / %u (%2.2f %%)\n", name, count_12_per_worker[worker], count_12_total, (100.0*count_12_per_worker[worker])/count_12_total);
 		}
 	}
 	
@@ -82,7 +82,7 @@ void display_stat_heat(void)
 			char name[32];
 			starpu_worker_get_name(worker, name, 32);
 			
-			FPRINTF(stderr, "\t\t%s -> %d / %d (%2.2f %%)\n", name, count_21_per_worker[worker], count_21_total, (100.0*count_21_per_worker[worker])/count_21_total);
+			FPRINTF(stderr, "\t\t%s -> %u / %u (%2.2f %%)\n", name, count_21_per_worker[worker], count_21_total, (100.0*count_21_per_worker[worker])/count_21_total);
 		}
 	}
 	
@@ -94,7 +94,7 @@ void display_stat_heat(void)
 			char name[32];
 			starpu_worker_get_name(worker, name, 32);
 			
-			FPRINTF(stderr, "\t\t%s -> %d / %d (%2.2f %%)\n", name, count_22_per_worker[worker], count_22_total, (100.0*count_22_per_worker[worker])/count_22_total);
+			FPRINTF(stderr, "\t\t%s -> %u / %u (%2.2f %%)\n", name, count_22_per_worker[worker], count_22_total, (100.0*count_22_per_worker[worker])/count_22_total);
 		}
 	}
 }

+ 1 - 1
examples/heat/dw_sparse_cg.c

@@ -354,7 +354,7 @@ void conjugate_gradient(float *nzvalA, float *vecb, float *vecx, uint32_t nnz,
 		ptr_vecq[i] = 0.0f;
 	}
 
-	FPRINTF(stdout, "nrow = %d \n", nrow);
+	FPRINTF(stdout, "nrow = %u \n", nrow);
 
 	/* and register them as well */
 	starpu_vector_data_register(&ds_vecr, 0, (uintptr_t)ptr_vecr, nrow, sizeof(float));

+ 1 - 1
examples/heat/dw_sparse_cg.h

@@ -101,7 +101,7 @@ static void __attribute__ ((unused)) print_results(float *result, unsigned size)
 
 	for (i = 0; i < STARPU_MIN(size, 16); i++)
 	{
-		printf("%d -> %f\n", i, result[i]);
+		printf("%u -> %f\n", i, result[i]);
 	}
 }
 

+ 0 - 4
examples/heat/dw_sparse_cg_kernels.c

@@ -64,10 +64,8 @@ void cpu_codelet_func_1(void *descr[], __attribute__((unused)) void *arg)
 	float *vecb = (float *)STARPU_VECTOR_GET_PTR(descr[3]);
 
 
-	uint32_t nnz;
 	uint32_t nrow;
 
-	nnz = STARPU_CSR_GET_NNZ(descr[0]);
 	nrow = STARPU_CSR_GET_NROW(descr[0]);
 
 	unsigned row;
@@ -173,10 +171,8 @@ void cpu_codelet_func_4(void *descr[], __attribute__((unused)) void *arg)
 	float *vecd = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 	float *vecq = (float *)STARPU_VECTOR_GET_PTR(descr[2]);
 
-	uint32_t nnz;
 	uint32_t nrow;
 
-	nnz = STARPU_CSR_GET_NNZ(descr[0]);
 	nrow = STARPU_CSR_GET_NROW(descr[0]);
 
 	unsigned row;

+ 6 - 6
examples/heat/heat.c

@@ -494,10 +494,10 @@ static unsigned long build_neighbour_vector(unsigned long*neighbours, unsigned n
 				if ((former_theta + dtheta) >= 0 && (former_theta + dtheta) <= (int)ntheta )
 				{
 					/* we got a possible neighbour */
-					unsigned node = 
+					unsigned pnode = 
 						NODE_NUMBER((former_theta + dtheta), (former_thick + dthick));
 
-					neighbours[nneighbours++] = TRANSLATEBACK(node);
+					neighbours[nneighbours++] = TRANSLATEBACK(pnode);
 				}
 			}
 		}
@@ -569,10 +569,10 @@ static void build_sparse_stiffness_matrix_B(point *pmesh, float *B, float *Bform
 
 		for (neighbour = 0; neighbour < nneighbours; neighbour++)
 		{
-			unsigned i = neighbours[neighbour]; 
-			if (i >= newsize)
+			unsigned n = neighbours[neighbour]; 
+			if (n >= newsize)
 			{
-				B[j] -= compute_A_value(TRANSLATE(i), TRANSLATE(j), pmesh)*Bformer[TRANSLATE(i)];
+				B[j] -= compute_A_value(TRANSLATE(n), TRANSLATE(j), pmesh)*Bformer[TRANSLATE(n)];
 			}
 		}
 	}
@@ -729,7 +729,7 @@ int main(int argc, char **argv)
 
 		build_dense_stiffness_matrix_A(pmesh, A, newsize, RefArray, RefArrayBack);
 
-		FPRINTF(stderr, "Problem size : %dx%d (%dx%d) (%ld MB)\n", newsize, newsize, DIM, DIM, ((unsigned long)newsize*newsize*4UL)/(1024*1024));
+		FPRINTF(stderr, "Problem size : %ux%u (%ux%u) (%lu MB)\n", newsize, newsize, DIM, DIM, ((unsigned long)newsize*newsize*4UL)/(1024*1024));
 
 		STARPU_ASSERT(newsize % nblocks == 0);
 

+ 1 - 1
examples/incrementer/incrementer.c

@@ -116,7 +116,7 @@ int main(int argc, char **argv)
 	double timing = (double)((end.tv_sec - start.tv_sec)*1000000 +
 					(end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "%d elems took %lf ms\n", niter, timing/1000);
+	FPRINTF(stderr, "%u elems took %lf ms\n", niter, timing/1000);
 
 	starpu_shutdown();
 

+ 1 - 1
examples/lu/lu_example.c

@@ -317,7 +317,7 @@ int main(int argc, char **argv)
 			unsigned n = size;
 			double flop = (2.0f*n*n*n)/3.0f;
 			FPRINTF(stderr, "Synthetic GFlops (TOTAL) : \n");
-			FPRINTF(stdout, "%d	%6.2f\n", n, (flop/timing/1000.0f));
+			FPRINTF(stdout, "%u	%6.2f\n", n, (flop/timing/1000.0f));
 		}
 	}
 	else

+ 0 - 1
examples/lu/xlu_kernels.c

@@ -211,7 +211,6 @@ static inline void STARPU_LU(common_u21)(void *descr[],
 	
 #ifdef STARPU_USE_CUDA
 	cublasStatus status;
-	cudaError_t cures;
 #endif
 
 	switch (s) {

+ 1 - 1
examples/mandelbrot/mandelbrot.c

@@ -554,7 +554,7 @@ int main(int argc, char **argv)
 				gettimeofday(&end, NULL);
 				double timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 
-				fprintf(stderr, "Time to generate %d frames : %f s\n", iter, timing/1000000.0);
+				fprintf(stderr, "Time to generate %u frames : %f s\n", iter, timing/1000000.0);
 				fprintf(stderr, "Average FPS: %f\n", ((double)iter*1e+6)/timing);
 
 				/* Reset counters */

+ 1 - 1
examples/ppm_downscaler/yuv_downscaler.c

@@ -199,7 +199,7 @@ int main(int argc, char **argv)
 
 	unsigned ntasks = (nblocks_y + 2*nblocks_uv)*nframes;
 
-	fprintf(stderr, "Start computation: there will be %d tasks for %d frames\n", ntasks, nframes);
+	fprintf(stderr, "Start computation: there will be %u tasks for %u frames\n", ntasks, nframes);
 	gettimeofday(&start, NULL);
 
 	/* do the computation */

+ 0 - 1
examples/spmv/spmv_kernels.c

@@ -97,7 +97,6 @@ void spmv_kernel_cpu(void *descr[], __attribute__((unused))  void *arg)
 
 	uint32_t firstelem = STARPU_CSR_GET_FIRSTENTRY(descr[0]);
 
-	uint32_t nnz;
 	uint32_t nrow;
 
 	nnz = STARPU_CSR_GET_NNZ(descr[0]);

+ 1 - 1
examples/tag_example/tag_example.c

@@ -192,7 +192,7 @@ int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
 
 	parse_args(argc, argv);
 
-	FPRINTF(stderr, "ITER: %d\n", nk);
+	FPRINTF(stderr, "ITER: %u\n", nk);
 
 	cl.where = STARPU_CPU|STARPU_CUDA|STARPU_GORDON;
 	cl.cpu_func = cpu_codelet;

+ 1 - 1
examples/tag_example/tag_example2.c

@@ -117,7 +117,7 @@ int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
 	cl.where = STARPU_CPU|STARPU_CUDA|STARPU_GORDON;
 	cl.nbuffers = 0;
 
-	FPRINTF(stderr, "ITER : %d\n", nk);
+	FPRINTF(stderr, "ITER : %u\n", nk);
 
 	for (i = 0; i < nk; i++)
 	{

+ 1 - 4
examples/tag_example/tag_example3.c

@@ -36,7 +36,6 @@ starpu_codelet cl;
 #define Nk	256
 
 static unsigned ni = Ni, nk = Nk;
-static unsigned callback_cnt;
 
 static void parse_args(int argc, char **argv)
 {
@@ -78,8 +77,6 @@ static void create_task_grid(unsigned iter)
 
 /*	FPRINTF(stderr, "start iter %d ni %d...\n", iter, ni); */
 
-	callback_cnt = (ni);
-
 	for (i = ni - 1; i > 0; i--)
 	{
 		/* create a new task */
@@ -124,7 +121,7 @@ int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
 	cl.where = STARPU_CPU|STARPU_CUDA|STARPU_GORDON;
 	cl.nbuffers = 0;
 
-	FPRINTF(stderr, "ITER : %d\n", nk);
+	FPRINTF(stderr, "ITER : %u\n", nk);
 
 	for (i = 0; i < nk; i++)
 	{

+ 2 - 5
examples/tag_example/tag_restartable.c

@@ -41,7 +41,6 @@ starpu_codelet cl;
 #define Nk	256
 
 static unsigned ni = Ni, nk = Nk;
-static unsigned callback_cnt;
 struct starpu_task **tasks[Nrolls];
 
 static void parse_args(int argc, char **argv)
@@ -70,9 +69,7 @@ static void create_task_grid(unsigned iter)
 {
 	unsigned i;
 
-	FPRINTF(stderr, "init iter %d ni %d...\n", iter, ni);
-
-	callback_cnt = (ni);
+	FPRINTF(stderr, "init iter %u ni %u...\n", iter, ni);
 
 	for (i = 0; i < ni; i++)
 	{
@@ -134,7 +131,7 @@ int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
 	cl.where = STARPU_CPU|STARPU_CUDA|STARPU_GORDON;
 	cl.nbuffers = 0;
 
-	FPRINTF(stderr, "ITER : %d\n", nk);
+	FPRINTF(stderr, "ITER : %u\n", nk);
 
 	for (i = 0; i < Nrolls; i++) {
 		tasks[i] = malloc(ni * sizeof(*tasks[i]));

+ 2 - 2
tests/core/get_current_task.c

@@ -54,7 +54,7 @@ int main(int argc, char **argv)
 
 	starpu_init(NULL);
 
-	FPRINTF(stderr, "#tasks : %d\n", ntasks);
+	FPRINTF(stderr, "#tasks : %u\n", ntasks);
 
 	int i;
 	for (i = 0; i < ntasks; i++)
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
 
 	starpu_task_wait_for_all();
 	
-	FPRINTF(stderr, "#empty tasks : %d\n", ntasks);
+	FPRINTF(stderr, "#empty tasks : %u\n", ntasks);
 
 	/* We repeat the same experiment with null codelets */
 

+ 1 - 1
tests/core/starpu_task_wait.c

@@ -70,7 +70,7 @@ int main(int argc, char **argv)
 
 	starpu_init(NULL);
 
-	FPRINTF(stderr, "#tasks : %d\n", ntasks);
+	FPRINTF(stderr, "#tasks : %u\n", ntasks);
 
 	gettimeofday(&start, NULL);
 

+ 1 - 1
tests/core/starpu_task_wait_for_all.c

@@ -118,7 +118,7 @@ int main(int argc, char **argv)
 
 	init_gordon_kernel();
 
-	FPRINTF(stderr, "#tasks : %d\n", ntasks);
+	FPRINTF(stderr, "#tasks : %u\n", ntasks);
 
 	gettimeofday(&start, NULL);
 	for (i = 0; i < ntasks; i++)

+ 0 - 4
tests/parallel_tasks/parallel_kernels.c

@@ -26,8 +26,6 @@
 //static pthread_cond_t cond;
 //static unsigned finished = 0;
 
-static unsigned cnt;
-
 starpu_data_handle v_handle;
 static unsigned *v;
 
@@ -81,8 +79,6 @@ int main(int argc, char **argv)
 
 	unsigned nworker = starpu_worker_get_count() + starpu_combined_worker_get_count();
 
-	cnt = nworker*N;
-
 	unsigned iter, worker;
 	for (iter = 0; iter < N; iter++)
 	{

+ 0 - 2
tests/parallel_tasks/parallel_kernels_spmd.c

@@ -26,8 +26,6 @@
 //static pthread_cond_t cond;
 //static unsigned finished = 0;
 
-static unsigned cnt;
-
 starpu_data_handle v_handle;
 static unsigned *v;