1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## omp-repair.dpatch by <gerber@delft.vdg.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Specifies shared and private data in some "#pragma omp" statements that caused problems.
## DP: Also includes some minor improvements in function headers: const declaration for pointers.
@DPATCH@
diff -urNad libgpiv-0.6.1~/include/gpiv/gpiv-piv_utils.h libgpiv-0.6.1/include/gpiv/gpiv-piv_utils.h
--- libgpiv-0.6.1~/include/gpiv/gpiv-piv_utils.h 2009-10-09 10:11:19.000000000 +0200
+++ libgpiv-0.6.1/include/gpiv/gpiv-piv_utils.h 2009-10-09 10:11:29.000000000 +0200
@@ -112,7 +112,7 @@
* @return NULL on success or error message on failure
*/
gchar *
-gpiv_0_pivdata (GpivPivData *piv_data
+gpiv_0_pivdata (const GpivPivData *piv_data
);
@@ -141,7 +141,7 @@
*/
gchar *
gpiv_ovwrt_pivdata (const GpivPivData *piv_data_in,
- GpivPivData *piv_data_out
+ const GpivPivData *piv_data_out
);
diff -urNad libgpiv-0.6.1~/lib/imgproc_deform.c libgpiv-0.6.1/lib/imgproc_deform.c
--- libgpiv-0.6.1~/lib/imgproc_deform.c 2009-10-09 10:11:19.000000000 +0200
+++ libgpiv-0.6.1/lib/imgproc_deform.c 2009-10-09 10:11:29.000000000 +0200
@@ -185,9 +185,9 @@
* and second frame with half shift backwards.
*/
/* OK: results approved */
-#pragma omp parallel sections num_threads(2)
+#pragma omp parallel sections
{
-#pragma omp section
+#pragma omp section
{
if ((err_msg =
imgproc_deform_frame_from_pivdata(image->frame1, image->header,
@@ -200,7 +200,7 @@
#endif
}
}
-#pragma omp section
+#pragma omp section
{
if ((err_msg =
imgproc_deform_frame_from_pivdata(image->frame2, image->header,
@@ -454,7 +454,7 @@
/* BUGFIX SamplesToCoefficients: OMP causes error */
-/* #pragma omp parallel for */
+/* KEEP OUT! #pragma omp parallel for */
for (y = 0L; y < Height; y++) {
GetRow(Image, y, Line, Width);
ConvertToInterpolationCoefficients(Line, Width, Pole, NbPoles,
@@ -473,7 +473,7 @@
/* BUGFIX SamplesToCoefficients: OMP causes error */
-/* #pragma omp parallel for */
+/* KEEP OUT! #pragma omp parallel for */
for (x = 0L; x < Width; x++) {
GetColumn(Image, Width, x, Line, Height);
ConvertToInterpolationCoefficients(Line, Height, Pole, NbPoles, DBL_EPSILON);
@@ -712,7 +712,7 @@
pd = gpiv_alloc_pivdata (image_par->ncolumns,
image_par->nrows);
/* OK: results approved */
-#pragma omp parallel for
+#pragma omp parallel for shared(pd) private(i, j)
for (i = 0; i < pd->ny; i++) {
for (j = 0; j < pd->nx; j++) {
pd->point_x[i][j] = (float) j;
@@ -745,7 +745,7 @@
#endif /* SMOOTH */
/* OK: results approved */
-#pragma omp parallel for
+#pragma omp parallel for shared(pd) private(i, j)
for (i = 0; i < pd->ny; i++) {
for (j = 0; j < pd->nx; j++) {
pd->dx[i][j] = magnitude * pd->dx[i][j];
@@ -811,7 +811,7 @@
p = ImageRasterArray;
/* OK: results approved */
-#pragma omp parallel for
+#pragma omp parallel for shared(image_par, img, p) private(i, j)
for (i = 0; i < image_par->nrows; i++) {
for (j = 0; j < image_par->ncolumns; j++) {
p[i*image_par->ncolumns + j] = (float) img[i][j];
@@ -839,7 +839,7 @@
/* BUGFIX imgproc_deform_frame: OMP causes differences in results */
/* BUGFIX imgproc_deform_frame: When disabled OMP in imgproc_deform */
-/* #pragma omp parallel for private(x1, y1) */
+/* KEEP OUT! #pragma omp parallel for private(x1, y1) */
for (i = 0; i < image_par->nrows; i++) {
for (j = 0; j < image_par->ncolumns; j++) {
x1 = (double) j - (double) piv_data->dx[i][j];
@@ -875,7 +875,7 @@
p = OutputImage;
/* OK: results approved */
-#pragma omp parallel for private(rounded)
+#pragma omp parallel for private(i, j, rounded)
for (i = 0; i < image_par->nrows; i++) {
for (j = 0; j < image_par->ncolumns; j++) {
rounded = (long)floor ((double) p[i*image_par->ncolumns + j] + 0.5);
diff -urNad libgpiv-0.6.1~/lib/piv_utils.c libgpiv-0.6.1/lib/piv_utils.c
--- libgpiv-0.6.1~/lib/piv_utils.c 2009-10-09 10:11:19.000000000 +0200
+++ libgpiv-0.6.1/lib/piv_utils.c 2009-10-09 10:11:29.000000000 +0200
@@ -115,7 +115,7 @@
/*
* Initializing values for structure members
*/
-#pragma omp parallel for
+#pragma omp parallel for shared(piv_data) private(i, j)
for (i = 0; i < piv_data->ny; i++) {
for (j = 0; j < piv_data->nx; j++) {
piv_data->point_x[i][j] = 0.0;
@@ -253,7 +253,7 @@
return NULL;
}
-#pragma omp parallel for
+#pragma omp parallel for shared(piv_data_out, piv_data) private(i, j)
for (i = 0; i < piv_data_out->ny; i++) {
for (j = 0; j < piv_data_out->nx; j++) {
piv_data_out->point_x[i][j] = piv_data->point_x[i][j];
@@ -264,7 +264,8 @@
piv_data_out->peak_no[i][j] = piv_data->peak_no[i][j];
}
}
-
+
+
#ifdef DEBUG2
gpiv_write_pivdata (NULL, piv_data_out, FALSE);
@@ -276,7 +277,7 @@
gchar *
gpiv_ovwrt_pivdata (const GpivPivData *piv_data_in,
- GpivPivData *piv_data_out
+ const GpivPivData *piv_data_out
)
/*-----------------------------------------------------------------------------
* DESCRIPTION:
@@ -321,7 +322,7 @@
/*
* Overwriting
*/
-#pragma omp parallel for
+#pragma omp parallel for shared(piv_data_out, piv_data_in) private(i, j)
for (i = 0; i < piv_data_in->ny; i++) {
for (j = 0; j < piv_data_in->nx; j++) {
piv_data_out->point_x[i][j] = piv_data_in->point_x[i][j];
@@ -332,7 +333,6 @@
piv_data_out->peak_no[i][j] = piv_data_in->peak_no[i][j];
}
}
-
#ifdef DEBUG2
gpiv_write_pivdata (NULL, piv_data_out, FALSE);
@@ -343,7 +343,7 @@
gchar *
-gpiv_0_pivdata (GpivPivData *piv_data
+gpiv_0_pivdata (const GpivPivData *piv_data
)
/*-----------------------------------------------------------------------------
* DESCRIPTION:
@@ -402,11 +402,9 @@
}
-#pragma omp parallel for
+#pragma omp parallel for shared(piv_data) private(i, j)
for (i = 0; i < piv_data->ny; i++) {
for (j = 0; j < piv_data->nx; j++) {
- /* piv_data->point_x[i][j] = 0.0; */
- /* piv_data->point_y[i][j] = 0.0; */
piv_data->dx[i][j] = 0.0;
piv_data->dy[i][j] = 0.0;
piv_data->snr[i][j] = 0.0;
@@ -450,7 +448,7 @@
return err_msg;
}
-#pragma omp parallel for
+#pragma omp parallel for shared(piv_data_out, piv_data_in) private(i, j)
for (i = 0; i < piv_data_out->ny; i++) {
for (j = 0; j < piv_data_out->nx; j++) {
piv_data_out->point_x[i][j] = piv_data_in->point_x[i][j];
@@ -488,7 +486,6 @@
}
-#pragma omp parallel for
for (i = 0; i < gpd->ny; i++) {
for (j = 0; j < gpd->nx; j++) {
*sum += gpd->dx[i][j];
diff -urNad libgpiv-0.6.1~/lib/valid.c libgpiv-0.6.1/lib/valid.c
--- libgpiv-0.6.1~/lib/valid.c 2009-10-09 10:11:19.000000000 +0200
+++ libgpiv-0.6.1/lib/valid.c 2009-10-09 10:12:22.000000000 +0200
@@ -124,9 +124,11 @@
float *dx_m, *dy_m, *dx_org, *dy_org;
float *r_m;
float residu;
+
/*
* Obtain length of array
*/
+#pragma parallel for shared(data, incl_point, vlength) private(k, l)
for (k = i - N; k <= i + N; k++) {
if ((k >= 0) && (k < data->ny)) {
for (l = j - N; l <= j + N; l++) {
@@ -179,8 +181,18 @@
/*
* Sorting dx_m and dy_m arrays and searching median index and value
*/
- qsort(dx_m, vlength, sizeof(float), compare_float);
- qsort(dy_m, vlength, sizeof(float), compare_float);
+#pragma omp sections
+ {
+#pragma omp section
+ {
+ qsort(dx_m, vlength, sizeof(float), compare_float);
+ }
+#pragma omp section
+ {
+ qsort(dy_m, vlength, sizeof(float), compare_float);
+ }
+ }
+
if (incl_point) {
median_index = (int) (vlength - 1) / 2;
} else {
@@ -282,7 +294,6 @@
{
gchar *err_msg = NULL;
gint i, j;
-/* guint i_mx, j_mx, i_my, j_my; */
/* out_data = gpiv_cp_pivdata (piv_data); */
@@ -292,7 +303,6 @@
} else if (valid_par->residu_type == GPIV_VALID_RESIDUTYPE__MEDIAN) {
-/* #pragma omp parallel for */
for (i = 1; i < piv_data->ny - 1; i++) {
for (j = 1; j < piv_data->nx - 1; j++) {
guint i_mx, j_mx, i_my, j_my;
@@ -309,8 +319,6 @@
} else if (valid_par->residu_type == GPIV_VALID_RESIDUTYPE__NORMMEDIAN) {
gfloat residu_from_median_dxdy = 1.111, residu_norm = 5.555;
-/* BUGFIX: gpiv_valid_residu: different results with OMP */
-/* #pragma omp parallel for private(residu_from_median_dxdy, residu_norm) */
for (i = 0; i < piv_data->ny; i++) {
for (j = 0; j < piv_data->nx; j++) {
guint i_mx, j_mx, i_my, j_my;
@@ -473,6 +481,10 @@
gfloat dx, dy, snr;
FILE *fp;
+ guint count = 0;
+ gfloat dx_sum = 0, dy_sum = 0;
+
+
/*
* Create a local PIV data set, so input data will not be modified halfway
* during substitution. Else, this might affect PIV displacements
@@ -489,10 +501,9 @@
* no substitution, only sets peak_no to 0
*/
-#pragma omp parallel for
+#pragma omp parallel for shared(piv_data, l_data, outlier_found) private(i, j)
for (i = 0; i < piv_data->ny; i++) {
for (j = 0; j < piv_data->nx; j++) {
- guint i_mx, j_mx, i_my, j_my;
if (piv_data->peak_no[i][j] != -1
&& piv_data->snr[i][j] > valid_par->residu_max) {
@@ -514,12 +525,13 @@
} else if (valid_par->subst_type ==
GPIV_VALID_SUBSTYPE__L_MEAN) {
-#pragma omp parallel for
+#pragma omp parallel for shared(piv_data) private(i, j, k, l, count, \
+ dx_sum, dy_sum)
for (i = 0; i < piv_data->ny; i++) {
for (j = 0; j < piv_data->nx; j++) {
- guint i_mx, j_mx, i_my, j_my;
- guint count = 0;
- gfloat dx_sum = 0, dy_sum = 0;
+ count = 0;
+ dx_sum = 0.0;
+ dy_sum = 0.0;
if (piv_data->peak_no[i][j] != -1
&& piv_data->snr[i][j] > valid_par->residu_max) {
@@ -555,11 +567,9 @@
/*
* Substitution with median particle displacements
*/
-
-#pragma omp parallel for
for (i = 0; i < piv_data->ny; i++) {
for (j = 0; j < piv_data->nx; j++) {
- guint i_mx, j_mx, i_my, j_my;
+ guint i_mx, j_mx, i_my, j_my;
if (piv_data->peak_no[i][j] != -1
&& piv_data->snr[i][j] > valid_par->residu_max) {
@@ -601,9 +611,6 @@
}
}
-
-
-
/*
@@ -753,7 +760,8 @@
/*
* Subdividing fractional particle displacements in bins
*/
-/* #pragma omp parallel for private(fract) */
+#pragma omp parallel for shared(piv_data, bound, count) \
+ private(i, j, k, fract)
for (i = 0; i < piv_data->ny; i++) {
for (j = 0; j < piv_data->nx; j++) {
fract = fabs(piv_data->dx[i][j] - (int) piv_data->dx[i][j]);
@@ -897,13 +905,6 @@
l_piv_par = gpiv_piv_cp_parameters (piv_par);
l_valid_par = gpiv_valid_cp_parameters (valid_par);
-/* l_data = gpiv_alloc_pivdata (piv_data->nx, piv_data->ny); */
-/* for (i = 0; i < piv_data->ny; i++) { */
-/* for (j = 0; j < piv_data->nx; j++) { */
-/* l_data->point_x[i][j] = piv_data->point_x[i][j]; */
-/* l_data->point_y[i][j] = piv_data->point_y[i][j]; */
-/* } */
-/* } */
while (outlier_found && count < GPIV_VALID_MAX_SWEEP) {
@@ -936,25 +937,14 @@
/*
* piv_data are updated with corrected values
- * l_data will be freed for an eventually next loop
+ * l_data will be made free for an eventually next loop
+ * BUGFIX: possible memleak? Comment: when outside if {} causes crashing.
*/
if (outlier_found) {
count++;
-
-#pragma omp parallel for
- for (i = 0; i < piv_data->ny; i++) {
- for (j = 0; j < piv_data->nx; j++) {
- piv_data->point_x[i][j] = l_data->point_x[i][j];
- piv_data->point_y[i][j] = l_data->point_y[i][j];
- piv_data->dx[i][j] = l_data->dx[i][j];
- piv_data->dy[i][j] = l_data->dy[i][j];
- piv_data->snr[i][j] = l_data->snr[i][j];
- piv_data->peak_no[i][j] = l_data->peak_no[i][j];
- }
- }
-
+ gpiv_ovwrt_pivdata (l_data, piv_data);
+ }
gpiv_free_pivdata (l_data);
- }
}
|
