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
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dgemv(const enum CBLAS_ORDER order, void cblas_dgemv(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 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
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dger(const enum CBLAS_ORDER order, const int M, const int N, void cblas_dger(const enum CBLAS_ORDER order, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const double alpha, const double *X, const int incX, const double alpha, const double *X, const CBLAS_INT_TYPE incX,
const double *Y, const int incY, double *A, const int lda) const double *Y, const CBLAS_INT_TYPE incY, double *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;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
double cblas_dnrm2( const int N, const double *X, const int incX) double cblas_dnrm2( const CBLAS_INT_TYPE N, const double *X, const CBLAS_INT_TYPE incX)
{ {
double nrm2; double nrm2;
#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_drot(const int N, double *X, const int incX, void cblas_drot(const CBLAS_INT_TYPE N, double *X, const CBLAS_INT_TYPE incX,
double *Y, const int incY, const double c, const double s) double *Y, const CBLAS_INT_TYPE incY, const double c, const double s)
{ {
#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;
......
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_drotm( const int N, double *X, const int incX, double *Y, void cblas_drotm( const CBLAS_INT_TYPE N, double *X, const CBLAS_INT_TYPE incX, double *Y,
const int incY, const double *P) const CBLAS_INT_TYPE incY, const double *P)
{ {
#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_dsbmv(const enum CBLAS_ORDER order, void cblas_dsbmv(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 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 UL; char UL;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dscal( const int N, const double alpha, double *X, void cblas_dscal( const CBLAS_INT_TYPE N, const double alpha, double *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;
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
double cblas_dsdot( const int N, const float *X, double cblas_dsdot( const CBLAS_INT_TYPE N, const float *X,
const int incX, const float *Y, const int incY) const CBLAS_INT_TYPE incX, const float *Y, const CBLAS_INT_TYPE incY)
{ {
double dot; double dot;
#ifdef F77_INT #ifdef F77_INT
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dspmv(const enum CBLAS_ORDER order, void cblas_dspmv(const enum CBLAS_ORDER order,
const enum CBLAS_UPLO Uplo, const int N, const enum CBLAS_UPLO Uplo, const CBLAS_INT_TYPE N,
const double alpha, const double *AP, const double alpha, const double *AP,
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 UL; char UL;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_dspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const int N, const double alpha, const double *X, const CBLAS_INT_TYPE N, const double alpha, const double *X,
const int incX, double *Ap) const CBLAS_INT_TYPE incX, double *Ap)
{ {
char UL; char UL;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_dspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const int N, const double alpha, const double *X, const CBLAS_INT_TYPE N, const double alpha, const double *X,
const int incX, const double *Y, const int incY, double *A) const CBLAS_INT_TYPE incX, const double *Y, const CBLAS_INT_TYPE incY, double *A)
{ {
char UL; char UL;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dswap( const int N, double *X, const int incX, double *Y, void cblas_dswap( const CBLAS_INT_TYPE N, double *X, const CBLAS_INT_TYPE incX, double *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_dsymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_dsymm(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 double alpha, const double *A, const int lda, const double alpha, const double *A, const CBLAS_INT_TYPE lda,
const double *B, const int ldb, const double beta, const double *B, const CBLAS_INT_TYPE ldb, const double beta,
double *C, const int ldc) double *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_dsymv(const enum CBLAS_ORDER order, void cblas_dsymv(const enum CBLAS_ORDER order,
const enum CBLAS_UPLO Uplo, const int N, const enum CBLAS_UPLO Uplo, const CBLAS_INT_TYPE N,
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 UL; char UL;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dsyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_dsyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const int N, const double alpha, const double *X, const CBLAS_INT_TYPE N, const double alpha, const double *X,
const int incX, double *A, const int lda) const CBLAS_INT_TYPE incX, double *A, const CBLAS_INT_TYPE lda)
{ {
char UL; char UL;
#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_dsyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_dsyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const int N, const double alpha, const double *X, const CBLAS_INT_TYPE N, const double alpha, const double *X,
const int incX, const double *Y, const int incY, double *A, const CBLAS_INT_TYPE incX, const double *Y, const CBLAS_INT_TYPE incY, double *A,
const int lda) const CBLAS_INT_TYPE lda)
{ {
char UL; char 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_dsyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, void cblas_dsyr2k(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 double alpha, const double *A, const int lda, const double alpha, const double *A, const CBLAS_INT_TYPE lda,
const double *B, const int ldb, const double beta, const double *B, const CBLAS_INT_TYPE ldb, const double beta,
double *C, const int ldc) double *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_dsyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, void cblas_dsyrk(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 double alpha, const double *A, const int lda, const double alpha, const double *A, const CBLAS_INT_TYPE lda,
const double beta, double *C, const int ldc) const double beta, double *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_dtbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_dtbmv(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 double *A, const int lda, const CBLAS_INT_TYPE N, const CBLAS_INT_TYPE K, const double *A, const CBLAS_INT_TYPE lda,
double *X, const int incX) double *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
char UL; char UL;
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_dtbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_dtbsv(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 double *A, const int lda, const CBLAS_INT_TYPE N, const CBLAS_INT_TYPE K, const double *A, const CBLAS_INT_TYPE lda,
double *X, const int incX) double *X, const CBLAS_INT_TYPE incX)
{ {
char TA; char TA;
char UL; char UL;
......
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