Commit 0ef7198e authored by Davis King's avatar Davis King
Browse files

Added a CBLAS_INT_TYPE macro to control the int type used by cblas.

parent e71f6bce
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_stpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_stpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
const int N, const float *Ap, float *X, const int incX) const CBLAS_INT_TYPE N, const float *Ap, float *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
char UL; char UL;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_stpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_stpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
const int N, const float *Ap, float *X, const int incX) const CBLAS_INT_TYPE N, const float *Ap, float *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
char UL; char UL;
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_strmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_strmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const int M, const int N, const enum CBLAS_DIAG Diag, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const float alpha, const float *A, const int lda, const float alpha, const float *A, const CBLAS_INT_TYPE lda,
float *B, const int ldb) float *B, const CBLAS_INT_TYPE ldb)
{ {
char UL, TA, SD, DI; char UL, TA, SD, DI;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_strmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_strmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
const int N, const float *A, const int lda, const CBLAS_INT_TYPE N, const float *A, const CBLAS_INT_TYPE lda,
float *X, const int incX) float *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_strsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_strsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const int M, const int N, const enum CBLAS_DIAG Diag, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const float alpha, const float *A, const int lda, const float alpha, const float *A, const CBLAS_INT_TYPE lda,
float *B, const int ldb) float *B, const CBLAS_INT_TYPE ldb)
{ {
char UL, TA, SD, DI; char UL, TA, SD, DI;
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_strsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_strsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
const int N, const float *A, const int lda, float *X, const CBLAS_INT_TYPE N, const float *A, const CBLAS_INT_TYPE lda, float *X,
const int incX) const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_xerbla(int info, const char *rout, const char *form, ...) void cblas_xerbla(CBLAS_INT_TYPE info, const char *rout, const char *form, ...)
{ {
char empty[1] = ""; char empty[1] = "";
va_list argptr; va_list argptr;
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zaxpy( const int N, const void *alpha, const void *X, void cblas_zaxpy( const CBLAS_INT_TYPE N, const void *alpha, const void *X,
const int incX, void *Y, const int incY) const CBLAS_INT_TYPE incX, void *Y, const CBLAS_INT_TYPE incY)
{ {
#ifdef F77_INT #ifdef F77_INT
F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zcopy( const int N, const void *X, void cblas_zcopy( const CBLAS_INT_TYPE N, const void *X,
const int incX, void *Y, const int incY) const CBLAS_INT_TYPE incX, void *Y, const CBLAS_INT_TYPE incY)
{ {
#ifdef F77_INT #ifdef F77_INT
F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zdotc_sub( const int N, const void *X, const int incX, void cblas_zdotc_sub( const CBLAS_INT_TYPE N, const void *X, const CBLAS_INT_TYPE incX,
const void *Y, const int incY, void *dotc) const void *Y, const CBLAS_INT_TYPE incY, void *dotc)
{ {
#ifdef F77_INT #ifdef F77_INT
F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zdotu_sub( const int N, const void *X, const int incX, void cblas_zdotu_sub( const CBLAS_INT_TYPE N, const void *X, const CBLAS_INT_TYPE incX,
const void *Y, const int incY, void *dotu) const void *Y, const CBLAS_INT_TYPE incY, void *dotu)
{ {
#ifdef F77_INT #ifdef F77_INT
F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zdscal( const int N, const double alpha, void *X, void cblas_zdscal( const CBLAS_INT_TYPE N, const double alpha, void *X,
const int incX) const CBLAS_INT_TYPE incX)
{ {
#ifdef F77_INT #ifdef F77_INT
F77_INT F77_N=N, F77_incX=incX; F77_INT F77_N=N, F77_incX=incX;
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zgbmv(const enum CBLAS_ORDER order, void cblas_zgbmv(const enum CBLAS_ORDER order,
const enum CBLAS_TRANSPOSE TransA, const int M, const int N, const enum CBLAS_TRANSPOSE TransA, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const int KL, const int KU, const CBLAS_INT_TYPE KL, const CBLAS_INT_TYPE KU,
const void *alpha, const void *A, const int lda, const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
const void *X, const int incX, const void *beta, const void *X, const CBLAS_INT_TYPE incX, const void *beta,
void *Y, const int incY) void *Y, const CBLAS_INT_TYPE incY)
{ {
char TA; char TA;
#ifdef F77_CHAR #ifdef F77_CHAR
...@@ -34,10 +34,10 @@ void cblas_zgbmv(const enum CBLAS_ORDER order, ...@@ -34,10 +34,10 @@ void cblas_zgbmv(const enum CBLAS_ORDER order,
#define F77_incX incx #define F77_incX incx
#define F77_incY incY #define F77_incY incY
#endif #endif
int n, i=0, incx=incX; CBLAS_INT_TYPE n, i=0, incx=incX;
const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta; const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta;
double ALPHA[2],BETA[2]; double ALPHA[2],BETA[2];
int tincY, tincx; CBLAS_INT_TYPE tincY, tincx;
double *x=(double *)X, *y=(double *)Y, *st=0, *tx; double *x=(double *)X, *y=(double *)Y, *st=0, *tx;
if (order == CblasColMajor) if (order == CblasColMajor)
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, void cblas_zgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA,
const enum CBLAS_TRANSPOSE TransB, const int M, const int N, const enum CBLAS_TRANSPOSE TransB, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const int K, const void *alpha, const void *A, const CBLAS_INT_TYPE K, const void *alpha, const void *A,
const int lda, const void *B, const int ldb, const CBLAS_INT_TYPE lda, const void *B, const CBLAS_INT_TYPE ldb,
const void *beta, void *C, const int ldc) const void *beta, void *C, const CBLAS_INT_TYPE ldc)
{ {
char TA, TB; char TA, TB;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zgemv(const enum CBLAS_ORDER order, void cblas_zgemv(const enum CBLAS_ORDER order,
const enum CBLAS_TRANSPOSE TransA, const int M, const int N, const enum CBLAS_TRANSPOSE TransA, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const void *alpha, const void *A, const int lda, const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
const void *X, const int incX, const void *beta, const void *X, const CBLAS_INT_TYPE incX, const void *beta,
void *Y, const int incY) void *Y, const CBLAS_INT_TYPE incY)
{ {
char TA; char TA;
#ifdef F77_CHAR #ifdef F77_CHAR
...@@ -31,10 +31,10 @@ void cblas_zgemv(const enum CBLAS_ORDER order, ...@@ -31,10 +31,10 @@ void cblas_zgemv(const enum CBLAS_ORDER order,
#define F77_incY incY #define F77_incY incY
#endif #endif
int n, i=0, incx=incX; CBLAS_INT_TYPE n, i=0, incx=incX;
const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta; const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta;
double ALPHA[2],BETA[2]; double ALPHA[2],BETA[2];
int tincY, tincx; CBLAS_INT_TYPE tincY, tincx;
double *x=(double *)X, *y=(double *)Y, *st=0, *tx; double *x=(double *)X, *y=(double *)Y, *st=0, *tx;
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#include <stdlib.h> #include <stdlib.h>
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zgerc(const enum CBLAS_ORDER order, const int M, const int N, void cblas_zgerc(const enum CBLAS_ORDER order, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const void *alpha, const void *X, const int incX, const void *alpha, const void *X, const CBLAS_INT_TYPE incX,
const void *Y, const int incY, void *A, const int lda) const void *Y, const CBLAS_INT_TYPE incY, void *A, const CBLAS_INT_TYPE lda)
{ {
#ifdef F77_INT #ifdef F77_INT
F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY; F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
...@@ -23,7 +23,7 @@ void cblas_zgerc(const enum CBLAS_ORDER order, const int M, const int N, ...@@ -23,7 +23,7 @@ void cblas_zgerc(const enum CBLAS_ORDER order, const int M, const int N,
#define F77_lda lda #define F77_lda lda
#endif #endif
int n, i, tincy, incy=incY; CBLAS_INT_TYPE n, i, tincy, incy=incY;
double *y=(double *)Y, *yy=(double *)Y, *ty, *st; double *y=(double *)Y, *yy=(double *)Y, *ty, *st;
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zgeru(const enum CBLAS_ORDER order, const int M, const int N, void cblas_zgeru(const enum CBLAS_ORDER order, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const void *alpha, const void *X, const int incX, const void *alpha, const void *X, const CBLAS_INT_TYPE incX,
const void *Y, const int incY, void *A, const int lda) const void *Y, const CBLAS_INT_TYPE incY, void *A, const CBLAS_INT_TYPE lda)
{ {
#ifdef F77_INT #ifdef F77_INT
F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY; F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
void cblas_zhbmv(const enum CBLAS_ORDER order, void cblas_zhbmv(const enum CBLAS_ORDER order,
const enum CBLAS_UPLO Uplo,const int N,const int K, const enum CBLAS_UPLO Uplo,const CBLAS_INT_TYPE N,const CBLAS_INT_TYPE K,
const void *alpha, const void *A, const int lda, const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
const void *X, const int incX, const void *beta, const void *X, const CBLAS_INT_TYPE incX, const void *beta,
void *Y, const int incY) void *Y, const CBLAS_INT_TYPE incY)
{ {
char UL; char UL;
#ifdef F77_CHAR #ifdef F77_CHAR
...@@ -30,10 +30,10 @@ void cblas_zhbmv(const enum CBLAS_ORDER order, ...@@ -30,10 +30,10 @@ void cblas_zhbmv(const enum CBLAS_ORDER order,
#define F77_incX incx #define F77_incX incx
#define F77_incY incY #define F77_incY incY
#endif #endif
int n, i=0, incx=incX; CBLAS_INT_TYPE n, i=0, incx=incX;
const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta; const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta;
double ALPHA[2],BETA[2]; double ALPHA[2],BETA[2];
int tincY, tincx; CBLAS_INT_TYPE tincY, tincx;
double *x=(double *)X, *y=(double *)Y, *st=0, *tx; double *x=(double *)X, *y=(double *)Y, *st=0, *tx;
if (order == CblasColMajor) if (order == CblasColMajor)
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zhemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_zhemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const int M, const int N, const enum CBLAS_UPLO Uplo, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const void *alpha, const void *A, const int lda, const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
const void *B, const int ldb, const void *beta, const void *B, const CBLAS_INT_TYPE ldb, const void *beta,
void *C, const int ldc) void *C, const CBLAS_INT_TYPE ldc)
{ {
char SD, UL; char SD, UL;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_zhemv(const enum CBLAS_ORDER order, void cblas_zhemv(const enum CBLAS_ORDER order,
const enum CBLAS_UPLO Uplo, const int N, const enum CBLAS_UPLO Uplo, const CBLAS_INT_TYPE N,
const void *alpha, const void *A, const int lda, const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
const void *X, const int incX, const void *beta, const void *X, const CBLAS_INT_TYPE incX, const void *beta,
void *Y, const int incY) void *Y, const CBLAS_INT_TYPE incY)
{ {
char UL; char UL;
#ifdef F77_CHAR #ifdef F77_CHAR
...@@ -29,10 +29,10 @@ void cblas_zhemv(const enum CBLAS_ORDER order, ...@@ -29,10 +29,10 @@ void cblas_zhemv(const enum CBLAS_ORDER order,
#define F77_incX incx #define F77_incX incx
#define F77_incY incY #define F77_incY incY
#endif #endif
int n, i=0, incx=incX; CBLAS_INT_TYPE n, i=0, incx=incX;
const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta; const double *xx= (double *)X, *alp= (double *)alpha, *bet = (double *)beta;
double ALPHA[2],BETA[2]; double ALPHA[2],BETA[2];
int tincY, tincx; CBLAS_INT_TYPE tincY, tincx;
double *x=(double *)X, *y=(double *)Y, *st=0, *tx; double *x=(double *)X, *y=(double *)Y, *st=0, *tx;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment