Skip to content

Commit 69a8aa6

Browse files
martin-frbgmartin-frbg
authored
Fix transposition of expected and computed values in error message
1 parent 0ab5bf1 commit 69a8aa6

File tree

5 files changed

+33
-34
lines changed

5 files changed

+33
-34
lines changed

‎utest/test_axpy.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ CTEST(axpy,daxpy_inc_0)
4848
BLASFUNC(daxpy)(&N,&a,x1,&incX,y1,&incY);
4949

5050
for(i=0; i<N; i++){
51-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], DOUBLE_EPS);
52-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], DOUBLE_EPS);
51+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], DOUBLE_EPS);
52+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], DOUBLE_EPS);
5353
}
5454
}
5555

@@ -67,8 +67,8 @@ CTEST(axpy,zaxpy_inc_0)
6767
BLASFUNC(zaxpy)(&N,a,x1,&incX,y1,&incY);
6868

6969
for(i=0; i<2*N; i++){
70-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], DOUBLE_EPS);
71-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], DOUBLE_EPS);
70+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], DOUBLE_EPS);
71+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], DOUBLE_EPS);
7272
}
7373
}
7474

@@ -86,8 +86,8 @@ CTEST(axpy,saxpy_inc_0)
8686
BLASFUNC(saxpy)(&N,&a,x1,&incX,y1,&incY);
8787

8888
for(i=0; i<N; i++){
89-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], DOUBLE_EPS);
90-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], DOUBLE_EPS);
89+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], DOUBLE_EPS);
90+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], DOUBLE_EPS);
9191
}
9292
}
9393

@@ -105,7 +105,7 @@ CTEST(axpy,caxpy_inc_0)
105105
BLASFUNC(caxpy)(&N,a,x1,&incX,y1,&incY);
106106

107107
for(i=0; i<2*N; i++){
108-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], DOUBLE_EPS);
109-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], DOUBLE_EPS);
108+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], DOUBLE_EPS);
109+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], DOUBLE_EPS);
110110
}
111111
}

‎utest/test_dotu.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333

3434
#include "openblas_utest.h"
3535
#include <complex.h>
36-
#include <stdio.h>
3736

3837
CTEST( zdotu,zdotu_n_1)
3938
{
@@ -50,11 +49,11 @@ CTEST( zdotu,zdotu_n_1)
5049
#endif
5150

5251
#ifdef OPENBLAS_COMPLEX_STRUCT
53-
ASSERT_DBL_NEAR_TOL(result1.real, result2.real, DOUBLE_EPS);
54-
ASSERT_DBL_NEAR_TOL(result1.imag, result2.imag, DOUBLE_EPS);
52+
ASSERT_DBL_NEAR_TOL(result2.real, result1.real, DOUBLE_EPS);
53+
ASSERT_DBL_NEAR_TOL(result2.imag, result1.imag, DOUBLE_EPS);
5554
#else
56-
ASSERT_DBL_NEAR_TOL(creal(result1), creal(result2), DOUBLE_EPS);
57-
ASSERT_DBL_NEAR_TOL(cimag(result1), cimag(result2), DOUBLE_EPS);
55+
ASSERT_DBL_NEAR_TOL(creal(result2), creal(result1), DOUBLE_EPS);
56+
ASSERT_DBL_NEAR_TOL(cimag(result2), cimag(result1), DOUBLE_EPS);
5857
#endif
5958

6059
}
@@ -74,11 +73,11 @@ CTEST(zdotu, zdotu_offset_1)
7473
#endif
7574

7675
#ifdef OPENBLAS_COMPLEX_STRUCT
77-
ASSERT_DBL_NEAR_TOL(result1.real, result2.real, DOUBLE_EPS);
78-
ASSERT_DBL_NEAR_TOL(result1.imag, result2.imag, DOUBLE_EPS);
76+
ASSERT_DBL_NEAR_TOL(result2.real, result1.real, DOUBLE_EPS);
77+
ASSERT_DBL_NEAR_TOL(result2.imag, result1.imag, DOUBLE_EPS);
7978
#else
80-
ASSERT_DBL_NEAR_TOL(creal(result1), creal(result2), DOUBLE_EPS);
81-
ASSERT_DBL_NEAR_TOL(cimag(result1), cimag(result2), DOUBLE_EPS);
79+
ASSERT_DBL_NEAR_TOL(creal(result2), creal(result1), DOUBLE_EPS);
80+
ASSERT_DBL_NEAR_TOL(cimag(result2), cimag(result1), DOUBLE_EPS);
8281
#endif
8382

8483
}

‎utest/test_dsdot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ CTEST(dsdot,dsdot_n_1)
4444
double res1=0.0f, res2=-0.00239335360107;
4545

4646
res1=BLASFUNC(dsdot)(&n, &x, &incx, &y, &incy);
47-
ASSERT_DBL_NEAR_TOL(res1, res2, DOUBLE_EPS);
47+
ASSERT_DBL_NEAR_TOL(res2, res1, DOUBLE_EPS);
4848

4949
}

‎utest/test_rot.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ CTEST(rot,drot_inc_0)
4848
BLASFUNC(drot)(&N,x1,&incX,y1,&incY,&c,&s);
4949

5050
for(i=0; i<N; i++){
51-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], DOUBLE_EPS);
52-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], DOUBLE_EPS);
51+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], DOUBLE_EPS);
52+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], DOUBLE_EPS);
5353
}
5454
}
5555

@@ -68,8 +68,8 @@ CTEST(rot,zdrot_inc_0)
6868
BLASFUNC(zdrot)(&N,x1,&incX,y1,&incY,&c,&s);
6969

7070
for(i=0; i<2*N; i++){
71-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], DOUBLE_EPS);
72-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], DOUBLE_EPS);
71+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], DOUBLE_EPS);
72+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], DOUBLE_EPS);
7373
}
7474
}
7575

@@ -87,8 +87,8 @@ CTEST(rot,srot_inc_0)
8787
BLASFUNC(srot)(&N,x1,&incX,y1,&incY,&c,&s);
8888

8989
for(i=0; i<N; i++){
90-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], SINGLE_EPS);
91-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], SINGLE_EPS);
90+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], SINGLE_EPS);
91+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], SINGLE_EPS);
9292
}
9393
}
9494

@@ -106,7 +106,7 @@ CTEST(rot, csrot_inc_0)
106106
BLASFUNC(csrot)(&N,x1,&incX,y1,&incY,&c,&s);
107107

108108
for(i=0; i<2*N; i++){
109-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], SINGLE_EPS);
110-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], SINGLE_EPS);
109+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], SINGLE_EPS);
110+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], SINGLE_EPS);
111111
}
112112
}

‎utest/test_swap.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ CTEST(swap,dswap_inc_0)
4646
BLASFUNC(dswap)(&N,x1,&incX,y1,&incY);
4747

4848
for(i=0; i<N; i++){
49-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], DOUBLE_EPS);
50-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], DOUBLE_EPS);
49+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], DOUBLE_EPS);
50+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], DOUBLE_EPS);
5151
}
5252
}
5353

@@ -64,8 +64,8 @@ CTEST(swap,zswap_inc_0)
6464
BLASFUNC(zswap)(&N,x1,&incX,y1,&incY);
6565

6666
for(i=0; i<2*N; i++){
67-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], DOUBLE_EPS);
68-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], DOUBLE_EPS);
67+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], DOUBLE_EPS);
68+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], DOUBLE_EPS);
6969
}
7070
}
7171

@@ -82,8 +82,8 @@ CTEST(swap,sswap_inc_0)
8282
BLASFUNC(sswap)(&N,x1,&incX,y1,&incY);
8383

8484
for(i=0; i<N; i++){
85-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], SINGLE_EPS);
86-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], SINGLE_EPS);
85+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], SINGLE_EPS);
86+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], SINGLE_EPS);
8787
}
8888
}
8989

@@ -100,7 +100,7 @@ CTEST(swap,cswap_inc_0)
100100
BLASFUNC(cswap)(&N,x1,&incX,y1,&incY);
101101

102102
for(i=0; i<2*N; i++){
103-
ASSERT_DBL_NEAR_TOL(x1[i], x2[i], SINGLE_EPS);
104-
ASSERT_DBL_NEAR_TOL(y1[i], y2[i], SINGLE_EPS);
103+
ASSERT_DBL_NEAR_TOL(x2[i], x1[i], SINGLE_EPS);
104+
ASSERT_DBL_NEAR_TOL(y2[i], y1[i], SINGLE_EPS);
105105
}
106106
}

0 commit comments

Comments
 (0)