Browse Source

fix yet more c++-like comments

Samuel Thibault 14 years ago
parent
commit
68c2135caf

+ 3 - 3
examples/audio/starpu_audio_processing.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Mehdi Juhoor <mjuhoor@gmail.com>
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
@@ -30,7 +30,7 @@
 #include <cufft.h>
 #endif
 
-//#define SAVE_RAW	1
+/* #define SAVE_RAW	1 */
 
 #define DEFAULTINPUTFILE	"input.wav"
 #define DEFAULTOUTPUTFILE	"output.wav"
@@ -335,7 +335,7 @@ static void init_problem(void)
 	}
 
 	/* allocate working buffer (this could be done online, but we'll keep it simple) */
-	//starpu_data_malloc_pinned_if_possible((void **)&outdata, length_data*sizeof(fftwf_complex));
+	/* starpu_data_malloc_pinned_if_possible((void **)&outdata, length_data*sizeof(fftwf_complex)); */
 
 	/* read input data into buffer "A" */
 	read_16bit_wav(infile, length_data, A, infile_raw);

+ 3 - 3
examples/axpy/axpy.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Mehdi Juhoor <mjuhoor@gmail.com>
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
@@ -104,8 +104,8 @@ int main(int argc, char **argv)
 	unsigned i;
 	for (i = 0; i < N; i++)
 	{
-		vec_x[i] = 1.0f;//(TYPE)starpu_drand48();
-		vec_y[i] = 4.0f;//(TYPE)starpu_drand48();
+		vec_x[i] = 1.0f; /*(TYPE)starpu_drand48(); */
+		vec_y[i] = 4.0f; /*(TYPE)starpu_drand48(); */
 	}
 
 	FPRINTF(stderr, "BEFORE x[0] = %2.2f\n", vec_x[0]);

+ 2 - 2
examples/cg/cg.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -82,4 +82,4 @@ void copy_handle(starpu_data_handle dst,
 		starpu_data_handle src,
 		unsigned nblocks);
 
-#endif // __STARPU_EXAMPLE_CG_H__
+#endif /* __STARPU_EXAMPLE_CG_H__ */

+ 1 - 1
examples/cholesky/cholesky.h

@@ -113,4 +113,4 @@ static void __attribute__((unused)) parse_args(int argc, char **argv)
 	}
 }
 
-#endif // __DW_CHOLESKY_H__
+#endif /* __DW_CHOLESKY_H__ */

+ 4 - 4
examples/cholesky/cholesky_grain_tag.c

@@ -49,7 +49,7 @@ static starpu_codelet cl11 =
 
 static struct starpu_task * create_task_11(starpu_data_handle dataA, unsigned k, unsigned reclevel)
 {
-//	FPRINTF(stdout, "task 11 k = %d TAG = %llx\n", k, (TAG11(k)));
+/*	FPRINTF(stdout, "task 11 k = %d TAG = %llx\n", k, (TAG11(k))); */
 
 	struct starpu_task *task = create_task(TAG11_AUX(k, reclevel));
 	
@@ -121,7 +121,7 @@ static starpu_codelet cl22 =
 
 static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, unsigned j, unsigned reclevel)
 {
-//	FPRINTF(stdout, "task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22_AUX(k,i,j));
+/*	FPRINTF(stdout, "task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22_AUX(k,i,j)); */
 
 	struct starpu_task *task = create_task(TAG22_AUX(k, i, j, reclevel));
 
@@ -311,7 +311,7 @@ int main(int argc, char **argv)
 		for (j = 0; j < size; j++)
 		{
 			mat[j +i*size] = (1.0f/(1.0f+i+j)) + ((i == j)?1.0f*size:0.0f);
-			//mat[j +i*size] = ((i == j)?1.0f*size:0.0f);
+			/* mat[j +i*size] = ((i == j)?1.0f*size:0.0f); */
 		}
 	}
 
@@ -349,7 +349,7 @@ int main(int argc, char **argv)
 			}
 			else {
 				FPRINTF(stdout, ".\t");
-				mat[j+i*size] = 0.0f; // debug
+				mat[j+i*size] = 0.0f; /* debug */
 			}
 		}
 		FPRINTF(stdout, "\n");

+ 4 - 4
examples/cholesky/cholesky_implicit.c

@@ -182,11 +182,11 @@ int main(int argc, char **argv)
 		for (j = 0; j < size; j++)
 		{
 			mat[j +i*size] = (1.0f/(1.0f+i+j)) + ((i == j)?1.0f*size:0.0f);
-			//mat[j +i*size] = ((i == j)?1.0f*size:0.0f);
+			/* mat[j +i*size] = ((i == j)?1.0f*size:0.0f); */
 		}
 	}
 
-//#define PRINT_OUTPUT
+/* #define PRINT_OUTPUT */
 #ifdef PRINT_OUTPUT
 	FPRINTF(stdout, "Input :\n");
 
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
 			}
 			else {
 				FPRINTF(stdout, ".\t");
-				mat[j+i*size] = 0.0f; // debug
+				mat[j+i*size] = 0.0f; /* debug */
 			}
 		}
 		FPRINTF(stdout, "\n");
@@ -233,7 +233,7 @@ int main(int argc, char **argv)
 			for (i = 0; i < size; i++)
 			{
 				if (i > j) {
-					mat[j+i*size] = 0.0f; // debug
+					mat[j+i*size] = 0.0f; /* debug */
 				}
 			}
 		}

+ 6 - 6
examples/cholesky/cholesky_kernels.c

@@ -28,7 +28,7 @@
 
 static inline void chol_common_cpu_codelet_update_u22(void *descr[], int s, __attribute__((unused)) void *_args)
 {
-	//printf("22\n");
+	/* printf("22\n"); */
 	float *left 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);
 	float *right 	= (float *)STARPU_MATRIX_GET_PTR(descr[1]);
 	float *center 	= (float *)STARPU_MATRIX_GET_PTR(descr[2]);
@@ -88,7 +88,7 @@ void chol_cublas_codelet_update_u22(void *descr[], void *_args)
 {
 	chol_common_cpu_codelet_update_u22(descr, 1, _args);
 }
-#endif// STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */
 
 /* 
  * U21
@@ -96,7 +96,7 @@ void chol_cublas_codelet_update_u22(void *descr[], void *_args)
 
 static inline void chol_common_codelet_update_u21(void *descr[], int s, __attribute__((unused)) void *_args)
 {
-//	printf("21\n");
+/*	printf("21\n"); */
 	float *sub11;
 	float *sub21;
 
@@ -143,7 +143,7 @@ void chol_cublas_codelet_update_u21(void *descr[], void *_args)
 
 static inline void chol_common_codelet_update_u11(void *descr[], int s, __attribute__((unused)) void *_args) 
 {
-//	printf("11\n");
+/*	printf("11\n"); */
 	float *sub11;
 
 	sub11 = (float *)STARPU_MATRIX_GET_PTR(descr[0]); 
@@ -193,7 +193,7 @@ static inline void chol_common_codelet_update_u11(void *descr[], int s, __attrib
 				
 				*lambda11 = sqrt(*lambda11);
 
-//				cublasSetVector(1, sizeof(float), lambda11, sizeof(float), &sub11[z+z*ld], sizeof(float));
+/*				cublasSetVector(1, sizeof(float), lambda11, sizeof(float), &sub11[z+z*ld], sizeof(float)); */
 				cudaMemcpyAsync(&sub11[z+z*ld], lambda11, sizeof(float), cudaMemcpyHostToDevice, starpu_cuda_get_local_stream());
 
 				cublasSscal(nx - z - 1, 1.0f/(*lambda11), &sub11[(z+1)+z*ld], 1);
@@ -227,4 +227,4 @@ void chol_cublas_codelet_update_u11(void *descr[], void *_args)
 {
 	chol_common_codelet_update_u11(descr, 1, _args);
 }
-#endif// STARPU_USE_CUDA
+#endif/* STARPU_USE_CUDA */

+ 2 - 2
examples/cholesky/cholesky_models.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
 
 #include <starpu.h>
 
-//#define USE_PERTURBATION	1
+/* #define USE_PERTURBATION	1 */
 
 #ifdef USE_PERTURBATION
 #define PERTURBATE(a)	((starpu_drand48()*2.0f*(AMPL) + 1.0f - (AMPL))*(a))

+ 4 - 4
examples/cholesky/cholesky_tag.c

@@ -49,7 +49,7 @@ static starpu_codelet cl11 =
 
 static struct starpu_task * create_task_11(starpu_data_handle dataA, unsigned k)
 {
-//	FPRINTF(stdout, "task 11 k = %d TAG = %llx\n", k, (TAG11(k)));
+/*	FPRINTF(stdout, "task 11 k = %d TAG = %llx\n", k, (TAG11(k))); */
 
 	struct starpu_task *task = create_task(TAG11(k));
 	
@@ -127,7 +127,7 @@ static starpu_codelet cl22 =
 
 static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, unsigned j)
 {
-//	FPRINTF(stdout, "task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j));
+/*	FPRINTF(stdout, "task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j)); */
 
 	struct starpu_task *task = create_task(TAG22(k, i, j));
 
@@ -299,7 +299,7 @@ int main(int argc, char **argv)
 		for (j = 0; j < size; j++)
 		{
 			mat[j +i*size] = (1.0f/(1.0f+i+j)) + ((i == j)?1.0f*size:0.0f);
-			//mat[j +i*size] = ((i == j)?1.0f*size:0.0f);
+			/* mat[j +i*size] = ((i == j)?1.0f*size:0.0f); */
 		}
 	}
 
@@ -337,7 +337,7 @@ int main(int argc, char **argv)
 			}
 			else {
 				FPRINTF(stdout, ".\t");
-				mat[j+i*size] = 0.0f; // debug
+				mat[j+i*size] = 0.0f; /* debug */
 			}
 		}
 		FPRINTF(stdout, "\n");

+ 2 - 2
examples/cholesky/cholesky_tile_tag.c

@@ -59,7 +59,7 @@ static starpu_codelet cl11 =
 
 static struct starpu_task * create_task_11(unsigned k, unsigned nblocks)
 {
-//	FPRINTF(stdout, "task 11 k = %d TAG = %llx\n", k, (TAG11(k)));
+/*	FPRINTF(stdout, "task 11 k = %d TAG = %llx\n", k, (TAG11(k))); */
 
 	struct starpu_task *task = create_task(TAG11(k));
 	
@@ -145,7 +145,7 @@ static starpu_codelet cl22 =
 
 static void create_task_22(unsigned k, unsigned i, unsigned j)
 {
-//	FPRINTF(stdout, "task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j));
+/*	FPRINTF(stdout, "task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j)); */
 
 	struct starpu_task *task = create_task(TAG22(k, i, j));
 

+ 2 - 2
examples/common/blas.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -154,4 +154,4 @@ extern void dswap_(const int *n, double *x, const int *incx, double *y, const in
 
 #endif
 
-#endif // __BLAS_H__
+#endif /* __BLAS_H__ */

+ 3 - 3
examples/common/blas_model.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -37,11 +37,11 @@ double gemm_cost(starpu_buffer_descr *descr)
 	nyC = starpu_matrix_get_ny(descr[2].handle);
 	nxA = starpu_matrix_get_nx(descr[0].handle);
 
-//	printf("nxC %d nxC %d nxA %d\n", nxC, nyC, nxA);
+/*	printf("nxC %d nxC %d nxA %d\n", nxC, nyC, nxA); */
 
 	double cost = ((double)nxC)*((double)nyC)*((double)nxA/1000.0f/4.11f);
 
-//	printf("cost %e \n", cost);
+/*	printf("cost %e \n", cost); */
 
 	return cost;
 }

+ 2 - 2
examples/common/blas_model.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -54,4 +54,4 @@ static struct starpu_perfmodel_t starpu_dgemm_model_common = {
 	.type = STARPU_COMMON,
 };
 
-#endif // __BLAS_MODEL_H__
+#endif /* __BLAS_MODEL_H__ */

+ 28 - 28
examples/heat/dw_factolu.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -89,12 +89,12 @@ static void __attribute__ ((unused)) compare_A_LU(float *A, float *LU,
 	{
 		for (i = 0; i < size; i++)
 		{
-//			if (i <= j) {
+/*			if (i <= j) { */
 				FPRINTF(stdout, "%2.2f\t", LU[j +i*size]);
-//			}
-//			else {
-//				FPRINTF(stdout, ".\t");
-//			}
+/*			}
+			else {
+				FPRINTF(stdout, ".\t");
+			} */
 		}
 		FPRINTF(stdout, "\n");
 	}
@@ -107,12 +107,12 @@ static void __attribute__ ((unused)) compare_A_LU(float *A, float *LU,
 	{
 		for (i = 0; i < size; i++)
 		{
-//			if (i <= j) {
+/*			if (i <= j) { */
 				FPRINTF(stdout, "%2.2f\t", L[j +i*size]);
-//			}
-//			else {
-//				FPRINTF(stdout, ".\t");
-//			}
+/*			}
+			else {
+				FPRINTF(stdout, ".\t");
+			} */
 		}
 		FPRINTF(stdout, "\n");
 	}
@@ -123,12 +123,12 @@ static void __attribute__ ((unused)) compare_A_LU(float *A, float *LU,
 	{
 		for (i = 0; i < size; i++)
 		{
-//			if (i <= j) {
+/*			if (i <= j) { */
 				FPRINTF(stdout, "%2.2f\t", U[j +i*size]);
-//			}
-//			else {
-//				FPRINTF(stdout, ".\t");
-//			}
+/*			}
+			else {
+				FPRINTF(stdout, ".\t");
+			} */
 		}
 		FPRINTF(stdout, "\n");
 	}
@@ -155,12 +155,12 @@ static void __attribute__ ((unused)) compare_A_LU(float *A, float *LU,
 	{
 		for (i = 0; i < size; i++)
 		{
-	//		if (i <= j) {
+	/*		if (i <= j) { */
 	      			FPRINTF(stdout, "%2.2f\t", A[j +i*size]);
-	//		}
-	//		else {
-	//			FPRINTF(stdout, ".\t");
-	//		}
+	/*		}
+			else {
+				FPRINTF(stdout, ".\t");
+			} */
 		}
 		FPRINTF(stdout, "\n");
 	}
@@ -172,12 +172,12 @@ static void __attribute__ ((unused)) compare_A_LU(float *A, float *LU,
 	{
 		for (i = 0; i < size; i++)
 		{
-	//		if (i <= j) {
+	/*		if (i <= j) { */
 	      			FPRINTF(stdout, "%2.2f\t", L[j +i*size]);
-	//		}
-	//		else {
-	//			FPRINTF(stdout, ".\t");
-	//		}
+	/*		}
+			else {
+				FPRINTF(stdout, ".\t");
+			} */
 		}
 		FPRINTF(stdout, "\n");
 	}
@@ -185,7 +185,7 @@ static void __attribute__ ((unused)) compare_A_LU(float *A, float *LU,
 
 	FPRINTF(stdout, "max error between A and L*U = %f \n", max_err);
 }
-#endif // CHECK_RESULTS
+#endif /* CHECK_RESULTS */
 
 void dw_cpu_codelet_update_u11(void **, void *);
 void dw_cpu_codelet_update_u12(void **, void *);
@@ -213,4 +213,4 @@ extern struct starpu_perfmodel_t model_12;
 extern struct starpu_perfmodel_t model_21;
 extern struct starpu_perfmodel_t model_22;
 
-#endif // __DW_FACTO_LU_H__
+#endif /* __DW_FACTO_LU_H__ */

+ 10 - 10
examples/heat/dw_factolu_grain.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Mehdi Juhoor <mjuhoor@gmail.com>
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
@@ -54,7 +54,7 @@ static starpu_codelet cl11 = {
 
 static struct starpu_task *create_task_11(starpu_data_handle dataA, unsigned k, unsigned tag_prefix)
 {
-//	FPRINTF(stdout, "task 11 k = %d TAG = %llx\n", k, (TAG11(k)));
+/*	FPRINTF(stdout, "task 11 k = %d TAG = %llx\n", k, (TAG11(k))); */
 
 	struct starpu_task *task = create_task(TAG11(k, tag_prefix));
 
@@ -87,7 +87,7 @@ static starpu_codelet cl12 = {
 
 static void create_task_12(starpu_data_handle dataA, unsigned k, unsigned i, unsigned tag_prefix)
 {
-//	FPRINTF(stdout, "task 12 k,i = %d,%d TAG = %llx\n", k,i, TAG12(k,i));
+/*	FPRINTF(stdout, "task 12 k,i = %d,%d TAG = %llx\n", k,i, TAG12(k,i)); */
 
 	struct starpu_task *task = create_task(TAG12(k, i, tag_prefix));
 	
@@ -163,7 +163,7 @@ static starpu_codelet cl22 = {
 
 static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, unsigned j, unsigned tag_prefix)
 {
-//	FPRINTF(stdout, "task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j));
+/*	FPRINTF(stdout, "task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j)); */
 
 	struct starpu_task *task = create_task(TAG22(k, i, j, tag_prefix));
 
@@ -299,13 +299,13 @@ static void dw_factoLU_grain_inner(float *matA, unsigned size, unsigned inner_si
 
 		float *newmatA = &matA[inner_size*(ld+1)];
 
-//		if (tag_prefix < 2)
-//		{
-//			dw_factoLU_grain_inner(newmatA, size-inner_size, (size-inner_size)/2, ld, blocksize/2, tag_prefix+1);
-//		}
-//		else {
+/*		if (tag_prefix < 2)
+		{
+			dw_factoLU_grain_inner(newmatA, size-inner_size, (size-inner_size)/2, ld, blocksize/2, tag_prefix+1);
+		}
+		else { */
 			dw_factoLU_grain_inner(newmatA, size-inner_size, size-inner_size, ld, blocksize/2, tag_prefix+1);
-//		}
+/*		} */
 	}
 
 }

+ 4 - 4
examples/heat/dw_factolu_kernels.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -162,7 +162,7 @@ void dw_cublas_codelet_update_u22(void *descr[], void *_args)
 	int id = starpu_worker_get_id();
 	count_22_per_worker[id]++;
 }
-#endif// STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */
 
 /*
  * U12
@@ -225,7 +225,7 @@ void dw_cublas_codelet_update_u12(void *descr[], void *_args)
 	int id = starpu_worker_get_id();
 	count_12_per_worker[id]++;
 }
-#endif // STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */
 
 /* 
  * U21
@@ -378,4 +378,4 @@ void dw_cublas_codelet_update_u11(void *descr[], void *_args)
 	int id = starpu_worker_get_id();
 	count_11_per_worker[id]++;
 }
-#endif// STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */

+ 4 - 4
examples/heat/dw_factolu_tag.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Mehdi Juhoor <mjuhoor@gmail.com>
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
@@ -56,7 +56,7 @@ static starpu_codelet cl11 = {
 
 static struct starpu_task *create_task_11(starpu_data_handle dataA, unsigned k)
 {
-//	printf("task 11 k = %d TAG = %llx\n", k, (TAG11(k)));
+/*	printf("task 11 k = %d TAG = %llx\n", k, (TAG11(k))); */
 
 	struct starpu_task *task = create_task(TAG11(k));
 
@@ -90,7 +90,7 @@ static starpu_codelet cl12 = {
 
 static void create_task_12(starpu_data_handle dataA, unsigned k, unsigned i)
 {
-//	printf("task 12 k,i = %d,%d TAG = %llx\n", k,i, TAG12(k,i));
+/*	printf("task 12 k,i = %d,%d TAG = %llx\n", k,i, TAG12(k,i)); */
 
 	struct starpu_task *task = create_task(TAG12(k, i));
 	
@@ -166,7 +166,7 @@ static starpu_codelet cl22 = {
 
 static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, unsigned j)
 {
-//	printf("task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j));
+/*	printf("task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j)); */
 
 	struct starpu_task *task = create_task(TAG22(k, i, j));
 

+ 2 - 2
examples/heat/dw_sparse_cg.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -134,4 +134,4 @@ void iteration_cg(void *problem);
 void conjugate_gradient(float *nzvalA, float *vecb, float *vecx, uint32_t nnz,
 			unsigned nrow, uint32_t *colind, uint32_t *rowptr);
 
-#endif // __DW_SPARSE_CG_H__
+#endif /* __DW_SPARSE_CG_H__ */

+ 2 - 2
examples/heat/heat.h

@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <math.h>
 
-// needed for STARPU_OPENGL_RENDER
+/* needed for STARPU_OPENGL_RENDER */
 #include <starpu_config.h>
 #include <starpu.h>
 
@@ -68,4 +68,4 @@ void display_stat_heat(void);
 extern void opengl_render(unsigned _ntheta, unsigned _nthick, float *_result, point *_pmesh, int argc_, char **argv_);
 #endif
 
-#endif // __HEAT_H__
+#endif /* __HEAT_H__ */

+ 4 - 4
examples/heat/heat_display.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -133,8 +133,8 @@ static void display(void)
 	float factor = 1.0/amplitude;
 	glScalef (factor, factor, factor);      /* modeling transformation */
 	gluLookAt (xcenter, ycenter, 30.0f, xcenter, ycenter, 0.0f, 0.0f, 1.0f, 0.0f);
-//	printf("factor %f\n", factor);
-	//   glRotatef(-0,0.0,0.0,0.0);
+/*	printf("factor %f\n", factor);
+	   glRotatef(-0,0.0,0.0,0.0); */
 	generate_graph();
 	glFlush ();
 }
@@ -236,4 +236,4 @@ void opengl_render(unsigned _ntheta, unsigned _nthick, float *_result, point *_p
 	glutReshapeFunc(reshape);
 	glutMainLoop();
 }
-#endif // STARPU_OPENGL_RENDER
+#endif /* STARPU_OPENGL_RENDER */

+ 14 - 14
examples/heat/lu_kernels_model.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  *	Number of flops of Gemm 
  */
 
-//#define USE_PERTURBATION	1
+/* #define USE_PERTURBATION	1 */
 
 
 #ifdef USE_PERTURBATION
@@ -58,10 +58,10 @@ double task_12_cost(starpu_buffer_descr *descr)
 
 	n = starpu_matrix_get_nx(descr[0].handle);
 
-//	double cost = ((n*n*n)/1744.695);
+/*	double cost = ((n*n*n)/1744.695); */
 	double cost = ((n*n*n)/3210.80);
 
-	//fprintf(stderr, "task 12 predicts %e\n", cost);
+	/* fprintf(stderr, "task 12 predicts %e\n", cost); */
 	return PERTURBATE(cost);
 }
 
@@ -72,10 +72,10 @@ double task_21_cost(starpu_buffer_descr *descr)
 
 	n = starpu_matrix_get_nx(descr[0].handle);
 
-//	double cost = ((n*n*n)/1744.695);
+/*	double cost = ((n*n*n)/1744.695); */
 	double cost = ((n*n*n)/3691.53);
 
-	//fprintf(stderr, "task 12 predicts %e\n", cost);
+	/* fprintf(stderr, "task 12 predicts %e\n", cost); */
 	return PERTURBATE(cost);
 }
 
@@ -109,7 +109,7 @@ double task_11_cost_cuda(starpu_buffer_descr *descr)
 
 	double cost = ((n*n*n)/1853.7806);
 
-//	printf("CUDA task 11 ; predict %e\n", cost);
+/*	printf("CUDA task 11 ; predict %e\n", cost); */
 	return PERTURBATE(cost);
 }
 
@@ -121,7 +121,7 @@ double task_12_cost_cuda(starpu_buffer_descr *descr)
 
 	double cost = ((n*n*n)/42838.5718);
 
-//	printf("CUDA task 12 ; predict %e\n", cost);
+/*	printf("CUDA task 12 ; predict %e\n", cost); */
 	return PERTURBATE(cost);
 }
 
@@ -134,7 +134,7 @@ double task_21_cost_cuda(starpu_buffer_descr *descr)
 
 	double cost = ((n*n*n)/49208.667);
 
-//	printf("CUDA task 21 ; predict %e\n", cost);
+/*	printf("CUDA task 21 ; predict %e\n", cost); */
 	return PERTURBATE(cost);
 }
 
@@ -150,7 +150,7 @@ double task_22_cost_cuda(starpu_buffer_descr *descr)
 
 	double cost = ((nx*ny*nz)/57523.560);
 
-//	printf("CUDA task 22 ; predict %e\n", cost);
+/*	printf("CUDA task 22 ; predict %e\n", cost); */
 	return PERTURBATE(cost);
 }
 
@@ -168,7 +168,7 @@ double task_11_cost_cpu(starpu_buffer_descr *descr)
 
 	double cost = ((n*n*n)/537.5);
 
-//	printf("CPU task 11 ; predict %e\n", cost);
+/*	printf("CPU task 11 ; predict %e\n", cost); */
 	return PERTURBATE(cost);
 }
 
@@ -180,7 +180,7 @@ double task_12_cost_cpu(starpu_buffer_descr *descr)
 
 	double cost = ((n*n*n)/6668.224);
 
-//	printf("CPU task 12 ; predict %e\n", cost);
+/*	printf("CPU task 12 ; predict %e\n", cost); */
 	return PERTURBATE(cost);
 }
 
@@ -193,7 +193,7 @@ double task_21_cost_cpu(starpu_buffer_descr *descr)
 
 	double cost = ((n*n*n)/6793.8423);
 
-//	printf("CPU task 21 ; predict %e\n", cost);
+/*	printf("CPU task 21 ; predict %e\n", cost); */
 	return PERTURBATE(cost);
 }
 
@@ -209,7 +209,7 @@ double task_22_cost_cpu(starpu_buffer_descr *descr)
 
 	double cost = ((nx*ny*nz)/4203.0175);
 
-//	printf("CPU task 22 ; predict %e\n", cost);
+/*	printf("CPU task 22 ; predict %e\n", cost); */
 	return PERTURBATE(cost);
 }
 

+ 2 - 2
examples/heat/lu_kernels_model.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,4 +20,4 @@
 
 #include <starpu.h>
 
-#endif // __LU_KERNELS_MODEL_H__
+#endif /* __LU_KERNELS_MODEL_H__ */

+ 4 - 4
examples/lu/lu_example.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -122,7 +122,7 @@ void copy_blocks_into_matrix(void)
 				A_blocks[bi+nblocks*bj][i + j * blocksize];
 		}
 
-		//free(A_blocks[bi+nblocks*bj]);
+		/* free(A_blocks[bi+nblocks*bj]); */
 	}
 }
 
@@ -155,7 +155,7 @@ static void init_matrix(void)
 	STARPU_ASSERT(A);
 
 	starpu_srand48((long int)time(NULL));
-	//starpu_srand48(0);
+	/* starpu_srand48(0); */
 
 	/* initialize matrix content */
 	unsigned long i,j;
@@ -201,7 +201,7 @@ static void pivot_saved_matrix(unsigned *ipiv)
 	{
 		if (k != ipiv[k])
 		{
-	//		FPRINTF(stderr, "SWAP %d and %d\n", k, ipiv[k]);
+	/*		FPRINTF(stderr, "SWAP %d and %d\n", k, ipiv[k]); */
 			CPU_SWAP(size, &A_saved[k*size], 1, &A_saved[ipiv[k]*size], 1);
 		}
 	}

+ 4 - 4
examples/lu/xlu.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Mehdi Juhoor <mjuhoor@gmail.com>
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
@@ -50,7 +50,7 @@ static struct starpu_task *create_task(starpu_tag_t id)
 
 static struct starpu_task *create_task_11(starpu_data_handle dataA, unsigned k)
 {
-//	printf("task 11 k = %d TAG = %llx\n", k, (TAG11(k)));
+/*	printf("task 11 k = %d TAG = %llx\n", k, (TAG11(k))); */
 
 	struct starpu_task *task = create_task(TAG11(k));
 
@@ -74,7 +74,7 @@ static struct starpu_task *create_task_11(starpu_data_handle dataA, unsigned k)
 
 static void create_task_12(starpu_data_handle dataA, unsigned k, unsigned j)
 {
-//	printf("task 12 k,i = %d,%d TAG = %llx\n", k,i, TAG12(k,i));
+/*	printf("task 12 k,i = %d,%d TAG = %llx\n", k,i, TAG12(k,i)); */
 
 	struct starpu_task *task = create_task(TAG12(k, j));
 	
@@ -130,7 +130,7 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned i)
 
 static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, unsigned j)
 {
-//	printf("task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j));
+/*	printf("task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j)); */
 
 	struct starpu_task *task = create_task(TAG22(k, i, j));
 

+ 3 - 3
examples/lu/xlu.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -78,7 +78,7 @@ static void __attribute__ ((unused)) compare_A_LU(float *A, float *LU,
 
 	FPRINTF(stdout, "max error between A and L*U = %f \n", max_err);
 }
-#endif // CHECK_RESULTS
+#endif /* CHECK_RESULTS */
 
 void dw_cpu_codelet_update_u11(void **, void *);
 void dw_cpu_codelet_update_u12(void **, void *);
@@ -116,4 +116,4 @@ void STARPU_LU(lu_decomposition)(TYPE *matA, unsigned size, unsigned ld, unsigne
 void STARPU_LU(lu_decomposition_pivot_no_stride)(TYPE **matA, unsigned *ipiv, unsigned size, unsigned ld, unsigned nblocks);
 void STARPU_LU(lu_decomposition_pivot)(TYPE *matA, unsigned *ipiv, unsigned size, unsigned ld, unsigned nblocks);
 
-#endif // __XLU_H__
+#endif /* __XLU_H__ */

+ 6 - 6
examples/lu/xlu_kernels.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -84,7 +84,7 @@ void STARPU_LU(cublas_u22)(void *descr[], void *_args)
 {
 	STARPU_LU(common_u22)(descr, 1, _args);
 }
-#endif// STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */
 
 static struct starpu_perfmodel_t STARPU_LU(model_22) = {
 	.type = STARPU_HISTORY_BASED,
@@ -167,7 +167,7 @@ void STARPU_LU(cublas_u12)(void *descr[], void *_args)
 {
 	STARPU_LU(common_u12)(descr, 1, _args);
 }
-#endif // STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */
 
 static struct starpu_perfmodel_t STARPU_LU(model_12) = {
 	.type = STARPU_HISTORY_BASED,
@@ -341,7 +341,7 @@ void STARPU_LU(cublas_u11)(void *descr[], void *_args)
 {
 	STARPU_LU(common_u11)(descr, 1, _args);
 }
-#endif// STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */
 
 static struct starpu_perfmodel_t STARPU_LU(model_11) = {
 	.type = STARPU_HISTORY_BASED,
@@ -475,7 +475,7 @@ void STARPU_LU(cublas_u11_pivot)(void *descr[], void *_args)
 {
 	STARPU_LU(common_u11_pivot)(descr, 1, _args);
 }
-#endif// STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */
 
 static struct starpu_perfmodel_t STARPU_LU(model_11_pivot) = {
 	.type = STARPU_HISTORY_BASED,
@@ -560,7 +560,7 @@ void STARPU_LU(cublas_pivot)(void *descr[], void *_args)
 	STARPU_LU(common_pivot)(descr, 1, _args);
 }
 
-#endif// STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */
 
 static struct starpu_perfmodel_t STARPU_LU(model_pivot) = {
 	.type = STARPU_HISTORY_BASED,

+ 2 - 2
examples/lu/xlu_kernels.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -43,4 +43,4 @@ extern starpu_codelet cl21;
 extern starpu_codelet cl22;
 extern starpu_codelet cl_pivot;
 
-#endif // __XLU_KERNELS_H__
+#endif /* __XLU_KERNELS_H__ */

+ 4 - 4
examples/lu/xlu_pivot.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -121,7 +121,7 @@ static struct starpu_task *create_task_11_pivot(starpu_data_handle *dataAp, unsi
 static void create_task_12(starpu_data_handle *dataAp, unsigned nblocks, unsigned k, unsigned j,
 		starpu_data_handle (* get_block)(starpu_data_handle *, unsigned, unsigned, unsigned))
 {
-//	printf("task 12 k,i = %d,%d TAG = %llx\n", k,i, TAG12(k,i));
+/*	printf("task 12 k,i = %d,%d TAG = %llx\n", k,i, TAG12(k,i)); */
 
 	struct starpu_task *task = create_task(TAG12(k, j));
 	
@@ -181,7 +181,7 @@ static void create_task_21(starpu_data_handle *dataAp, unsigned nblocks, unsigne
 static void create_task_22(starpu_data_handle *dataAp, unsigned nblocks, unsigned k, unsigned i, unsigned j,
 				starpu_data_handle (* get_block)(starpu_data_handle *, unsigned, unsigned, unsigned))
 {
-//	printf("task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j));
+/*	printf("task 22 k,i,j = %d,%d,%d TAG = %llx\n", k,i,j, TAG22(k,i,j)); */
 
 	struct starpu_task *task = create_task(TAG22(k, i, j));
 
@@ -287,7 +287,7 @@ static double dw_codelet_facto_pivot(starpu_data_handle *dataAp,
 
 	/* stall the application until the end of computations */
 	starpu_tag_wait_array(ndeps, tags);
-//	starpu_task_wait_for_all();
+/*	starpu_task_wait_for_all(); */
 
 	gettimeofday(&end, NULL);
 

+ 3 - 3
examples/pi/pi_redux.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -139,8 +139,8 @@ static void pi_func_cuda(void *descr[], void *cl_arg __attribute__ ((unused)))
 	/* CURAND is a bit silly: it assumes that any error is fatal. Calling
 	 * cudaGetLastError resets the last error value. */
 	cures = cudaGetLastError();
-//	if (cures)
-//		STARPU_CUDA_REPORT_ERROR(cures);
+/*	if (cures)
+		STARPU_CUDA_REPORT_ERROR(cures); */
 
 	/* Fill the scratchpad with random numbers. Note that both x and y
 	 * arrays are in stored the same vector. */

+ 2 - 2
examples/reductions/dot_product.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -124,7 +124,7 @@ void dot_cuda_func(void *descr[], void *cl_arg)
 
 	local_dot = (DOT_TYPE)cublasSdot(n, local_x, 1, local_y, 1);
 
-	//FPRINTF(stderr, "current_dot %f local dot %f -> %f\n", current_dot, local_dot, current_dot + local_dot);
+	/* FPRINTF(stderr, "current_dot %f local dot %f -> %f\n", current_dot, local_dot, current_dot + local_dot); */
 	current_dot += local_dot;
 
 	cudaThreadSynchronize();

+ 5 - 5
examples/spmv/dw_block_spmv.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Mehdi Juhoor <mjuhoor@gmail.com>
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
@@ -51,7 +51,7 @@ void create_data(void)
 			0, bcsr_matrix->r, bcsr_matrix->c, sizeof(float));
 
 	size = c*r*starpu_bcsr_get_nnz(sparse_matrix);
-//	printf("size = %d \n ", size);
+/*	printf("size = %d \n ", size); */
 
 	/* initiate the 2 vectors */
 	vector_in_ptr = malloc(size*sizeof(float));
@@ -78,15 +78,15 @@ void init_problem_callback(void *arg)
 
 	unsigned val = STARPU_ATOMIC_ADD(remaining, -1);
 
-//	if (val < 10)
-//		printf("callback %d remaining \n", val);
+/*	if (val < 10)
+		printf("callback %d remaining \n", val); */
 
 	if ( val == 0 )
 	{
 		printf("DONE ...\n");
 		gettimeofday(&end, NULL);
 
-//		starpu_data_unpartition(sparse_matrix, 0);
+/*		starpu_data_unpartition(sparse_matrix, 0); */
 		starpu_data_unpartition(vector_out, 0);
 
 		sem_post(&sem);

+ 3 - 3
examples/spmv/dw_block_spmv.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -37,6 +37,6 @@ void cpu_block_spmv(void *descr[], void *_args);
 
 #ifdef STARPU_USE_CUDA
 void cublas_block_spmv(void *descr[], void *_args);
-#endif // STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */
 
-#endif // __DW_BLOCK_SPMV_H__
+#endif /* __DW_BLOCK_SPMV_H__ */

+ 5 - 5
examples/spmv/dw_block_spmv_kernels.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 
 static inline void common_block_spmv(void *descr[], int s, __attribute__((unused)) void *_args)
 {
-	//printf("22\n");
+	/* printf("22\n"); */
 	float *block 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);
 	float *in 	= (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 	float *out 	= (float *)STARPU_VECTOR_GET_PTR(descr[2]);
@@ -50,7 +50,7 @@ static inline void common_block_spmv(void *descr[], int s, __attribute__((unused
 
 void cpu_block_spmv(void *descr[], void *_args)
 {
-//	printf("CPU CODELET \n");
+/*	printf("CPU CODELET \n"); */
 
 	common_block_spmv(descr, 0, _args);
 }
@@ -58,8 +58,8 @@ void cpu_block_spmv(void *descr[], void *_args)
 #ifdef STARPU_USE_CUDA
 void cublas_block_spmv(void *descr[], void *_args)
 {
-//	printf("CUBLAS CODELET \n");
+/*	printf("CUBLAS CODELET \n"); */
 
 	common_block_spmv(descr, 1, _args);
 }
-#endif// STARPU_USE_CUDA
+#endif /* STARPU_USE_CUDA */

+ 6 - 6
examples/spmv/matrix_market/mm_to_bcsr.c

@@ -84,7 +84,7 @@ static unsigned count_row_blocks(tmp_block_t *block_list)
 static tmp_block_t *search_block(tmp_block_t *block_list, unsigned i, unsigned j)
 {
 	tmp_block_t *current_block = block_list;
-	//printf("search %d %d\n", i, j);
+	/* printf("search %d %d\n", i, j); */
 
 	while (current_block) {
 		if ((current_block->i == i) && (current_block->j == j)) 
@@ -135,9 +135,9 @@ static unsigned next_block_is_bigger(tmp_block_t *block, unsigned i, unsigned j)
 /* we insert a block in the list, directly at the appropriate place */
 static void insert_block(tmp_block_t *block, tmp_block_t **block_list, unsigned i, unsigned j)
 {
-	///* insert block at the beginning of the list */
-	//block->next = *block_list;
-	//*block_list = block;
+	/* insert block at the beginning of the list */
+	/*block->next = *block_list;
+	*block_list = block; */
 
 	/* insert the block in lexicographical order */
 	/* first find an element that is bigger, then insert the block just before it */
@@ -185,7 +185,7 @@ static void insert_elem(tmp_block_t **block_list, unsigned abs_i, unsigned abs_j
 		block->i = i;
 		block->j = j;
 		
-		//printf("create block %d %d !\n", i, j);
+		/* printf("create block %d %d !\n", i, j); */
 
 		/* insert it in the block list */
 		insert_block(block, block_list, i, j);
@@ -262,7 +262,7 @@ static bcsr_t * blocks_to_bcsr(tmp_block_t *block_list, unsigned c, unsigned r)
 {
 	unsigned nblocks;
 
-	//print_all_blocks(block_list, r, c);
+	/* print_all_blocks(block_list, r, c); */
 
 	nblocks = count_blocks(block_list);
 

+ 1 - 1
examples/spmv/matrix_market/mmio.c

@@ -472,7 +472,7 @@ char  *mm_typecode_to_str(MM_typecode matcode)
 {
     char buffer[MM_MAX_LINE_LENGTH];
     char *types[4];
-//	char *mm_strdup(const char *);
+/*	char *mm_strdup(const char *); */
     int error =0;
 
     /* check for MTX type */

+ 1 - 1
examples/starpufft/starpufftx.c

@@ -325,7 +325,7 @@ void
 STARPUFFT(free)(void *p)
 {
 #ifdef STARPU_USE_CUDA
-	// TODO: FIXME
+	/* TODO: FIXME */
 #else
 #  ifdef STARPU_HAVE_FFTW
 	_FFTW(free)(p);

+ 2 - 2
examples/starpufft/testx.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@
 #endif
 
 #define SIGN (-1)
-//#define SIGN (1)
+/* #define SIGN (1) */
 
 int main(int argc, char *argv[]) {
 	int i;

+ 2 - 2
examples/starpufft/testx_threads.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include <fftw3.h>
 
 #define SIGN (-1)
-//#define SIGN (1)
+/* #define SIGN (1) */
 
 int main(int argc, char *argv[]) {
 	int i;