Skip to content

Commit a6870da

Browse files
langoulangou
authored
Merge pull request #460 from epsilon-0/master
enable building the cblas64 library
2 parents 4fbb4f8 + 4177968 commit a6870da

File tree

143 files changed

+740
-743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+740
-743
lines changed

‎CBLAS/include/cblas.h‎

Lines changed: 341 additions & 341 deletions
Large diffs are not rendered by default.

‎CBLAS/include/cblas_f77.h‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
#ifdef WeirdNEC
2121
#define F77_INT long
22+
#else
23+
#define F77_INT int
2224
#endif
2325

2426
#ifdef F77_CHAR
@@ -27,13 +29,8 @@
2729
#define FCHAR char *
2830
#endif
2931

30-
#ifdef F77_INT
31-
#define FINT const F77_INT *
32-
#define FINT2 F77_INT *
33-
#else
34-
#define FINT const int *
35-
#define FINT2 int *
36-
#endif
32+
#define FINT const F77_INT *
33+
#define FINT2 F77_INT *
3734

3835
/*
3936
* Level 1 BLAS

‎CBLAS/src/cblas_caxpy.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
*/
99
#include "cblas.h"
1010
#include "cblas_f77.h"
11-
void cblas_caxpy( const int N, const void *alpha, const void *X,
12-
const int incX, void *Y, const int incY)
11+
void cblas_caxpy( const CBLAS_INDEX N, const void *alpha, const void *X,
12+
const CBLAS_INDEX incX, void *Y, const CBLAS_INDEX incY)
1313
{
1414
#ifdef F77_INT
1515
F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;

‎CBLAS/src/cblas_ccopy.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
*/
99
#include "cblas.h"
1010
#include "cblas_f77.h"
11-
void cblas_ccopy( const int N, const void *X,
12-
const int incX, void *Y, const int incY)
11+
void cblas_ccopy( const CBLAS_INDEX N, const void *X,
12+
const CBLAS_INDEX incX, void *Y, const CBLAS_INDEX incY)
1313
{
1414
#ifdef F77_INT
1515
F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;

‎CBLAS/src/cblas_cdotc_sub.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
*/
1010
#include "cblas.h"
1111
#include "cblas_f77.h"
12-
void cblas_cdotc_sub( const int N, const void *X, const int incX,
13-
const void *Y, const int incY, void *dotc)
12+
void cblas_cdotc_sub( const CBLAS_INDEX N, const void *X, const CBLAS_INDEX incX,
13+
const void *Y, const CBLAS_INDEX incY, void *dotc)
1414
{
1515
#ifdef F77_INT
1616
F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;

‎CBLAS/src/cblas_cdotu_sub.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
*/
1010
#include "cblas.h"
1111
#include "cblas_f77.h"
12-
void cblas_cdotu_sub( const int N, const void *X, const int incX,
13-
const void *Y, const int incY, void *dotu)
12+
void cblas_cdotu_sub( const CBLAS_INDEX N, const void *X, const CBLAS_INDEX incX,
13+
const void *Y, const CBLAS_INDEX incY, void *dotu)
1414
{
1515
#ifdef F77_INT
1616
F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;

‎CBLAS/src/cblas_cgbmv.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
#include "cblas.h"
1111
#include "cblas_f77.h"
1212
void cblas_cgbmv(const CBLAS_LAYOUT layout,
13-
const CBLAS_TRANSPOSE TransA, const int M, const int N,
14-
const int KL, const int KU,
15-
const void *alpha, const void *A, const int lda,
16-
const void *X, const int incX, const void *beta,
17-
void *Y, const int incY)
13+
const CBLAS_TRANSPOSE TransA, const CBLAS_INDEX M, const CBLAS_INDEX N,
14+
const CBLAS_INDEX KL, const CBLAS_INDEX KU,
15+
const void *alpha, const void *A, const CBLAS_INDEX lda,
16+
const void *X, const CBLAS_INDEX incX, const void *beta,
17+
void *Y, const CBLAS_INDEX incY)
1818
{
1919
char TA;
2020
#ifdef F77_CHAR
@@ -34,10 +34,10 @@ void cblas_cgbmv(const CBLAS_LAYOUT layout,
3434
#define F77_incX incx
3535
#define F77_incY incY
3636
#endif
37-
int n=0, i=0, incx=incX;
37+
CBLAS_INDEX n=0, i=0, incx=incX;
3838
const float *xx= (float *)X, *alp= (float *)alpha, *bet = (float *)beta;
3939
float ALPHA[2],BETA[2];
40-
int tincY, tincx;
40+
CBLAS_INDEX tincY, tincx;
4141
float *x=(float *)X, *y=(float *)Y, *st=0, *tx=0;
4242
extern int CBLAS_CallFromC;
4343
extern int RowMajorStrg;

‎CBLAS/src/cblas_cgemm.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#include "cblas.h"
1111
#include "cblas_f77.h"
1212
void cblas_cgemm(const CBLAS_LAYOUT layout, const CBLAS_TRANSPOSE TransA,
13-
const CBLAS_TRANSPOSE TransB, const int M, const int N,
14-
const int K, const void *alpha, const void *A,
15-
const int lda, const void *B, const int ldb,
16-
const void *beta, void *C, const int ldc)
13+
const CBLAS_TRANSPOSE TransB, const CBLAS_INDEX M, const CBLAS_INDEX N,
14+
const CBLAS_INDEX K, const void *alpha, const void *A,
15+
const CBLAS_INDEX lda, const void *B, const CBLAS_INDEX ldb,
16+
const void *beta, void *C, const CBLAS_INDEX ldc)
1717
{
1818
char TA, TB;
1919
#ifdef F77_CHAR

‎CBLAS/src/cblas_cgemv.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#include "cblas.h"
1111
#include "cblas_f77.h"
1212
void cblas_cgemv(const CBLAS_LAYOUT layout,
13-
const CBLAS_TRANSPOSE TransA, const int M, const int N,
14-
const void *alpha, const void *A, const int lda,
15-
const void *X, const int incX, const void *beta,
16-
void *Y, const int incY)
13+
const CBLAS_TRANSPOSE TransA, const CBLAS_INDEX M, const CBLAS_INDEX N,
14+
const void *alpha, const void *A, const CBLAS_INDEX lda,
15+
const void *X, const CBLAS_INDEX incX, const void *beta,
16+
void *Y, const CBLAS_INDEX incY)
1717
{
1818
char TA;
1919
#ifdef F77_CHAR
@@ -31,10 +31,10 @@ void cblas_cgemv(const CBLAS_LAYOUT layout,
3131
#define F77_incY incY
3232
#endif
3333

34-
int n=0, i=0, incx=incX;
34+
CBLAS_INDEX n=0, i=0, incx=incX;
3535
const float *xx= (const float *)X;
3636
float ALPHA[2],BETA[2];
37-
int tincY, tincx;
37+
CBLAS_INDEX tincY, tincx;
3838
float *x=(float *)X, *y=(float *)Y, *st=0, *tx=0;
3939
const float *stx = x;
4040
extern int CBLAS_CallFromC;

‎CBLAS/src/cblas_cgerc.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#include <stdlib.h>
1010
#include "cblas.h"
1111
#include "cblas_f77.h"
12-
void cblas_cgerc(const CBLAS_LAYOUT layout, const int M, const int N,
13-
const void *alpha, const void *X, const int incX,
14-
const void *Y, const int incY, void *A, const int lda)
12+
void cblas_cgerc(const CBLAS_LAYOUT layout, const CBLAS_INDEX M, const CBLAS_INDEX N,
13+
const void *alpha, const void *X, const CBLAS_INDEX incX,
14+
const void *Y, const CBLAS_INDEX incY, void *A, const CBLAS_INDEX lda)
1515
{
1616
#ifdef F77_INT
1717
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 CBLAS_LAYOUT layout, const int M, const int N,
2323
#define F77_lda lda
2424
#endif
2525

26-
int n, i, tincy, incy=incY;
26+
CBLAS_INDEX n, i, tincy, incy=incY;
2727
float *y=(float *)Y, *yy=(float *)Y, *ty, *st;
2828

2929
extern int CBLAS_CallFromC;

0 commit comments

Comments
 (0)