Skip to content

Commit dc46216

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

37 files changed

Lines changed: 181 additions & 259 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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <math.h>
41
#include <assert.h>
2+
#include <stdio.h>
53

64
#include <omp.h>
75

@@ -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: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1+
#include <assert.h>
12
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <math.h>
4-
#include <unistd.h>
53
#include <sys/time.h>
6-
#include <assert.h>
4+
#include <unistd.h>
75

86
#define nx 300
97
#define ny 300
108
#define nz 300
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,24 +93,26 @@ 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]
100-
+ a[j+2][i][k])) * thirddtbydy * uyb[j][i][k];
96+
ab[j][i][k] = (f60 * (a[j - 1][i][k] + a[j][i][k]) +
97+
f61 * (a[j - 2][i][k] + a[j + 1][i][k]) +
98+
f62 * (a[j - 3][i][k] + a[j + 2][i][k])) *
99+
thirddtbydy * uyb[j][i][k];
101100

102101
for (j = 4; j <= ny+9-3; j++)
103102
for (i = 4; i <= nx+9-2; i++)
104103
for (k = 4; k <= nz+9-3; k++)
105-
al[j][i][k] = (f60 * (a[j][i-1][k] + a[j][i][k]) + f61
106-
* (a[j][i-2][k] + a[j][i+1][k]) + f62 * (a[j][i-3][k] + a[j][i+2][k]))
107-
* thirddtbydx * uxl[j][i][k];
104+
al[j][i][k] = (f60 * (a[j][i - 1][k] + a[j][i][k]) +
105+
f61 * (a[j][i - 2][k] + a[j][i + 1][k]) +
106+
f62 * (a[j][i - 3][k] + a[j][i + 2][k])) *
107+
thirddtbydx * uxl[j][i][k];
108108

109109
for (j = 4; j <= ny+9-3; j++)
110110
for (i = 4; i <= nx+9-3; i++)
111111
for (k = 4; k <= nz+9-2; k++)
112-
af[j][i][k] = (f60 * (a[j][i][k-1] + a[j][i][k]) + f61
113-
* (a[j][i][k-2] + a[j][i][k+1]) + f62 * (a[j][i][k-3] + a[j][i][k+2]))
114-
* thirddtbydz * uzf[j][i][k];
115-
112+
af[j][i][k] = (f60 * (a[j][i][k - 1] + a[j][i][k]) +
113+
f61 * (a[j][i][k - 2] + a[j][i][k + 1]) +
114+
f62 * (a[j][i][k - 3] + a[j][i][k + 2])) *
115+
thirddtbydz * uzf[j][i][k];
116116

117117
for (j = 4; j <= ny+9-3; j++)
118118
for (i = 4; i <= nx+9-3; i++)
@@ -125,7 +125,7 @@ int main()
125125
IF_TIME(fprintf(stderr, "%0.6lfs\n", t_end - t_start));
126126

127127
#ifdef PERFCTR
128-
PERF_EXIT;
128+
PERF_EXIT;
129129
#endif
130130

131131
#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: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
#include <math.h>
12
#include <stdio.h>
2-
#include <unistd.h>
3+
#include <string.h>
34
#include <sys/time.h>
45
#include <unistd.h>
5-
#include <sys/time.h>
6-
#include <math.h>
76

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

@@ -37,23 +36,20 @@ void init_array()
3736
}
3837
}
3938

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");
39+
void print_array(char **argv) {
40+
int i, j;
41+
if (!strcmp(argv[0], "")) {
42+
for (i = 0; i < M; i++) {
43+
for (i = 0; i < M; i++) {
44+
fprintf(stderr, "%0.2lf ", symmat[i][j]);
45+
if (i % 80 == 20)
46+
fprintf(stderr, "\n");
5347
}
48+
}
49+
fprintf(stderr, "\n");
50+
}
5451
}
5552

56-
5753
double rtclock()
5854
{
5955
struct timezone Tzp;

‎examples/covcol/covcol.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#include <stdio.h>
2-
#include <unistd.h>
32
#include <sys/time.h>
43
#include <unistd.h>
5-
#include <sys/time.h>
6-
#include <math.h>
74

85
#define my_sqrt_array(x,j) sqrt(x[j])
96

‎examples/dct/dct.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <math.h>
41
#include <assert.h>
5-
#include <unistd.h>
2+
#include <stdio.h>
63
#include <sys/time.h>
4+
#include <unistd.h>
75

86
#define M 1024
97
double cos1[M][M+13];
@@ -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: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
#include <stdio.h>
2-
31
#include "decls.h"
42
#include "util.h"
53

64
double t_start, t_end;
75

8-
main()
9-
{
10-
int t, p, q, r, s;
6+
int main() {
7+
int t, p, q, r, s;
118

12-
init_array();
9+
init_array();
1310

14-
IF_TIME(t_start = rtclock());
11+
IF_TIME(t_start = rtclock());
1512

1613
#ifdef TIME
1714
for (t=0; t<1000; t++) {
@@ -45,5 +42,4 @@ main()
4542
#endif
4643

4744
return 0;
48-
4945
}

‎examples/doitgen/doitgen.dgemm.c‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,32 @@
88

99
double t_start, t_end;
1010

11-
main()
12-
{
13-
int t, p, q, r, s;
14-
double *_C4, *_sum, *_A;
15-
int LDA, LDB, LDC;
16-
int i, j, k;
17-
18-
LDA=N;
19-
LDB=N;
20-
LDC=N;
21-
22-
init_array();
23-
24-
_A = (double *) malloc(sizeof(double)*N*N*N);
25-
_C4 = (double *) malloc(sizeof(double)*N*N);
26-
_sum = (double *) malloc(sizeof(double)*N*N*N);
27-
28-
for( i=0; i<N; i++){
29-
for( j=0; j<N; j++){
30-
for( k=0; k<N; k++){
31-
_A[i*N*N+j*N+k]= A[i][j][k];
32-
}
33-
_C4[i*N+j]= C4[i][j];
34-
}
11+
int main() {
12+
int t, p, q, r, s;
13+
double *_C4, *_sum, *_A;
14+
int LDA, LDB, LDC;
15+
int i, j, k;
16+
17+
LDA = N;
18+
LDB = N;
19+
LDC = N;
20+
21+
init_array();
22+
23+
_A = (double *)malloc(sizeof(double) * N * N * N);
24+
_C4 = (double *)malloc(sizeof(double) * N * N);
25+
_sum = (double *)malloc(sizeof(double) * N * N * N);
26+
27+
for (i = 0; i < N; i++) {
28+
for (j = 0; j < N; j++) {
29+
for (k = 0; k < N; k++) {
30+
_A[i * N * N + j * N + k] = A[i][j][k];
31+
}
32+
_C4[i * N + j] = C4[i][j];
3533
}
34+
}
3635

37-
IF_TIME(t_start = rtclock());
36+
IF_TIME(t_start = rtclock());
3837

3938
#ifndef TEST
4039
for (t=0; t<1000; t++) {
@@ -73,5 +72,4 @@ main()
7372
#endif
7473

7574
return 0;
76-
7775
}

0 commit comments

Comments
 (0)