Skip to content

Commit fae9ead

Browse files
committed
NFC. Formatting and ununused header cleanup in examples
1 parent 800734e commit fae9ead

37 files changed

Lines changed: 108 additions & 179 deletions

examples/adi/adi-full.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <math.h>
4-
51
#define TMAX 1000
62
#define NMAX 1000
73

examples/adi/adi.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <math.h>
42
#include <assert.h>
53

64
#include <omp.h>
@@ -25,7 +23,7 @@ int main()
2523
init_array();
2624

2725
#ifdef PERFCTR
28-
PERF_INIT;
26+
PERF_INIT;
2927
#endif
3028

3129
IF_TIME(t_start = rtclock());
@@ -53,7 +51,7 @@ int main()
5351
IF_TIME(fprintf(stderr, "%0.6lfs\n", t_end - t_start));
5452

5553
#ifdef PERFCTR
56-
PERF_EXIT;
54+
PERF_EXIT;
5755
#endif
5856

5957
if (fopen(".test", "r")) {

examples/advect3d/advect3d.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <math.h>
42
#include <unistd.h>
53
#include <sys/time.h>
64
#include <assert.h>
@@ -11,7 +9,7 @@
119
// #define T 20
1210
// #define 9 9
1311

14-
#define f60 0.2
12+
#define f60 0.2
1513
#define f61 0.5
1614
#define f62 0.3
1715

@@ -85,7 +83,7 @@ int main()
8583
init_array() ;
8684

8785
#ifdef PERFCTR
88-
PERF_INIT;
86+
PERF_INIT;
8987
#endif
9088

9189
IF_TIME(t_start = rtclock());
@@ -95,21 +93,21 @@ int main()
9593
for (j = 4; j <= ny+9-2; j++)
9694
for (i = 4; i <= nx+9-3; i++)
9795
for (k = 4; k <= nz+9-3; k++)
98-
ab[j][i][k] = (f60 * (a[j-1][i][k] + a[j][i][k]) + f61
99-
* (a[j-2][i][k] + a[j+1][i][k]) + f62 * (a[j-3][i][k]
96+
ab[j][i][k] = (f60 * (a[j-1][i][k] + a[j][i][k]) + f61
97+
* (a[j-2][i][k] + a[j+1][i][k]) + f62 * (a[j-3][i][k]
10098
+ a[j+2][i][k])) * thirddtbydy * uyb[j][i][k];
10199

102100
for (j = 4; j <= ny+9-3; j++)
103101
for (i = 4; i <= nx+9-2; i++)
104102
for (k = 4; k <= nz+9-3; k++)
105-
al[j][i][k] = (f60 * (a[j][i-1][k] + a[j][i][k]) + f61
103+
al[j][i][k] = (f60 * (a[j][i-1][k] + a[j][i][k]) + f61
106104
* (a[j][i-2][k] + a[j][i+1][k]) + f62 * (a[j][i-3][k] + a[j][i+2][k]))
107105
* thirddtbydx * uxl[j][i][k];
108106

109107
for (j = 4; j <= ny+9-3; j++)
110108
for (i = 4; i <= nx+9-3; i++)
111109
for (k = 4; k <= nz+9-2; k++)
112-
af[j][i][k] = (f60 * (a[j][i][k-1] + a[j][i][k]) + f61
110+
af[j][i][k] = (f60 * (a[j][i][k-1] + a[j][i][k]) + f61
113111
* (a[j][i][k-2] + a[j][i][k+1]) + f62 * (a[j][i][k-3] + a[j][i][k+2]))
114112
* thirddtbydz * uzf[j][i][k];
115113

@@ -125,7 +123,7 @@ int main()
125123
IF_TIME(fprintf(stderr, "%0.6lfs\n", t_end - t_start));
126124

127125
#ifdef PERFCTR
128-
PERF_EXIT;
126+
PERF_EXIT;
129127
#endif
130128

131129
#ifdef TEST

examples/apop/apop.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
*/
77

88
#include <stdio.h>
9-
#include <stdlib.h>
10-
#include <string.h>
119
#include <sys/time.h>
12-
#include <math.h>
1310

1411
#define max(x,y) ((x) > (y)? (x) : (y))
1512
#define min(x,y) ((x) < (y)? (x) : (y))

examples/corcol/corcol.c

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,33 +58,27 @@ void print_array()
5858

5959
/** Error handler **************************************************/
6060

61-
void erhand(err_msg)
62-
char err_msg[];
63-
/* Error handler */
64-
{
65-
fprintf(stderr,"Run-time error:\n");
66-
fprintf(stderr,"%s\n", err_msg);
67-
fprintf(stderr,"Exiting to system.\n");
61+
/* Error handler */
62+
void erhand(char err_msg[]) {
63+
fprintf(stderr, "Run-time error:\n");
64+
fprintf(stderr, "%s\n", err_msg);
65+
fprintf(stderr, "Exiting to system.\n");
6866
exit(1);
6967
}
7068

71-
72-
float *vector(n)
73-
int n;
74-
/* Allocates a float vector with range [1..n]. */
75-
{
69+
/* Allocates a float vector with range [1..n]. */
70+
float *vector(int n) {
7671

7772
float *v;
7873

79-
v = (float *) malloc ((unsigned) n*sizeof(float));
80-
if (!v) erhand("Allocation failure in vector().");
81-
return v-1;
82-
74+
v = (float *)malloc((unsigned)n * sizeof(float));
75+
if (!v)
76+
erhand("Allocation failure in vector().");
77+
return v - 1;
8378
}
8479

8580
#ifdef TIME
86-
double rtclock()
87-
{
81+
double rtclock() {
8882
struct timezone Tzp;
8983
struct timeval Tp;
9084
int stat;

examples/corcol/corcol3.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <stdio.h>
2+
#include <string.h>
23
#include <unistd.h>
34
#include <sys/time.h>
45
#include <unistd.h>
@@ -37,23 +38,20 @@ void init_array()
3738
}
3839
}
3940

40-
41-
void print_array(char** argv)
42-
{
43-
int i, j;
44-
if (! strcmp(argv[0], ""))
45-
{
46-
for (i=0; i<M; i++) {
47-
for (i=0; i<M; i++) {
48-
fprintf(stderr, "%0.2lf ", symmat[i][j]);
49-
if (i%80 == 20) fprintf(stderr, "\n");
50-
}
51-
}
52-
fprintf(stderr, "\n");
41+
void print_array(char **argv) {
42+
int i, j;
43+
if (!strcmp(argv[0], "")) {
44+
for (i = 0; i < M; i++) {
45+
for (i = 0; i < M; i++) {
46+
fprintf(stderr, "%0.2lf ", symmat[i][j]);
47+
if (i % 80 == 20)
48+
fprintf(stderr, "\n");
5349
}
50+
}
51+
fprintf(stderr, "\n");
52+
}
5453
}
5554

56-
5755
double rtclock()
5856
{
5957
struct timezone Tzp;

examples/covcol/covcol.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <sys/time.h>
44
#include <unistd.h>
55
#include <sys/time.h>
6-
#include <math.h>
76

87
#define my_sqrt_array(x,j) sqrt(x[j])
98

examples/dct/dct.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <math.h>
42
#include <assert.h>
53
#include <unistd.h>
64
#include <sys/time.h>
@@ -61,7 +59,7 @@ int main()
6159
init_array();
6260

6361
#ifdef PERFCTR
64-
PERF_INIT;
62+
PERF_INIT;
6563
#endif
6664

6765
IF_TIME(t_start = rtclock());
@@ -88,7 +86,7 @@ int main()
8886
IF_TIME(fprintf(stderr, "%0.6lfs\n", t_end - t_start));
8987

9088
#ifdef PERFCTR
91-
PERF_EXIT;
89+
PERF_EXIT;
9290
#endif
9391

9492
#ifdef TEST

examples/doitgen/doitgen.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
#include <stdio.h>
2-
31
#include "decls.h"
42
#include "util.h"
53

64
double t_start, t_end;
75

8-
main()
6+
int main()
97
{
108
int t, p, q, r, s;
119

examples/doitgen/doitgen.dgemm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
double t_start, t_end;
1010

11-
main()
11+
int main()
1212
{
1313
int t, p, q, r, s;
1414
double *_C4, *_sum, *_A;
@@ -30,7 +30,7 @@ main()
3030
for( k=0; k<N; k++){
3131
_A[i*N*N+j*N+k]= A[i][j][k];
3232
}
33-
_C4[i*N+j]= C4[i][j];
33+
_C4[i*N+j]= C4[i][j];
3434
}
3535
}
3636

0 commit comments

Comments
 (0)