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
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_cscal( const int N, const void *alpha, void *X, void cblas_cscal( const CBLAS_INT_TYPE N, const void *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;
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_csscal( const int N, const float alpha, void *X, void cblas_csscal( const CBLAS_INT_TYPE N, const float 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;
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_cswap( const int N, void *X, const int incX, void *Y, void cblas_cswap( const CBLAS_INT_TYPE N, void *X, const CBLAS_INT_TYPE incX, void *Y,
const int incY) 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;
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_csymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_csymm(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_csyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, void cblas_csyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE Trans, const int N, const int K, const enum CBLAS_TRANSPOSE Trans, 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 *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 UL, TR; char UL, TR;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_csyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, void cblas_csyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE Trans, const int N, const int K, const enum CBLAS_TRANSPOSE Trans, 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 *beta, void *C, const int ldc) const void *beta, void *C, const CBLAS_INT_TYPE ldc)
{ {
char UL, TR; char UL, TR;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ctbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_ctbmv(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 int K, const void *A, const int lda, const CBLAS_INT_TYPE N, const CBLAS_INT_TYPE K, const void *A, const CBLAS_INT_TYPE lda,
void *X, const int incX) void *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
char UL; char UL;
...@@ -30,7 +30,7 @@ void cblas_ctbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, ...@@ -30,7 +30,7 @@ void cblas_ctbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
#define F77_lda lda #define F77_lda lda
#define F77_incX incX #define F77_incX incX
#endif #endif
int n, i=0, tincX; CBLAS_INT_TYPE n, i=0, tincX;
float *st=0, *x=(float *)X; float *st=0, *x=(float *)X;
if (order == CblasColMajor) if (order == CblasColMajor)
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ctbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_ctbsv(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 int K, const void *A, const int lda, const CBLAS_INT_TYPE N, const CBLAS_INT_TYPE K, const void *A, const CBLAS_INT_TYPE lda,
void *X, const int incX) void *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
char UL; char UL;
...@@ -30,7 +30,7 @@ void cblas_ctbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, ...@@ -30,7 +30,7 @@ void cblas_ctbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
#define F77_lda lda #define F77_lda lda
#define F77_incX incX #define F77_incX incX
#endif #endif
int n, i=0, tincX; CBLAS_INT_TYPE n, i=0, tincX;
float *st=0,*x=(float *)X; float *st=0,*x=(float *)X;
if (order == CblasColMajor) if (order == CblasColMajor)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ctpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_ctpmv(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 void *Ap, void *X, const int incX) const CBLAS_INT_TYPE N, const void *Ap, void *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
char UL; char UL;
...@@ -27,7 +27,7 @@ void cblas_ctpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, ...@@ -27,7 +27,7 @@ void cblas_ctpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
#define F77_N N #define F77_N N
#define F77_incX incX #define F77_incX incX
#endif #endif
int n, i=0, tincX; CBLAS_INT_TYPE n, i=0, tincX;
float *st=0,*x=(float *)X; float *st=0,*x=(float *)X;
if (order == CblasColMajor) if (order == CblasColMajor)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ctpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_ctpsv(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 void *Ap, void *X, const int incX) const CBLAS_INT_TYPE N, const void *Ap, void *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
char UL; char UL;
...@@ -27,7 +27,7 @@ void cblas_ctpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, ...@@ -27,7 +27,7 @@ void cblas_ctpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
#define F77_N N #define F77_N N
#define F77_incX incX #define F77_incX incX
#endif #endif
int n, i=0, tincX; CBLAS_INT_TYPE n, i=0, tincX;
float *st=0, *x=(float*)X; float *st=0, *x=(float*)X;
if (order == CblasColMajor) if (order == CblasColMajor)
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ctrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_ctrmm(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 void *alpha, const void *A, const int lda, const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
void *B, const int ldb) void *B, const CBLAS_INT_TYPE ldb)
{ {
char UL, TA, SD, DI; char UL, TA, SD, DI;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ctrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_ctrmv(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 void *A, const int lda, const CBLAS_INT_TYPE N, const void *A, const CBLAS_INT_TYPE lda,
void *X, const int incX) void *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
...@@ -30,7 +30,7 @@ void cblas_ctrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, ...@@ -30,7 +30,7 @@ void cblas_ctrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
#define F77_lda lda #define F77_lda lda
#define F77_incX incX #define F77_incX incX
#endif #endif
int n, i=0, tincX; CBLAS_INT_TYPE n, i=0, tincX;
float *st=0,*x=(float *)X; float *st=0,*x=(float *)X;
if (order == CblasColMajor) if (order == CblasColMajor)
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ctrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_ctrsm(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 void *alpha, const void *A, const int lda, const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
void *B, const int ldb) void *B, const CBLAS_INT_TYPE ldb)
{ {
char UL, TA, SD, DI; char UL, TA, SD, DI;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ctrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_ctrsv(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 void *A, const int lda, void *X, const CBLAS_INT_TYPE N, const void *A, const CBLAS_INT_TYPE lda, void *X,
const int incX) const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
char UL; char UL;
...@@ -29,7 +29,7 @@ void cblas_ctrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, ...@@ -29,7 +29,7 @@ void cblas_ctrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
#define F77_lda lda #define F77_lda lda
#define F77_incX incX #define F77_incX incX
#endif #endif
int n, i=0, tincX; CBLAS_INT_TYPE n, i=0, tincX;
float *st=0,*x=(float *)X; float *st=0,*x=(float *)X;
if (order == CblasColMajor) if (order == CblasColMajor)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
double cblas_dasum( const int N, const double *X, const int incX) double cblas_dasum( const CBLAS_INT_TYPE N, const double *X, const CBLAS_INT_TYPE incX)
{ {
double asum; double asum;
#ifdef F77_INT #ifdef F77_INT
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_daxpy( const int N, const double alpha, const double *X, void cblas_daxpy( const CBLAS_INT_TYPE N, const double alpha, const double *X,
const int incX, double *Y, const int incY) const CBLAS_INT_TYPE incX, double *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_dcopy( const int N, const double *X, void cblas_dcopy( const CBLAS_INT_TYPE N, const double *X,
const int incX, double *Y, const int incY) const CBLAS_INT_TYPE incX, double *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"
double cblas_ddot( const int N, const double *X, double cblas_ddot( const CBLAS_INT_TYPE N, const double *X,
const int incX, const double *Y, const int incY) const CBLAS_INT_TYPE incX, const double *Y, const CBLAS_INT_TYPE incY)
{ {
double dot; double dot;
#ifdef F77_INT #ifdef F77_INT
......
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dgbmv(const enum CBLAS_ORDER order, void cblas_dgbmv(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 double alpha, const double *A, const int lda, const double alpha, const double *A, const CBLAS_INT_TYPE lda,
const double *X, const int incX, const double beta, const double *X, const CBLAS_INT_TYPE incX, const double beta,
double *Y, const int incY) double *Y, const CBLAS_INT_TYPE incY)
{ {
char TA; char TA;
#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_dgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, void cblas_dgemm(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 double alpha, const double *A, const CBLAS_INT_TYPE K, const double alpha, const double *A,
const int lda, const double *B, const int ldb, const CBLAS_INT_TYPE lda, const double *B, const CBLAS_INT_TYPE ldb,
const double beta, double *C, const int ldc) const double beta, double *C, const CBLAS_INT_TYPE ldc)
{ {
char TA, TB; char TA, TB;
#ifdef F77_CHAR #ifdef F77_CHAR
......
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