From 526d664dc0c9f80c508cbcd40b3ad6f16823f06b Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 16 Feb 2018 12:35:28 +0100 Subject: [PATCH] Replace int with blasint for INTERFACE64 builds --- utest/test_axpy.c | 16 ++++++------ utest/test_dotu.c | 16 +++++------- utest/test_dsdot.c | 6 ++--- utest/test_rot.c | 16 ++++++------ utest/test_swap.c | 16 ++++++------ utest/utest_main2.c | 64 ++++++++++++++++++++++----------------------- 6 files changed, 65 insertions(+), 69 deletions(-) diff --git a/utest/test_axpy.c b/utest/test_axpy.c index 826ab2e5d..783755333 100644 --- a/utest/test_axpy.c +++ b/utest/test_axpy.c @@ -35,8 +35,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. CTEST(axpy,daxpy_inc_0) { - int i; - int N=8,incX=0,incY=0; + blasint i; + blasint N=8,incX=0,incY=0; double a=0.25; double x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -55,8 +55,8 @@ CTEST(axpy,daxpy_inc_0) CTEST(axpy,zaxpy_inc_0) { - int i; - int N=4,incX=0,incY=0; + blasint i; + blasint N=4,incX=0,incY=0; double a[2]={0.25,0.5}; double x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -74,8 +74,8 @@ CTEST(axpy,zaxpy_inc_0) CTEST(axpy,saxpy_inc_0) { - int i; - int N=8,incX=0,incY=0; + blasint i; + blasint N=8,incX=0,incY=0; float a=0.25; float x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -93,8 +93,8 @@ CTEST(axpy,saxpy_inc_0) CTEST(axpy,caxpy_inc_0) { - int i; - int N=4,incX=0,incY=0; + blasint i; + blasint N=4,incX=0,incY=0; float a[2]={0.25,0.5}; float x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; diff --git a/utest/test_dotu.c b/utest/test_dotu.c index c73b407ad..b34070df6 100644 --- a/utest/test_dotu.c +++ b/utest/test_dotu.c @@ -36,13 +36,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. CTEST( zdotu,zdotu_n_1) { - int N=1,incX=1,incY=1; + blasint N=1,incX=1,incY=1; double x1[]={1.0,1.0}; double y1[]={1.0,2.0}; - double x2[]={1.0,1.0}; - double y2[]={1.0,2.0}; - _Complex result1=0.0; - _Complex result2={-1.0000+3.0000*I}; + _Complex double result1=openblas_make_complex_double(0.0,0.0); + _Complex double result2=openblas_make_complex_double(-1.0000,3.0000); //OpenBLAS result1=BLASFUNC(zdotu)(&N,x1,&incX,y1,&incY); @@ -54,13 +52,11 @@ CTEST( zdotu,zdotu_n_1) CTEST(zdotu, zdotu_offset_1) { - int N=1,incX=1,incY=1; + blasint N=1,incX=1,incY=1; double x1[]={1.0,2.0,3.0,4.0}; double y1[]={5.0,6.0,7.0,8.0}; - double x2[]={1.0,2.0,3.0,4.0}; - double y2[]={5.0,6.0,7.0,8.0}; - _Complex result1=0.0; - _Complex result2={-9.0000+32.0000*I}; + _Complex double result1=openblas_make_complex_double(0.0,0.0); + _Complex double result2=openblas_make_complex_double(-9.0000,32.0000); //OpenBLAS result1=BLASFUNC(zdotu)(&N,x1+1,&incX,y1+1,&incY); diff --git a/utest/test_dsdot.c b/utest/test_dsdot.c index a1526182f..7d082a372 100644 --- a/utest/test_dsdot.c +++ b/utest/test_dsdot.c @@ -37,9 +37,9 @@ CTEST(dsdot,dsdot_n_1) { float x= 0.172555164F; float y= -0.0138700781F; - int incx=1; - int incy=1; - int n=1; + blasint incx=1; + blasint incy=1; + blasint n=1; double res1=0.0f, res2=-0.00239335360107; diff --git a/utest/test_rot.c b/utest/test_rot.c index d1d8b51dd..2a47b8058 100644 --- a/utest/test_rot.c +++ b/utest/test_rot.c @@ -35,8 +35,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. CTEST(rot,drot_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; double c=0.25,s=0.5; double x1[]={1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0}; @@ -55,8 +55,8 @@ CTEST(rot,drot_inc_0) CTEST(rot,zdrot_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; double c=0.25,s=0.5; double x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -75,8 +75,8 @@ CTEST(rot,zdrot_inc_0) CTEST(rot,srot_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; float c=0.25,s=0.5; float x1[]={1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0}; @@ -94,8 +94,8 @@ CTEST(rot,srot_inc_0) CTEST(rot, csrot_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; float c=0.25,s=0.5; float x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; diff --git a/utest/test_swap.c b/utest/test_swap.c index 5a9eee1fb..2f8b68ebd 100644 --- a/utest/test_swap.c +++ b/utest/test_swap.c @@ -35,8 +35,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. CTEST(swap,dswap_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; double x1[]={1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0}; double x2[]={1.0,3.0,5.0,7.0}; @@ -53,8 +53,8 @@ CTEST(swap,dswap_inc_0) CTEST(swap,zswap_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; double x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; double x2[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; @@ -71,8 +71,8 @@ CTEST(swap,zswap_inc_0) CTEST(swap,sswap_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; float x1[]={1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0}; float x2[]={1.0,3.0,5.0,7.0}; @@ -89,8 +89,8 @@ CTEST(swap,sswap_inc_0) CTEST(swap,cswap_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; float x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; float x2[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; diff --git a/utest/utest_main2.c b/utest/utest_main2.c index 4b5ee7295..2e5e7d72f 100644 --- a/utest/utest_main2.c +++ b/utest/utest_main2.c @@ -57,7 +57,7 @@ CTEST (drotmg,rotmg){ double te_y1, tr_y1; double te_param[5]; double tr_param[5]; - int i=0; + blasint i=0; // original test case for libGoto bug fixed by feb2014 rewrite te_d1= 0.21149573940783739; te_d2= 0.046892057172954082; @@ -104,7 +104,7 @@ CTEST (drotmg,rotmg_issue1452){ double te_y1, tr_y1; double te_param[5]; double tr_param[5]; - int i=0; + blasint i=0; // from issue #1452, buggy version returned 0.000244 for param[3] te_d1 = 5.9e-8; @@ -149,7 +149,7 @@ CTEST(drotmg, rotmg_D1eqD2_X1eqX2){ double te_y1, tr_y1; double te_param[5]; double tr_param[5]; - int i=0; + blasint i=0; te_d1= tr_d1=2.; te_d2= tr_d2=2.; te_x1= tr_x1=8.; @@ -186,8 +186,8 @@ CTEST(drotmg, rotmg_D1eqD2_X1eqX2){ CTEST(axpy,daxpy_inc_0) { - int i; - int N=8,incX=0,incY=0; + blasint i; + blasint N=8,incX=0,incY=0; double a=0.25; double x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -206,8 +206,8 @@ CTEST(axpy,daxpy_inc_0) CTEST(axpy,zaxpy_inc_0) { - int i; - int N=4,incX=0,incY=0; + blasint i; + blasint N=4,incX=0,incY=0; double a[2]={0.25,0.5}; double x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -225,8 +225,8 @@ CTEST(axpy,zaxpy_inc_0) CTEST(axpy,saxpy_inc_0) { - int i; - int N=8,incX=0,incY=0; + blasint i; + blasint N=8,incX=0,incY=0; float a=0.25; float x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -244,8 +244,8 @@ CTEST(axpy,saxpy_inc_0) CTEST(axpy,caxpy_inc_0) { - int i; - int N=4,incX=0,incY=0; + blasint i; + blasint N=4,incX=0,incY=0; float a[2]={0.25,0.5}; float x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -263,7 +263,7 @@ CTEST(axpy,caxpy_inc_0) CTEST( zdotu,zdotu_n_1) { - int N=1,incX=1,incY=1; + blasint N=1,incX=1,incY=1; double x1[]={1.0,1.0}; double y1[]={1.0,2.0}; _Complex double result1=openblas_make_complex_double(0.0,0.0); @@ -278,7 +278,7 @@ CTEST( zdotu,zdotu_n_1) CTEST(zdotu, zdotu_offset_1) { - int N=1,incX=1,incY=1; + blasint N=1,incX=1,incY=1; double x1[]={1.0,2.0,3.0,4.0}; double y1[]={5.0,6.0,7.0,8.0}; _Complex double result1=openblas_make_complex_double(0.0,0.0); @@ -296,9 +296,9 @@ CTEST(dsdot,dsdot_n_1) { float x= 0.172555164F; float y= -0.0138700781F; - int incx=1; - int incy=1; - int n=1; + blasint incx=1; + blasint incy=1; + blasint n=1; double res1=0.0f, res2=-0.00239335360107; @@ -309,8 +309,8 @@ CTEST(dsdot,dsdot_n_1) CTEST(rot,drot_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; double c=0.25,s=0.5; double x1[]={1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0}; @@ -329,8 +329,8 @@ CTEST(rot,drot_inc_0) CTEST(rot,zdrot_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; double c=0.25,s=0.5; double x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -349,8 +349,8 @@ CTEST(rot,zdrot_inc_0) CTEST(rot,srot_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; float c=0.25,s=0.5; float x1[]={1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0}; @@ -368,8 +368,8 @@ CTEST(rot,srot_inc_0) CTEST(rot, csrot_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; float c=0.25,s=0.5; float x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; @@ -387,8 +387,8 @@ CTEST(rot, csrot_inc_0) CTEST(swap,dswap_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; double x1[]={1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0}; double x2[]={1.0,3.0,5.0,7.0}; @@ -405,8 +405,8 @@ CTEST(swap,dswap_inc_0) CTEST(swap,zswap_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; double x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; double y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; double x2[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; @@ -423,8 +423,8 @@ CTEST(swap,zswap_inc_0) CTEST(swap,sswap_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; float x1[]={1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0}; float x2[]={1.0,3.0,5.0,7.0}; @@ -441,8 +441,8 @@ CTEST(swap,sswap_inc_0) CTEST(swap,cswap_inc_0) { - int i=0; - int N=4,incX=0,incY=0; + blasint i=0; + blasint N=4,incX=0,incY=0; float x1[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0}; float y1[]={2.0,4.0,6.0,8.0,2.0,4.0,6.0,8.0}; float x2[]={1.0,3.0,5.0,7.0,1.0,3.0,5.0,7.0};