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

dlib/external/cblas/cblas_caxpy.c

@@ -8,8 +8,8 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_caxpy( const int N, const void *alpha, const void *X,
-                       const int incX, void *Y, const int incY)
+void cblas_caxpy( const CBLAS_INT_TYPE N, const void *alpha, const void *X,
+                       const CBLAS_INT_TYPE incX, void *Y, const CBLAS_INT_TYPE incY)
 {
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;

dlib/external/cblas/cblas_ccopy.c

@@ -8,8 +8,8 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_ccopy( const int N, const void *X,
-                      const int incX, void *Y, const int incY)
+void cblas_ccopy( const CBLAS_INT_TYPE N, const void *X,
+                      const CBLAS_INT_TYPE incX, void *Y, const CBLAS_INT_TYPE incY)
 {
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;

dlib/external/cblas/cblas_cdotc_sub.c

@@ -9,8 +9,8 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cdotc_sub( const int N, const void *X, const int incX,
-                    const void *Y, const int incY,void *dotc)
+void cblas_cdotc_sub( const CBLAS_INT_TYPE N, const void *X, const CBLAS_INT_TYPE incX,
+                    const void *Y, const CBLAS_INT_TYPE incY,void *dotc)
 {
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;

dlib/external/cblas/cblas_cdotu_sub.c

@@ -9,8 +9,8 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cdotu_sub( const int N, const void *X,
-                     const int incX, const void *Y, const int incY,void *dotu)
+void cblas_cdotu_sub( const CBLAS_INT_TYPE N, const void *X,
+                     const CBLAS_INT_TYPE incX, const void *Y, const CBLAS_INT_TYPE incY,void *dotu)
 {
 #ifdef F77_INT
    F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;

dlib/external/cblas/cblas_cgbmv.c

@@ -10,11 +10,11 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_cgbmv(const enum CBLAS_ORDER order,
-                 const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
-                 const int KL, const int KU,
-                 const void *alpha, const void  *A, const int lda,
-                 const void  *X, const int incX, const void *beta,
-                 void  *Y, const int incY)
+                 const enum CBLAS_TRANSPOSE TransA, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
+                 const CBLAS_INT_TYPE KL, const CBLAS_INT_TYPE KU,
+                 const void *alpha, const void  *A, const CBLAS_INT_TYPE lda,
+                 const void  *X, const CBLAS_INT_TYPE incX, const void *beta,
+                 void  *Y, const CBLAS_INT_TYPE incY)
 {
    char TA;
 #ifdef F77_CHAR
@@ -34,10 +34,10 @@ void cblas_cgbmv(const enum CBLAS_ORDER order,
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   int n=0, i=0, incx=incX;
+   CBLAS_INT_TYPE n=0, i=0, incx=incX;
    const float *xx= (float *)X, *alp= (float *)alpha, *bet = (float *)beta;
    float ALPHA[2],BETA[2];
-   int tincY, tincx;
+   CBLAS_INT_TYPE tincY, tincx;
    float *x=(float *)X, *y=(float *)Y, *st=0, *tx=0;
 
    if (order == CblasColMajor)

dlib/external/cblas/cblas_cgemm.c

@@ -10,10 +10,10 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_cgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA,
-                 const enum CBLAS_TRANSPOSE TransB, const int M, const int N,
-                 const int K, const void *alpha, const void  *A,
-                 const int lda, const void  *B, const int ldb,
-                 const void *beta, void  *C, const int ldc)
+                 const enum CBLAS_TRANSPOSE TransB, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
+                 const CBLAS_INT_TYPE K, const void *alpha, const void  *A,
+                 const CBLAS_INT_TYPE lda, const void  *B, const CBLAS_INT_TYPE ldb,
+                 const void *beta, void  *C, const CBLAS_INT_TYPE ldc)
 {
    char TA, TB;   
 #ifdef F77_CHAR

dlib/external/cblas/cblas_cgemv.c

@@ -10,10 +10,10 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_cgemv(const enum CBLAS_ORDER order,
-                 const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
-                 const void *alpha, const void  *A, const int lda,
-                 const void  *X, const int incX, const void *beta,
-                 void  *Y, const int incY)
+                 const enum CBLAS_TRANSPOSE TransA, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
+                 const void *alpha, const void  *A, const CBLAS_INT_TYPE lda,
+                 const void  *X, const CBLAS_INT_TYPE incX, const void *beta,
+                 void  *Y, const CBLAS_INT_TYPE incY)
 {
    char TA;
 #ifdef F77_CHAR
@@ -31,10 +31,10 @@ void cblas_cgemv(const enum CBLAS_ORDER order,
    #define F77_incY incY
 #endif
 
-   int n=0, i=0, incx=incX;
+   CBLAS_INT_TYPE n=0, i=0, incx=incX;
    const float *xx= (const float *)X;
    float ALPHA[2],BETA[2];
-   int tincY, tincx;
+   CBLAS_INT_TYPE tincY, tincx;
    float *x=(float *)X, *y=(float *)Y, *st=0, *tx=0;
    const float *stx = x;
 

dlib/external/cblas/cblas_cgerc.c

@@ -9,9 +9,9 @@
 #include <stdlib.h>
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cgerc(const enum CBLAS_ORDER order, const int M, const int N,
-                 const void *alpha, const void *X, const int incX,
-                 const void *Y, const int incY, void *A, const int lda)
+void cblas_cgerc(const enum CBLAS_ORDER order, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
+                 const void *alpha, const void *X, const CBLAS_INT_TYPE incX,
+                 const void *Y, const CBLAS_INT_TYPE incY, void *A, const CBLAS_INT_TYPE lda)
 {
 #ifdef F77_INT
    F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;
@@ -23,7 +23,7 @@ void cblas_cgerc(const enum CBLAS_ORDER order, const int M, const int N,
    #define F77_lda lda   
 #endif
 
-   int n, i, tincy, incy=incY;
+   CBLAS_INT_TYPE n, i, tincy, incy=incY;
    float *y=(float *)Y, *yy=(float *)Y, *ty, *st;
 
 

dlib/external/cblas/cblas_cgeru.c

@@ -7,9 +7,9 @@
  */
 #include "cblas.h"
 #include "cblas_f77.h"
-void cblas_cgeru(const enum CBLAS_ORDER order, const int M, const int N,
-                 const void *alpha, const void *X, const int incX,
-                 const void *Y, const int incY, void *A, const int lda)
+void cblas_cgeru(const enum CBLAS_ORDER order, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
+                 const void *alpha, const void *X, const CBLAS_INT_TYPE incX,
+                 const void *Y, const CBLAS_INT_TYPE incY, void *A, const CBLAS_INT_TYPE lda)
 {
 #ifdef F77_INT
    F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY;

dlib/external/cblas/cblas_chbmv.c

@@ -10,10 +10,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 void cblas_chbmv(const enum CBLAS_ORDER order,
-                 const enum CBLAS_UPLO Uplo,const int N,const int K,
-                 const void *alpha, const void  *A, const int lda,
-                 const void  *X, const int incX, const void *beta,
-                 void  *Y, const int incY)
+                 const enum CBLAS_UPLO Uplo,const CBLAS_INT_TYPE N,const CBLAS_INT_TYPE K,
+                 const void *alpha, const void  *A, const CBLAS_INT_TYPE lda,
+                 const void  *X, const CBLAS_INT_TYPE incX, const void *beta,
+                 void  *Y, const CBLAS_INT_TYPE incY)
 {
    char UL;
 #ifdef F77_CHAR
@@ -30,10 +30,10 @@ void cblas_chbmv(const enum CBLAS_ORDER order,
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   int n, i=0, incx=incX;
+   CBLAS_INT_TYPE n, i=0, incx=incX;
    const float *xx= (float *)X, *alp= (float *)alpha, *bet = (float *)beta;
    float ALPHA[2],BETA[2];
-   int tincY, tincx;
+   CBLAS_INT_TYPE tincY, tincx;
    float *x=(float *)X, *y=(float *)Y, *st=0, *tx;
 
    if (order == CblasColMajor)

dlib/external/cblas/cblas_chemm.c

@@ -10,10 +10,10 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_chemm(const enum CBLAS_ORDER Order, const  enum CBLAS_SIDE Side,
-                 const enum CBLAS_UPLO Uplo, const int M, const int N,
-                 const void *alpha, const void *A, const int lda,
-                 const void *B, const int ldb, const void *beta,
-                 void *C, const int ldc)
+                 const enum CBLAS_UPLO Uplo, const CBLAS_INT_TYPE M, const CBLAS_INT_TYPE N,
+                 const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
+                 const void *B, const CBLAS_INT_TYPE ldb, const void *beta,
+                 void *C, const CBLAS_INT_TYPE ldc)
 {
    char SD, UL;   
 #ifdef F77_CHAR

dlib/external/cblas/cblas_chemv.c

@@ -10,10 +10,10 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_chemv(const enum CBLAS_ORDER order,
-                 const enum CBLAS_UPLO Uplo, const int N,
-                 const void *alpha, const void *A, const int lda,
-                 const void *X, const int incX, const void *beta,
-                 void  *Y, const int incY)
+                 const enum CBLAS_UPLO Uplo, const CBLAS_INT_TYPE N,
+                 const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
+                 const void *X, const CBLAS_INT_TYPE incX, const void *beta,
+                 void  *Y, const CBLAS_INT_TYPE incY)
 {
    char UL;
 #ifdef F77_CHAR
@@ -29,10 +29,10 @@ void cblas_chemv(const enum CBLAS_ORDER order,
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   int n=0, i=0, incx=incX;
+   CBLAS_INT_TYPE n=0, i=0, incx=incX;
    const float *xx= (float *)X, *alp= (float *)alpha, *bet = (float *)beta;
    float ALPHA[2],BETA[2];
-   int tincY, tincx;
+   CBLAS_INT_TYPE tincY, tincx;
    float *x=(float *)X, *y=(float *)Y, *st=0, *tx;
 
 

dlib/external/cblas/cblas_cher.c

@@ -10,8 +10,8 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_cher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
-                const int N, const float alpha, const void *X, const int incX
-                ,void *A, const int lda)
+                const CBLAS_INT_TYPE N, const float alpha, const void *X, const CBLAS_INT_TYPE incX
+                ,void *A, const CBLAS_INT_TYPE lda)
 {
    char UL;
 #ifdef F77_CHAR
@@ -27,7 +27,7 @@ void cblas_cher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
    #define F77_lda lda
    #define F77_incX incx
 #endif
-   int n, i, tincx, incx=incX;
+   CBLAS_INT_TYPE n, i, tincx, incx=incX;
    float *x=(float *)X, *xx=(float *)X, *tx, *st;
 
  

dlib/external/cblas/cblas_cher2.c

@@ -10,8 +10,8 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_cher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
-                 const int N, const void *alpha, const void *X, const int incX,
-                 const void *Y, const int incY, void *A, const int lda)
+                 const CBLAS_INT_TYPE N, const void *alpha, const void *X, const CBLAS_INT_TYPE incX,
+                 const void *Y, const CBLAS_INT_TYPE incY, void *A, const CBLAS_INT_TYPE lda)
 {
    char UL;
 #ifdef F77_CHAR
@@ -28,7 +28,7 @@ void cblas_cher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
    #define F77_incX incx
    #define F77_incY incy
 #endif
-   int n, i, j, tincx, tincy, incx=incX, incy=incY;
+   CBLAS_INT_TYPE n, i, j, tincx, tincy, incx=incX, incy=incY;
    float *x=(float *)X, *xx=(float *)X, *y=(float *)Y, 
          *yy=(float *)Y, *tx, *ty, *stx, *sty;
 

dlib/external/cblas/cblas_cher2k.c

@@ -10,10 +10,10 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_cher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
-                  const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
-                  const void *alpha, const void *A, const int lda,
-                  const void *B, const int ldb, const float beta,
-                  void *C, const int ldc)
+                  const enum CBLAS_TRANSPOSE Trans, const CBLAS_INT_TYPE N, const CBLAS_INT_TYPE K,
+                  const void *alpha, const void *A, const CBLAS_INT_TYPE lda,
+                  const void *B, const CBLAS_INT_TYPE ldb, const float beta,
+                  void *C, const CBLAS_INT_TYPE ldc)
 {
    char UL, TR;   
 #ifdef F77_CHAR

dlib/external/cblas/cblas_cherk.c

@@ -10,9 +10,9 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_cherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
-                 const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
-                 const float alpha, const void *A, const int lda,
-                 const float beta, void *C, const int ldc)
+                 const enum CBLAS_TRANSPOSE Trans, const CBLAS_INT_TYPE N, const CBLAS_INT_TYPE K,
+                 const float alpha, const void *A, const CBLAS_INT_TYPE lda,
+                 const float beta, void *C, const CBLAS_INT_TYPE ldc)
 {
    char UL, TR;   
 #ifdef F77_CHAR

dlib/external/cblas/cblas_chpmv.c

@@ -10,10 +10,10 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_chpmv(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  *AP,
-                 const void  *X, const int incX, const void *beta,
-                 void  *Y, const int incY)
+                 const void  *X, const CBLAS_INT_TYPE incX, const void *beta,
+                 void  *Y, const CBLAS_INT_TYPE incY)
 {
    char UL;
 #ifdef F77_CHAR
@@ -28,10 +28,10 @@ void cblas_chpmv(const enum CBLAS_ORDER order,
    #define F77_incX incx
    #define F77_incY incY
 #endif
-   int n, i=0, incx=incX;
+   CBLAS_INT_TYPE n, i=0, incx=incX;
    const float *xx= (float *)X, *alp= (float *)alpha, *bet = (float *)beta;
    float ALPHA[2],BETA[2];
-   int tincY, tincx;
+   CBLAS_INT_TYPE tincY, tincx;
    float *x=(float *)X, *y=(float *)Y, *st=0, *tx;
 
    if (order == CblasColMajor)

dlib/external/cblas/cblas_chpr.c

@@ -10,8 +10,8 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_chpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
-                const int N, const float alpha, const void *X,
-                const int incX, void *A)
+                const CBLAS_INT_TYPE N, const float alpha, const void *X,
+                const CBLAS_INT_TYPE incX, void *A)
 {
    char UL;
 #ifdef F77_CHAR
@@ -26,7 +26,7 @@ void cblas_chpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
    #define F77_N N
    #define F77_incX incx
 #endif
-   int n, i, tincx, incx=incX;
+   CBLAS_INT_TYPE n, i, tincx, incx=incX;
    float *x=(float *)X, *xx=(float *)X, *tx, *st;
 
  

dlib/external/cblas/cblas_chpr2.c

@@ -10,8 +10,8 @@
 #include "cblas.h"
 #include "cblas_f77.h"
 void cblas_chpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
-                      const int N,const void *alpha, const void *X, 
-                      const int incX,const void *Y, const int incY, void *Ap)
+                      const CBLAS_INT_TYPE N,const void *alpha, const void *X, 
+                      const CBLAS_INT_TYPE incX,const void *Y, const CBLAS_INT_TYPE incY, void *Ap)
 
 {
    char UL;
@@ -28,7 +28,7 @@ void cblas_chpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
    #define F77_incX incx
    #define F77_incY incy
 #endif
-   int n, i, j, tincx, tincy, incx=incX, incy=incY;
+   CBLAS_INT_TYPE n, i, j, tincx, tincy, incx=incX, incy=incY;
    float *x=(float *)X, *xx=(float *)X, *y=(float *)Y,
          *yy=(float *)Y, *tx, *ty, *stx, *sty;