Browse Source

Changed a number of inline calls to use __inline.

MSVC doesn't inmplement C99, so can't use the inline keyword. __inline
appears to work in MSVC and GCC.
tags/v0.2.15^2
Hank Anderson 10 years ago
parent
commit
056ba26755
5 changed files with 20 additions and 20 deletions
  1. +1
    -1
      common_x86.h
  2. +1
    -1
      driver/level3/syr2k_k.c
  3. +1
    -1
      driver/level3/syrk_k.c
  4. +1
    -1
      lapack/getrf/getrf_parallel.c
  5. +16
    -16
      symcopy.h

+ 1
- 1
common_x86.h View File

@@ -100,7 +100,7 @@ void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx);


#define WHEREAMI #define WHEREAMI


static inline int WhereAmI(void){
static __inline int WhereAmI(void){
int eax, ebx, ecx, edx; int eax, ebx, ecx, edx;
int apicid; int apicid;




+ 1
- 1
driver/level3/syr2k_k.c View File

@@ -47,7 +47,7 @@
#endif #endif
#endif #endif


static inline int syrk_beta(BLASLONG m_from, BLASLONG m_to, BLASLONG n_from, BLASLONG n_to, FLOAT *alpha, FLOAT *c, BLASLONG ldc) {
static __inline int syrk_beta(BLASLONG m_from, BLASLONG m_to, BLASLONG n_from, BLASLONG n_to, FLOAT *alpha, FLOAT *c, BLASLONG ldc) {


BLASLONG i; BLASLONG i;




+ 1
- 1
driver/level3/syrk_k.c View File

@@ -49,7 +49,7 @@
#endif #endif
#endif #endif


static inline int syrk_beta(BLASLONG m_from, BLASLONG m_to, BLASLONG n_from, BLASLONG n_to, FLOAT *alpha, FLOAT *c, BLASLONG ldc) {
static __inline int syrk_beta(BLASLONG m_from, BLASLONG m_to, BLASLONG n_from, BLASLONG n_to, FLOAT *alpha, FLOAT *c, BLASLONG ldc) {


BLASLONG i; BLASLONG i;




+ 1
- 1
lapack/getrf/getrf_parallel.c View File

@@ -67,7 +67,7 @@ double sqrt(double);
#undef GETRF_FACTOR #undef GETRF_FACTOR
#define GETRF_FACTOR 1.00 #define GETRF_FACTOR 1.00


static inline BLASLONG FORMULA1(BLASLONG M, BLASLONG N, BLASLONG IS, BLASLONG BK, BLASLONG T) {
static __inline BLASLONG FORMULA1(BLASLONG M, BLASLONG N, BLASLONG IS, BLASLONG BK, BLASLONG T) {


double m = (double)(M - IS - BK); double m = (double)(M - IS - BK);
double n = (double)(N - IS - BK); double n = (double)(N - IS - BK);


+ 16
- 16
symcopy.h View File

@@ -43,7 +43,7 @@


#if !defined(XDOUBLE) || !defined(QUAD_PRECISION) #if !defined(XDOUBLE) || !defined(QUAD_PRECISION)


static inline void SYMCOPY_L(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void SYMCOPY_L(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -141,7 +141,7 @@ static inline void SYMCOPY_L(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void SYMCOPY_U(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void SYMCOPY_U(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -232,7 +232,7 @@ static inline void SYMCOPY_U(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }




static inline void ZSYMCOPY_L(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZSYMCOPY_L(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -362,7 +362,7 @@ static inline void ZSYMCOPY_L(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void ZSYMCOPY_U(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZSYMCOPY_U(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -486,7 +486,7 @@ static inline void ZSYMCOPY_U(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void ZHEMCOPY_L(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZHEMCOPY_L(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -613,7 +613,7 @@ static inline void ZHEMCOPY_L(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void ZHEMCOPY_U(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZHEMCOPY_U(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -735,7 +735,7 @@ static inline void ZHEMCOPY_U(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }




static inline void ZHEMCOPY_M(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZHEMCOPY_M(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -862,7 +862,7 @@ static inline void ZHEMCOPY_M(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void ZHEMCOPY_V(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZHEMCOPY_V(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -984,7 +984,7 @@ static inline void ZHEMCOPY_V(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }




static inline void TRMCOPY_NL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void TRMCOPY_NL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -1082,7 +1082,7 @@ static inline void TRMCOPY_NL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void TRMCOPY_TL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void TRMCOPY_TL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -1180,7 +1180,7 @@ static inline void TRMCOPY_TL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void TRMCOPY_NU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void TRMCOPY_NU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -1270,7 +1270,7 @@ static inline void TRMCOPY_NU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void TRMCOPY_TU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void TRMCOPY_TU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -1360,7 +1360,7 @@ static inline void TRMCOPY_TU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void ZTRMCOPY_NL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZTRMCOPY_NL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -1490,7 +1490,7 @@ static inline void ZTRMCOPY_NL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void ZTRMCOPY_TL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZTRMCOPY_TL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -1620,7 +1620,7 @@ static inline void ZTRMCOPY_TL(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void ZTRMCOPY_NU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZTRMCOPY_NU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;
@@ -1744,7 +1744,7 @@ static inline void ZTRMCOPY_NU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
} }
} }


static inline void ZTRMCOPY_TU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
static __inline void ZTRMCOPY_TU(BLASLONG m, FLOAT *a, BLASLONG lda, FLOAT *b){
BLASLONG is, js; BLASLONG is, js;


FLOAT *aa1, *aa2; FLOAT *aa1, *aa2;


Loading…
Cancel
Save