fabio/JacobiHPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced fmax with fmaxf since doubles has been replaced with floats

Browse Source
This commit is contained in:
Fabio Salvini 2016-12-13 18:57:44 +01:00
parent 4f80d09da9
commit be875cb5af
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/impl/mpi_line.c
View File

@ -67,7 +67,7 @@ float *compute_jacobi(int rank, int numprocs, int n, float init_value, float thr
for (i = 1; i <= rows; i++) {
for (j = 1; j <= n; j++) {
new_value = 0.25 * (x[IDX(nb, i - 1, j)] + x[IDX(nb, i, j + 1)] + x[IDX(nb, i + 1, j)] + x[IDX(nb, i, j - 1)]);
max_diff = (float) fmax(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
max_diff = (float) fmaxf(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
new_x[IDX(nb, i, j)] = new_value;
}
}

2
src/impl/mpi_line_async.c
View File

@ -77,7 +77,7 @@ float *compute_jacobi(int rank, int numprocs, int n, float init_value, float thr
for (i = 1; i <= rows; i++) {
for (j = 1; j <= n; j++) {
new_value = 0.25 * (x[IDX(nb, i - 1, j)] + x[IDX(nb, i, j + 1)] + x[IDX(nb, i + 1, j)] + x[IDX(nb, i, j - 1)]);
max_diff = (float) fmax(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
max_diff = (float) fmaxf(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
new_x[IDX(nb, i, j)] = new_value;
}
}

2
src/impl/omp.c
View File

@ -45,7 +45,7 @@ float *compute_jacobi(int n, float init_value, float threshold, borders b, int *
for (i = 1; i <= n; i++) {
for (j = 1; j <= n; j++) {
new_value = 0.25 * (x[IDX(nb, i - 1, j)] + x[IDX(nb, i, j + 1)] + x[IDX(nb, i + 1, j)] + x[IDX(nb, i, j - 1)]);
max_diff = (float) fmax(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
max_diff = (float) fmaxf(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
new_x[IDX(nb, i, j)] = new_value;
}
}

2
src/impl/sequential.c
View File

@ -42,7 +42,7 @@ float *compute_jacobi(int n, float init_value, float threshold, borders b, int *
for (i = 1; i <= n; i++) {
for (j = 1; j <= n; j++) {
new_value = 0.25 * (x[IDX(nb, i - 1, j)] + x[IDX(nb, i, j + 1)] + x[IDX(nb, i + 1, j)] + x[IDX(nb, i, j - 1)]);
max_diff = (float) fmax(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
max_diff = (float) fmaxf(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
new_x[IDX(nb, i, j)] = new_value;
}
}

4
src/impl/sse.c
View File

@ -59,12 +59,12 @@ float *compute_jacobi(int n, float init_value, float threshold, borders b, int *
diff_vec = _mm_sub_ps(diff_vec, tmp_vec);
_mm_storeu_ps(diffs, diff_vec);
for (k = 0; k < 4; k++) {
max_diff = (float) fmax(max_diff, fabs(diffs[k]));
max_diff = (float) fmaxf(max_diff, fabs(diffs[k]));
}
}
for (j = n_mult; j <= n; j++) {
new_value = 0.25 * (x[IDX(nb, i - 1, j)] + x[IDX(nb, i, j + 1)] + x[IDX(nb, i + 1, j)] + x[IDX(nb, i, j - 1)]);
max_diff = (float) fmax(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
max_diff = (float) fmaxf(max_diff, fabs(new_value - x[IDX(nb, i, j)]));
new_x[IDX(nb, i, j)] = new_value;
}
}