OSchip
/
OpenBLAS
Not watched
1
0
Fork 0
Code
Releases 66 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

Merge pull request #1555 from WestAlgo/develop 

Change _STDC_VERSION__ to __STDC_VERSION__
tags/v0.3.0^2
Zhang Xianyi GitHub 8 years ago
parent
50acc40613 3716267124
commit
458e3af5b1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      driver/level3/level3_gemm3m_thread.c
  2. +1
    -1
      driver/level3/level3_syrk_threaded.c
  3. +1
    -1
      driver/level3/level3_thread.c
  4. +4
    -4
      driver/others/blas_server_omp.c
  5. +5
    -5
      lapack/getrf/getrf_parallel.c
  6. +1
    -1
      lapack/getrf/potrf_parallel.c

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

@@ -91,7 +91,7 @@
#endif #endif


typedef struct { typedef struct {
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Atomic _Atomic
#else #else
volatile volatile


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

@@ -67,7 +67,7 @@
#endif #endif


typedef struct { typedef struct {
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Atomic _Atomic
#else #else
volatile volatile


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

@@ -91,7 +91,7 @@
#endif #endif


typedef struct { typedef struct {
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Atomic _Atomic
#else #else
volatile volatile


+ 4
- 4
driver/others/blas_server_omp.c View File

@@ -36,7 +36,7 @@
/* or implied, of The University of Texas at Austin. */ /* or implied, of The University of Texas at Austin. */
/*********************************************************************/ /*********************************************************************/


#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
#ifndef _Atomic #ifndef _Atomic
#define _Atomic volatile #define _Atomic volatile
#endif #endif
@@ -57,7 +57,7 @@
int blas_server_avail = 0; int blas_server_avail = 0;


static void * blas_thread_buffer[MAX_PARALLEL_NUMBER][MAX_CPU_NUMBER]; static void * blas_thread_buffer[MAX_PARALLEL_NUMBER][MAX_CPU_NUMBER];
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
static atomic_bool blas_buffer_inuse[MAX_PARALLEL_NUMBER]; static atomic_bool blas_buffer_inuse[MAX_PARALLEL_NUMBER];
#else #else
static _Bool blas_buffer_inuse[MAX_PARALLEL_NUMBER]; static _Bool blas_buffer_inuse[MAX_PARALLEL_NUMBER];
@@ -322,7 +322,7 @@ int exec_blas(BLASLONG num, blas_queue_t *queue){


while(true) { while(true) {
for(i=0; i < MAX_PARALLEL_NUMBER; i++) { for(i=0; i < MAX_PARALLEL_NUMBER; i++) {
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Bool inuse = false; _Bool inuse = false;
if(atomic_compare_exchange_weak(&blas_buffer_inuse[i], &inuse, true)) { if(atomic_compare_exchange_weak(&blas_buffer_inuse[i], &inuse, true)) {
#else #else
@@ -347,7 +347,7 @@ int exec_blas(BLASLONG num, blas_queue_t *queue){
exec_threads(&queue[i], buf_index); exec_threads(&queue[i], buf_index);
} }


#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
atomic_store(&blas_buffer_inuse[buf_index], false); atomic_store(&blas_buffer_inuse[buf_index], false);
#else #else
blas_buffer_inuse[buf_index] = false; blas_buffer_inuse[buf_index] = false;


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

@@ -119,7 +119,7 @@ static void inner_basic_thread(blas_arg_t *args, BLASLONG *range_m, BLASLONG *ra
FLOAT *d = (FLOAT *)args -> b + (k + k * lda) * COMPSIZE; FLOAT *d = (FLOAT *)args -> b + (k + k * lda) * COMPSIZE;
FLOAT *sbb = sb; FLOAT *sbb = sb;


#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Atomic BLASLONG *flag = (_Atomic BLASLONG *)args -> d; _Atomic BLASLONG *flag = (_Atomic BLASLONG *)args -> d;
#else #else
volatile BLASLONG *flag = (volatile BLASLONG *)args -> d; volatile BLASLONG *flag = (volatile BLASLONG *)args -> d;
@@ -201,7 +201,7 @@ static void inner_basic_thread(blas_arg_t *args, BLASLONG *range_m, BLASLONG *ra
/* Non blocking implementation */ /* Non blocking implementation */


typedef struct { typedef struct {
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Atomic _Atomic
#else #else
volatile volatile
@@ -246,7 +246,7 @@ static int inner_advanced_thread(blas_arg_t *args, BLASLONG *range_m, BLASLONG *


blasint *ipiv = (blasint *)args -> c; blasint *ipiv = (blasint *)args -> c;
BLASLONG jw; BLASLONG jw;
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Atomic BLASLONG *flag = (_Atomic BLASLONG *)args -> d; _Atomic BLASLONG *flag = (_Atomic BLASLONG *)args -> d;
#else #else
volatile BLASLONG *flag = (volatile BLASLONG *)args -> d; volatile BLASLONG *flag = (volatile BLASLONG *)args -> d;
@@ -452,7 +452,7 @@ blasint CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa,
#ifdef _MSC_VER #ifdef _MSC_VER
BLASLONG flag[MAX_CPU_NUMBER * CACHE_LINE_SIZE]; BLASLONG flag[MAX_CPU_NUMBER * CACHE_LINE_SIZE];
#else #else
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Atomic _Atomic
#else #else
volatile volatile
@@ -728,7 +728,7 @@ blasint CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa,
BLASLONG range[MAX_CPU_NUMBER + 1]; BLASLONG range[MAX_CPU_NUMBER + 1];


BLASLONG width, nn, num_cpu; BLASLONG width, nn, num_cpu;
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Atomic _Atomic
#else #else
volatile volatile


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

@@ -101,7 +101,7 @@ static FLOAT dm1 = -1.;
#endif #endif


typedef struct { typedef struct {
#if _STDC_VERSION__ >= 201112L
#if __STDC_VERSION__ >= 201112L
_Atomic _Atomic
#else #else
volatile volatile


Write Preview
Loading…
Cancel
Save