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,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_sgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, void cblas_sgemm(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 float alpha, const float *A, const CBLAS_INT_TYPE K, const float alpha, const float *A,
const int lda, const float *B, const int ldb, const CBLAS_INT_TYPE lda, const float *B, const CBLAS_INT_TYPE ldb,
const float beta, float *C, const int ldc) const float beta, float *C, const CBLAS_INT_TYPE ldc)
{ {
char TA, TB; char TA, TB;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_sgemv(const enum CBLAS_ORDER order, void cblas_sgemv(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 float alpha, const float *A, const int lda, const float alpha, const float *A, const CBLAS_INT_TYPE lda,
const float *X, const int incX, const float beta, const float *X, const CBLAS_INT_TYPE incX, const float beta,
float *Y, const int incY) float *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_sger(const enum CBLAS_ORDER order, const int M, const int N, void cblas_sger(const enum CBLAS_ORDER order, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
const float alpha, const float *X, const int incX, const float alpha, const float *X, const CBLAS_INT_TYPE incX,
const float *Y, const int incY, float *A, const int lda) const float *Y, const CBLAS_INT_TYPE incY, float *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"
float cblas_snrm2( const int N, const float *X, const int incX) float cblas_snrm2( const CBLAS_INT_TYPE N, const float *X, const CBLAS_INT_TYPE incX)
{ {
float nrm2; float 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_srot( const int N, float *X, const int incX, float *Y, void cblas_srot( const CBLAS_INT_TYPE N, float *X, const CBLAS_INT_TYPE incX, float *Y,
const int incY, const float c, const float s) const CBLAS_INT_TYPE incY, const float c, const float 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;
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_srotm( const int N, float *X, const int incX, float *Y, void cblas_srotm( const CBLAS_INT_TYPE N, float *X, const CBLAS_INT_TYPE incX, float *Y,
const int incY, const float *P) const CBLAS_INT_TYPE incY, const float *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;
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ssbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_ssbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const int N, const int K, const float alpha, const float *A, const CBLAS_INT_TYPE N, const CBLAS_INT_TYPE K, const float alpha, const float *A,
const int lda, const float *X, const int incX, const CBLAS_INT_TYPE lda, const float *X, const CBLAS_INT_TYPE incX,
const float beta, float *Y, const int incY) const float beta, float *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_sscal( const int N, const float alpha, float *X, void cblas_sscal( const CBLAS_INT_TYPE N, const float alpha, float *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,10 +9,10 @@ ...@@ -9,10 +9,10 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_sspmv(const enum CBLAS_ORDER order, void cblas_sspmv(const enum CBLAS_ORDER order,
const enum CBLAS_UPLO Uplo, const int N, const enum CBLAS_UPLO Uplo, const CBLAS_INT_TYPE N,
const float alpha, const float *AP, const float alpha, const float *AP,
const float *X, const int incX, const float beta, const float *X, const CBLAS_INT_TYPE incX, const float beta,
float *Y, const int incY) float *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_sspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_sspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const int N, const float alpha, const float *X, const CBLAS_INT_TYPE N, const float alpha, const float *X,
const int incX, float *Ap) const CBLAS_INT_TYPE incX, float *Ap)
{ {
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_sspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_sspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const int N, const float alpha, const float *X, const CBLAS_INT_TYPE N, const float alpha, const float *X,
const int incX, const float *Y, const int incY, float *A) const CBLAS_INT_TYPE incX, const float *Y, const CBLAS_INT_TYPE incY, float *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_sswap( const int N, float *X, const int incX, float *Y, void cblas_sswap( const CBLAS_INT_TYPE N, float *X, const CBLAS_INT_TYPE incX, float *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_ssymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_ssymm(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 float alpha, const float *A, const int lda, const float alpha, const float *A, const CBLAS_INT_TYPE lda,
const float *B, const int ldb, const float beta, const float *B, const CBLAS_INT_TYPE ldb, const float beta,
float *C, const int ldc) float *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_ssymv(const enum CBLAS_ORDER order, void cblas_ssymv(const enum CBLAS_ORDER order,
const enum CBLAS_UPLO Uplo, const int N, const enum CBLAS_UPLO Uplo, 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,
const float *X, const int incX, const float beta, const float *X, const CBLAS_INT_TYPE incX, const float beta,
float *Y, const int incY) float *Y, const CBLAS_INT_TYPE incY)
{ {
char UL; char UL;
#ifdef F77_CHAR #ifdef F77_CHAR
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "cblas.h" #include "cblas.h"
#include "cblas_f77.h" #include "cblas_f77.h"
void cblas_ssyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_ssyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const int N, const float alpha, const float *X, const CBLAS_INT_TYPE N, const float alpha, const float *X,
const int incX, float *A, const int lda) const CBLAS_INT_TYPE incX, float *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_ssyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_ssyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
const int N, const float alpha, const float *X, const CBLAS_INT_TYPE N, const float alpha, const float *X,
const int incX, const float *Y, const int incY, float *A, const CBLAS_INT_TYPE incX, const float *Y, const CBLAS_INT_TYPE incY, float *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_ssyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, void cblas_ssyr2k(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 float alpha, const float *A, const int lda, const float alpha, const float *A, const CBLAS_INT_TYPE lda,
const float *B, const int ldb, const float beta, const float *B, const CBLAS_INT_TYPE ldb, const float beta,
float *C, const int ldc) float *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_ssyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, void cblas_ssyrk(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 float alpha, const float *A, const int lda, const float alpha, const float *A, const CBLAS_INT_TYPE lda,
const float beta, float *C, const int ldc) const float beta, float *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 @@
void cblas_stbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_stbmv(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 float *A, const int lda, const CBLAS_INT_TYPE N, const CBLAS_INT_TYPE K, const float *A, const CBLAS_INT_TYPE lda,
float *X, const int incX) float *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_stbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, void cblas_stbsv(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 float *A, const int lda, const CBLAS_INT_TYPE N, const CBLAS_INT_TYPE K, const float *A, const CBLAS_INT_TYPE lda,
float *X, const int incX) float *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