mlr: additional code cleanup

src/core/perfmodel/multiple_regression.c

@@ -46,7 +46,7 @@ static void dump_multiple_regression_list(double *mpar, double *my, int start, u
 {
 	struct starpu_perfmodel_history_list *ptr = list_history;
 	int i = start;
-	int j;
+	unsigned j;
 	while (ptr)
 	{
 		my[i] = ptr->entry->duration;
@@ -193,7 +193,8 @@ int dgels_multiple_reg_coeff(double *mpar, double *my, long nn, unsigned ncoeff,
 	doublereal *Y = malloc(sizeof(double)*m);
 
 	double coefficient;
-	int i, j, k;
+	int i;
+	unsigned j, k;
 	for (i=0; i < m; i++)
 	{
 		Y[i] = my[i];
@@ -244,7 +245,7 @@ int dgels_multiple_reg_coeff(double *mpar, double *my, long nn, unsigned ncoeff,
  */
 void validate(double *coeff, unsigned ncoeff)
 {
-	int i;
+	unsigned i;
 	if (coeff[0] < 0)
 		_STARPU_DISP("Warning: Constant computed by least square method is negative (%f). The model is likely to be inaccurate.\n", coeff[0]);
 		
@@ -255,7 +256,8 @@ void validate(double *coeff, unsigned ncoeff)
 	
 int _starpu_multiple_regression(struct starpu_perfmodel_history_list *ptr, double *coeff, unsigned ncoeff, unsigned nparameters, unsigned **combinations, const char *codelet_name)
 {
-	int i, j;
+        long i;
+	unsigned j;
 #ifndef STARPU_MLR_MODEL
 	_STARPU_DISP("Warning: StarPU was compiled with '--disable-mlr' option, thus multiple linear regression model will not be computed.\n");
 	for(i=0; i<ncoeff; i++)
@@ -328,8 +330,8 @@ int _starpu_multiple_regression(struct starpu_perfmodel_history_list *ptr, doubl
 			f = fopen(filepath, "w+");
 			STARPU_ASSERT_MSG(f, "Could not save performance model into the file %s\n", filepath);
 			fprintf(f, "Duration");
-			for(i=0; k < nparameters; k++)
-				fprintf(f, ", P%d", k);
+			for(j=0; j<nparameters; j++)
+				fprintf(f, ", P%d", j);
 		}
 	}
 	
@@ -339,7 +341,7 @@ int _starpu_multiple_regression(struct starpu_perfmodel_history_list *ptr, doubl
 		for(i=old_lines; i<n; i++)
 		{
 			fprintf(f, "\n%f", my[i]);
-			for(j=0; j<nparameters;j++)
+			for(j=0; j<nparameters; j++)
 				fprintf(f, ", %f", mpar[i*nparameters+j]);
 		}
 		fclose(f);

src/core/perfmodel/perfmodel_history.c

@@ -299,7 +299,8 @@ static void dump_reg_model(FILE *f, struct starpu_perfmodel *model, int comb, in
 		_starpu_multiple_regression(per_arch_model->list, reg_model->coeff, reg_model->ncoeff, model->nparameters, model->combinations, model->symbol);
 
 		fprintf(f, "# n\tintercept\t");
-		int i, j, first;
+	        unsigned i, j;
+		int first;
 		for (i=0; i < model->ncombinations; i++)
 		{
 			if (model->parameters_names == NULL)
@@ -388,7 +389,7 @@ static void scan_reg_model(FILE *f, struct starpu_perfmodel_regression_model *re
 		reg_model->coeff = malloc(reg_model->ncoeff*sizeof(double));
 
 		unsigned multi_invalid = 0;
-		int i;
+		unsigned i;
 		for (i=0; i < reg_model->ncoeff; i++)
 		{
 			res = _starpu_read_double(f, "%le", &reg_model->coeff[i]);
@@ -1321,7 +1322,7 @@ double _starpu_multiple_regression_based_job_expected_perf(struct starpu_perfmod
 	parameters = (double *) malloc(model->nparameters*sizeof(double));
 	model->parameters(j->task, parameters);
 	expected_duration=reg_model->coeff[0];
-	int i, k;
+	unsigned i, k;
 	for (i=0; i < model->ncombinations; i++)
 	{
 		parameter_value=1.;