From 2c222f1faafcee5c6439e36e507e05a6c6619e62 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 5 Nov 2017 15:53:14 +0100 Subject: [PATCH] Modify complex CBLAS functions to take void pointers Modify complex CBLAS functions to take void pointers instead of float or double arguments (to bring the prototypes in line with netlib and other implementations' cblas.h) --- interface/asum.c | 6 +++++- interface/copy.c | 6 ++++++ interface/gemm.c | 19 ++++++++++++------- interface/imax.c | 6 +++++- interface/nrm2.c | 5 +++++ interface/symm.c | 19 ++++++++++++------- interface/syr2k.c | 27 ++++++++++++++++++++++----- interface/syrk.c | 21 +++++++++++++++++++-- interface/tpmv.c | 9 ++++++++- interface/trsm.c | 11 ++++++++--- interface/zaxpby.c | 6 +++++- interface/zaxpy.c | 9 +++++++-- interface/zdot.c | 6 ++++-- interface/zgbmv.c | 16 +++++++++++----- interface/zgemv.c | 15 ++++++++++----- interface/zger.c | 13 +++++++++---- interface/zhbmv.c | 16 +++++++++++----- interface/zhemv.c | 10 ++++++++-- interface/zher.c | 5 ++++- interface/zher2.c | 7 ++++++- interface/zhpmv.c | 16 +++++++++++----- interface/zhpr.c | 7 +++++-- interface/zhpr2.c | 13 +++++++++---- interface/zscal.c | 8 +++++--- interface/zswap.c | 5 +++-- interface/ztbmv.c | 5 ++++- interface/ztbsv.c | 5 ++++- interface/ztpmv.c | 5 ++++- interface/ztpsv.c | 5 ++++- interface/ztrmv.c | 5 ++++- interface/ztrsv.c | 5 ++++- 31 files changed, 234 insertions(+), 77 deletions(-) diff --git a/interface/asum.c b/interface/asum.c index 139398940..bd83c88e0 100644 --- a/interface/asum.c +++ b/interface/asum.c @@ -68,8 +68,12 @@ FLOATRET NAME(blasint *N, FLOAT *x, blasint *INCX){ } #else - +#ifdef COMPLEX +FLOAT CNAME(blasint n, void *vx, blasint incx){ + FLOAT *x = (FLOAT*) vx; +#else FLOAT CNAME(blasint n, FLOAT *x, blasint incx){ +#endif FLOAT ret; diff --git a/interface/copy.c b/interface/copy.c index 3fb2182a9..20b5aec0a 100644 --- a/interface/copy.c +++ b/interface/copy.c @@ -54,7 +54,13 @@ void NAME(blasint *N, FLOAT *x, blasint *INCX, FLOAT *y, blasint *INCY){ #else +#ifdef COMPLEX +void CNAME(blasint n, void *vx, blasint incx, void *vy, blasint incy){ +FLOAT *x = (FLOAT*) vx; +FLOAT *y = (FLOAT*) vy; +#else void CNAME(blasint n, FLOAT *x, blasint incx, FLOAT *y, blasint incy){ +#endif PRINT_DEBUG_CNAME; diff --git a/interface/gemm.c b/interface/gemm.c index 7253b0500..8baf3fbec 100644 --- a/interface/gemm.c +++ b/interface/gemm.c @@ -220,17 +220,22 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANS blasint m, blasint n, blasint k, #ifndef COMPLEX FLOAT alpha, -#else - FLOAT *alpha, -#endif FLOAT *a, blasint lda, FLOAT *b, blasint ldb, -#ifndef COMPLEX FLOAT beta, -#else - FLOAT *beta, -#endif FLOAT *c, blasint ldc) { +#else + void *valpha, + void *va, blasint lda, + void *vb, blasint ldb, + void *vbeta, + void *vc, blasint ldc) { + FLOAT *alpha = (FLOAT*) valpha; + FLOAT *beta = (FLOAT*) vbeta; + FLOAT *a = (FLOAT*) va; + FLOAT *b = (FLOAT*) vb; + FLOAT *c = (FLOAT*) vc; +#endif blas_arg_t args; int transa, transb; diff --git a/interface/imax.c b/interface/imax.c index 4378f1e22..456460d98 100644 --- a/interface/imax.c +++ b/interface/imax.c @@ -146,8 +146,12 @@ blasint NAME(blasint *N, FLOAT *x, blasint *INCX){ } #else - +#ifdef COMPLEX +CBLAS_INDEX CNAME(blasint n, void *vx, blasint incx){ + FLOAT *x = (FLOAT*) vx; +#else CBLAS_INDEX CNAME(blasint n, FLOAT *x, blasint incx){ +#endif CBLAS_INDEX ret; diff --git a/interface/nrm2.c b/interface/nrm2.c index cb4c8f6f4..dc8c08e9a 100644 --- a/interface/nrm2.c +++ b/interface/nrm2.c @@ -69,7 +69,12 @@ FLOATRET NAME(blasint *N, FLOAT *x, blasint *INCX){ #else +#ifdef COMPLEX +FLOAT CNAME(blasint n, void *vx, blasint incx){ + FLOAT *x = (FLOAT*) vx; +#else FLOAT CNAME(blasint n, FLOAT *x, blasint incx){ +#endif FLOAT ret; diff --git a/interface/symm.c b/interface/symm.c index 3210d371a..0e29a5f48 100644 --- a/interface/symm.c +++ b/interface/symm.c @@ -228,17 +228,22 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, blasint m, blasint n, #ifndef COMPLEX FLOAT alpha, -#else - FLOAT *alpha, -#endif FLOAT *a, blasint lda, FLOAT *b, blasint ldb, -#ifndef COMPLEX FLOAT beta, -#else - FLOAT *beta, -#endif FLOAT *c, blasint ldc) { +#else + void *valpha, + void *va, blasint lda, + void *vb, blasint ldb, + void *vbeta, + void *vc, blasint ldc) { + FLOAT *alpha = (FLOAT*) valpha; + FLOAT *beta = (FLOAT*) vbeta; + FLOAT *a = (FLOAT*) va; + FLOAT *b = (FLOAT*) vb; + FLOAT *c = (FLOAT*) vc; +#endif blas_arg_t args; int side, uplo; diff --git a/interface/syr2k.c b/interface/syr2k.c index bfa5d8be4..a72330c0b 100644 --- a/interface/syr2k.c +++ b/interface/syr2k.c @@ -185,17 +185,34 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Tr blasint n, blasint k, #ifndef COMPLEX FLOAT alpha, -#else - FLOAT *alpha, -#endif FLOAT *a, blasint lda, FLOAT *b, blasint ldb, +#else + void *valpha, + void *va, blasint lda, + void *vb, blasint ldb, +#endif #if !defined(COMPLEX) || defined(HEMM) FLOAT beta, #else - FLOAT *beta, + void *vbeta, +#endif +#ifndef COMPLEX + FLOAT *c, +#else + void *vc, +#endif + blasint ldc) { + +#ifdef COMPLEX + FLOAT* alpha = (FLOAT*) valpha; +#if !defined(HEMM) + FLOAT* beta = (FLOAT*) vbeta; +#endif + FLOAT* a = (FLOAT*) va; + FLOAT* b = (FLOAT*) vb; + FLOAT* c = (FLOAT*) vc; #endif - FLOAT *c, blasint ldc) { blas_arg_t args; int uplo, trans; diff --git a/interface/syrk.c b/interface/syrk.c index f8c697033..7dc87e044 100644 --- a/interface/syrk.c +++ b/interface/syrk.c @@ -188,15 +188,32 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Tr #if !defined(COMPLEX) || defined(HEMM) FLOAT alpha, #else - FLOAT *alpha, + void *valpha, #endif +#if !defined(COMPLEX) FLOAT *a, blasint lda, +#else + void *va, blasint lda, +#endif #if !defined(COMPLEX) || defined(HEMM) FLOAT beta, #else - FLOAT *beta, + void *vbeta, #endif +#if !defined(COMPLEX) FLOAT *c, blasint ldc) { +#else + void *vc, blasint ldc) { +#endif + +#ifdef COMPLEX +#if !defined(HEMM) + FLOAT* alpha = (FLOAT*) valpha; + FLOAT* beta = (FLOAT*) vbeta; +#endif + FLOAT* a = (FLOAT*) va; + FLOAT* c = (FLOAT*) vc; +#endif blas_arg_t args; int uplo, trans; diff --git a/interface/tpmv.c b/interface/tpmv.c index edf010492..262af2285 100644 --- a/interface/tpmv.c +++ b/interface/tpmv.c @@ -135,10 +135,17 @@ void NAME(char *UPLO, char *TRANS, char *DIAG, } #else - +#ifndef COMPLEX void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, blasint n, FLOAT *a, FLOAT *x, blasint incx) { +#else +void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + blasint n, void *va, void *vx, blasint incx) { + FLOAT *a = (FLOAT*) va; + FLOAT *x = (FLOAT*) vx; +#endif int trans, uplo, unit; blasint info; diff --git a/interface/trsm.c b/interface/trsm.c index 3d4aed282..60c49795d 100644 --- a/interface/trsm.c +++ b/interface/trsm.c @@ -210,11 +210,16 @@ void CNAME(enum CBLAS_ORDER order, blasint m, blasint n, #ifndef COMPLEX FLOAT alpha, -#else - FLOAT *alpha, -#endif FLOAT *a, blasint lda, FLOAT *b, blasint ldb) { +#else + void *valpha, + void *va, blasint lda, + void *vb, blasint ldb) { + FLOAT *alpha = (FLOAT*) valpha; + FLOAT *a = (FLOAT*) va; + FLOAT *b = (FLOAT*) vb; +#endif blas_arg_t args; int side, uplo, trans, unit; diff --git a/interface/zaxpby.c b/interface/zaxpby.c index 1abb24de9..3a4db7403 100644 --- a/interface/zaxpby.c +++ b/interface/zaxpby.c @@ -48,8 +48,12 @@ void NAME(blasint *N, FLOAT *ALPHA, FLOAT *x, blasint *INCX, FLOAT *BETA, FLOAT #else -void CNAME(blasint n, FLOAT *ALPHA, FLOAT *x, blasint incx, FLOAT *BETA, FLOAT *y, blasint incy) +void CNAME(blasint n, void *VALPHA, void *vx, blasint incx, void *VBETA, void *vy, blasint incy) { + FLOAT* ALPHA = (FLOAT*) VALPHA; + FLOAT* BETA = (FLOAT*) VBETA; + FLOAT* x = (FLOAT*) vx; + FLOAT* y = (FLOAT*) vy; #endif diff --git a/interface/zaxpy.c b/interface/zaxpy.c index daa12bafb..fbb830ffb 100644 --- a/interface/zaxpy.c +++ b/interface/zaxpy.c @@ -51,9 +51,14 @@ void NAME(blasint *N, FLOAT *ALPHA, FLOAT *x, blasint *INCX, FLOAT *y, blasint * blasint incy = *INCY; #else - +#ifdef COMPLEX +void CNAME(blasint n, void *VALPHA, void *vx, blasint incx, void *vy, blasint incy){ +FLOAT *ALPHA = (FLOAT*) VALPHA; +FLOAT *x = (FLOAT*) vx; +FLOAT *y = (FLOAT*) vy; +#else void CNAME(blasint n, FLOAT *ALPHA, FLOAT *x, blasint incx, FLOAT *y, blasint incy){ - +#endif #endif FLOAT alpha_r = *(ALPHA + 0); diff --git a/interface/zdot.c b/interface/zdot.c index cd956b075..40f425cc1 100644 --- a/interface/zdot.c +++ b/interface/zdot.c @@ -148,13 +148,15 @@ OPENBLAS_COMPLEX_FLOAT NAME( blasint *N, FLOAT *x, blasin #else #ifdef FORCE_USE_STACK -void CNAME(blasint n, FLOAT *x, blasint incx, FLOAT *y, blasint incy, OPENBLAS_COMPLEX_FLOAT *result){ +void CNAME(blasint n, void *vx, blasint incx, void *vy, blasint incy, OPENBLAS_COMPLEX_FLOAT *result){ #else -OPENBLAS_COMPLEX_FLOAT CNAME(blasint n, FLOAT *x, blasint incx, FLOAT *y, blasint incy){ +OPENBLAS_COMPLEX_FLOAT CNAME(blasint n, void *vx, blasint incx, void *vy, blasint incy){ OPENBLAS_COMPLEX_FLOAT ret; OPENBLAS_COMPLEX_FLOAT zero=OPENBLAS_MAKE_COMPLEX_FLOAT(0.0, 0.0); #endif + FLOAT *x = (FLOAT*) vx; + FLOAT *y = (FLOAT*) vy; PRINT_DEBUG_CNAME; diff --git a/interface/zgbmv.c b/interface/zgbmv.c index a18cede1c..a04be2fbf 100644 --- a/interface/zgbmv.c +++ b/interface/zgbmv.c @@ -149,11 +149,17 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, blasint m, blasint n, blasint ku, blasint kl, - FLOAT *ALPHA, - FLOAT *a, blasint lda, - FLOAT *x, blasint incx, - FLOAT *BETA, - FLOAT *y, blasint incy){ + void *VALPHA, + void *va, blasint lda, + void *vx, blasint incx, + void *VBETA, + void *vy, blasint incy){ + + FLOAT* ALPHA = (FLOAT*) VALPHA; + FLOAT* BETA = (FLOAT*) VBETA; + FLOAT* a = (FLOAT*) va; + FLOAT* x = (FLOAT*) vx; + FLOAT* y = (FLOAT*) vy; FLOAT alpha_r = ALPHA[0]; FLOAT alpha_i = ALPHA[1]; diff --git a/interface/zgemv.c b/interface/zgemv.c index e5ba3757c..0c75564f0 100644 --- a/interface/zgemv.c +++ b/interface/zgemv.c @@ -134,12 +134,17 @@ void NAME(char *TRANS, blasint *M, blasint *N, void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, blasint m, blasint n, - FLOAT *ALPHA, - FLOAT *a, blasint lda, - FLOAT *x, blasint incx, - FLOAT *BETA, - FLOAT *y, blasint incy){ + void *VALPHA, + void *va, blasint lda, + void *vx, blasint incx, + void *VBETA, + void *vy, blasint incy){ + FLOAT *ALPHA = (FLOAT*) VALPHA; + FLOAT *a = (FLOAT*) va; + FLOAT *x = (FLOAT*) vx; + FLOAT *BETA = (FLOAT*) VBETA; + FLOAT *y = (FLOAT*) vy; FLOAT *buffer; blasint lenx, leny; int trans, buffer_size; diff --git a/interface/zger.c b/interface/zger.c index db72b4e4c..1360c5873 100644 --- a/interface/zger.c +++ b/interface/zger.c @@ -141,10 +141,15 @@ void NAME(blasint *M, blasint *N, FLOAT *Alpha, void CNAME(enum CBLAS_ORDER order, blasint m, blasint n, - FLOAT *Alpha, - FLOAT *x, blasint incx, - FLOAT *y, blasint incy, - FLOAT *a, blasint lda) { + void *VAlpha, + void *vx, blasint incx, + void *vy, blasint incy, + void *va, blasint lda) { + + FLOAT* Alpha = (FLOAT*) VAlpha; + FLOAT* a = (FLOAT*) va; + FLOAT* x = (FLOAT*) vx; + FLOAT* y = (FLOAT*) vy; FLOAT alpha_r = Alpha[0]; FLOAT alpha_i = Alpha[1]; diff --git a/interface/zhbmv.c b/interface/zhbmv.c index 8a16bbe28..9ad1b53a1 100644 --- a/interface/zhbmv.c +++ b/interface/zhbmv.c @@ -125,11 +125,17 @@ void NAME(char *UPLO, blasint *N, blasint *K, FLOAT *ALPHA, FLOAT *a, blasint * void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, blasint k, - FLOAT *ALPHA, - FLOAT *a, blasint lda, - FLOAT *x, blasint incx, - FLOAT *BETA, - FLOAT *y, blasint incy){ + void *VALPHA, + void *va, blasint lda, + void *vx, blasint incx, + void *VBETA, + void *vy, blasint incy){ + + FLOAT* ALPHA = (FLOAT*) VALPHA; + FLOAT* BETA = (FLOAT*) VBETA; + FLOAT* a = (FLOAT*) va; + FLOAT* x = (FLOAT*) vx; + FLOAT* y = (FLOAT*) vy; FLOAT alpha_r = ALPHA[0]; FLOAT alpha_i = ALPHA[1]; diff --git a/interface/zhemv.c b/interface/zhemv.c index 35d29baea..2aee880dc 100644 --- a/interface/zhemv.c +++ b/interface/zhemv.c @@ -108,8 +108,14 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, FLOAT *a, blasint *LDA, #else -void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT *ALPHA, - FLOAT *a, blasint lda, FLOAT *x, blasint incx, FLOAT *BETA, FLOAT *y, blasint incy) { +void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, void *VALPHA, + void *va, blasint lda, void *vx, blasint incx, void *VBETA, void *vy, blasint incy) { + + FLOAT* ALPHA = (FLOAT*) VALPHA; + FLOAT* BETA = (FLOAT*) VBETA; + FLOAT* a = (FLOAT*) va; + FLOAT* x = (FLOAT*) vx; + FLOAT* y = (FLOAT*) vy; FLOAT alpha_r = ALPHA[0]; FLOAT alpha_i = ALPHA[1]; diff --git a/interface/zher.c b/interface/zher.c index 2e4f0cb33..0d24984e6 100644 --- a/interface/zher.c +++ b/interface/zher.c @@ -113,7 +113,10 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, #else -void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha, FLOAT *x, blasint incx, FLOAT *a, blasint lda) { +void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha, void *vx, blasint incx, void *va, blasint lda) { + + FLOAT* a = (FLOAT*) va; + FLOAT* x = (FLOAT*) vx; FLOAT *buffer; int uplo; diff --git a/interface/zher2.c b/interface/zher2.c index 2717c57b3..1cae633ce 100644 --- a/interface/zher2.c +++ b/interface/zher2.c @@ -116,7 +116,12 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, #else -void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT *ALPHA, FLOAT *x, blasint incx, FLOAT *y, blasint incy, FLOAT *a, blasint lda) { +void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, void *VALPHA, void *vx, blasint incx, void *vy, blasint incy, void *va, blasint lda) { + + FLOAT* ALPHA = (FLOAT*) VALPHA; + FLOAT* a = (FLOAT*) va; + FLOAT* x = (FLOAT*) vx; + FLOAT* y = (FLOAT*) vy; FLOAT alpha_r = ALPHA[0]; FLOAT alpha_i = ALPHA[1]; diff --git a/interface/zhpmv.c b/interface/zhpmv.c index bab6e5531..b72a6d670 100644 --- a/interface/zhpmv.c +++ b/interface/zhpmv.c @@ -119,11 +119,17 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, FLOAT *a, void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, - FLOAT *ALPHA, - FLOAT *a, - FLOAT *x, blasint incx, - FLOAT *BETA, - FLOAT *y, blasint incy){ + void *VALPHA, + void *va, + void *vx, blasint incx, + void *VBETA, + void *vy, blasint incy){ + + FLOAT* ALPHA = (FLOAT*) VALPHA; + FLOAT* BETA = (FLOAT*) VBETA; + FLOAT* a = (FLOAT*) va; + FLOAT* x = (FLOAT*) vx; + FLOAT* y = (FLOAT*) vy; FLOAT alpha_r = ALPHA[0]; FLOAT alpha_i = ALPHA[1]; diff --git a/interface/zhpr.c b/interface/zhpr.c index 5159ba7e1..10507a71f 100644 --- a/interface/zhpr.c +++ b/interface/zhpr.c @@ -115,8 +115,11 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha, - FLOAT *x, blasint incx, - FLOAT *a) { + void *vx, blasint incx, + void *va) { + + FLOAT* x = (FLOAT*) vx; + FLOAT* a = (FLOAT*) va; FLOAT *buffer; int uplo; diff --git a/interface/zhpr2.c b/interface/zhpr2.c index 1712e5d52..c9bfb44b0 100644 --- a/interface/zhpr2.c +++ b/interface/zhpr2.c @@ -117,10 +117,15 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, - FLOAT *ALPHA, - FLOAT *x, blasint incx, - FLOAT *y, blasint incy, - FLOAT *a) { + void *VALPHA, + void *vx, blasint incx, + void *vy, blasint incy, + void *va) { + + FLOAT* ALPHA = (FLOAT*) VALPHA; + FLOAT* x = (FLOAT*) vx; + FLOAT* y = (FLOAT*) vy; + FLOAT* a = (FLOAT*) va; FLOAT alpha_r = ALPHA[0]; FLOAT alpha_i = ALPHA[1]; diff --git a/interface/zscal.c b/interface/zscal.c index 507d649bf..633b6ecf5 100644 --- a/interface/zscal.c +++ b/interface/zscal.c @@ -58,11 +58,13 @@ void NAME(blasint *N, FLOAT *ALPHA, FLOAT *x, blasint *INCX){ #else #ifndef SSCAL -void CNAME(blasint n, FLOAT *ALPHA, FLOAT *x, blasint incx){ +void CNAME(blasint n, void *VALPHA, void *vx, blasint incx){ - FLOAT *alpha=ALPHA; + FLOAT *x = (FLOAT*) vx; + FLOAT *alpha=(FLOAT*)VALPHA; #else -void CNAME(blasint n, FLOAT alpha_r, FLOAT *x, blasint incx){ +void CNAME(blasint n, FLOAT alpha_r, void *vx, blasint incx){ + FLOAT *x = (FLOAT*) vx; FLOAT alpha[2] = {alpha_r, ZERO}; #endif diff --git a/interface/zswap.c b/interface/zswap.c index fc62f7363..5308cbe90 100644 --- a/interface/zswap.c +++ b/interface/zswap.c @@ -52,8 +52,9 @@ void NAME(blasint *N, FLOAT *x, blasint *INCX, FLOAT *y, blasint *INCY){ #else -void CNAME(blasint n, FLOAT *x, blasint incx, FLOAT *y, blasint incy){ - +void CNAME(blasint n, void *vx, blasint incx, void *vy, blasint incy){ +FLOAT *x = (FLOAT*)vx; +FLOAT *y = (FLOAT*)vy; #endif #ifdef SMP diff --git a/interface/ztbmv.c b/interface/ztbmv.c index 0b6243125..d56620c5b 100644 --- a/interface/ztbmv.c +++ b/interface/ztbmv.c @@ -155,7 +155,10 @@ void NAME(char *UPLO, char *TRANS, char *DIAG, void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, - blasint n, blasint k, FLOAT *a, blasint lda, FLOAT *x, blasint incx) { + blasint n, blasint k, void *va, blasint lda, void *vx, blasint incx) { + + FLOAT *a = (FLOAT*) va; + FLOAT *x = (FLOAT*) vx; int trans, uplo, unit; blasint info; diff --git a/interface/ztbsv.c b/interface/ztbsv.c index 8afd2afe7..7e144ce75 100644 --- a/interface/ztbsv.c +++ b/interface/ztbsv.c @@ -131,8 +131,11 @@ void NAME(char *UPLO, char *TRANS, char *DIAG, void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, - blasint n, blasint k, FLOAT *a, blasint lda, FLOAT *x, blasint incx) { + blasint n, blasint k, void *va, blasint lda, void *vx, blasint incx) { + FLOAT *a = (FLOAT*) va; + FLOAT *x = (FLOAT*) vx; + int trans, uplo, unit; blasint info; FLOAT *buffer; diff --git a/interface/ztpmv.c b/interface/ztpmv.c index f9dfa75fb..3791d1602 100644 --- a/interface/ztpmv.c +++ b/interface/ztpmv.c @@ -150,8 +150,11 @@ void NAME(char *UPLO, char *TRANS, char *DIAG, void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, - blasint n, FLOAT *a, FLOAT *x, blasint incx) { + blasint n, void *va, void *vx, blasint incx) { + FLOAT *a = (FLOAT*) va; + FLOAT *x = (FLOAT*) vx; + int trans, uplo, unit; blasint info; FLOAT *buffer; diff --git a/interface/ztpsv.c b/interface/ztpsv.c index c63e4d033..fa706b565 100644 --- a/interface/ztpsv.c +++ b/interface/ztpsv.c @@ -126,8 +126,11 @@ void NAME(char *UPLO, char *TRANS, char *DIAG, void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, - blasint n, FLOAT *a, FLOAT *x, blasint incx) { + blasint n, void *va, void *vx, blasint incx) { + FLOAT *a = (FLOAT*) va; + FLOAT *x = (FLOAT*) vx; + int trans, uplo, unit; blasint info; FLOAT *buffer; diff --git a/interface/ztrmv.c b/interface/ztrmv.c index 1721afc1c..4c47e9e91 100644 --- a/interface/ztrmv.c +++ b/interface/ztrmv.c @@ -152,8 +152,11 @@ void NAME(char *UPLO, char *TRANS, char *DIAG, void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, - blasint n, FLOAT *a, blasint lda, FLOAT *x, blasint incx) { + blasint n, void *va, blasint lda, void *vx, blasint incx) { + FLOAT *a = (FLOAT*) va; + FLOAT *x = (FLOAT*) vx; + int trans, uplo, unit, buffer_size; blasint info; FLOAT *buffer; diff --git a/interface/ztrsv.c b/interface/ztrsv.c index ceac1727f..cbb7bba13 100644 --- a/interface/ztrsv.c +++ b/interface/ztrsv.c @@ -130,8 +130,11 @@ void NAME(char *UPLO, char *TRANS, char *DIAG, void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, - blasint n, FLOAT *a, blasint lda, FLOAT *x, blasint incx) { + blasint n, void *va, blasint lda, void *vx, blasint incx) { + FLOAT *a = (FLOAT*) va; + FLOAT *x = (FLOAT*) vx; + int trans, uplo, unit; blasint info; FLOAT *buffer;