floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #925 from martin-frbg/develop 

Update zgetrf2.f, cpuid_x86.c, dynamic.c
This commit is contained in:
Zhang Xianyi 2016-07-14 15:48:58 -04:00 committed by GitHub
parent 8a592ee386 154729908e
commit 5dfa0712c3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpuid_x86.c
View File

@ -1172,6 +1172,8 @@ int get_cpuname(void){
#endif #endif
else else
return CPUTYPE_NEHALEM; return CPUTYPE_NEHALEM;
case 12:
// Braswell
case 13: case 13:
// Avoton // Avoton
return CPUTYPE_NEHALEM; return CPUTYPE_NEHALEM;
@ -1678,6 +1680,8 @@ int get_coretype(void){
#endif #endif
else else
return CORE_NEHALEM; return CORE_NEHALEM;
case 12:
// Braswell
case 13: case 13:
// Avoton // Avoton
return CORE_NEHALEM; return CORE_NEHALEM;

4
driver/others/dynamic.c
View File

@ -261,8 +261,8 @@ static gotoblas_t *get_coretype(void){
return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels. return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
} }
} }
//Intel Avoton //Intel Braswell / Avoton
if (model == 13) { if (model == 12 || model == 13) {
openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK); openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK);
return &gotoblas_NEHALEM; return &gotoblas_NEHALEM;
} }

2
lapack-netlib/SRC/zgetrf2.f
View File

@ -144,7 +144,7 @@
EXTERNAL DLAMCH, IZAMAX EXTERNAL DLAMCH, IZAMAX
* .. * ..
* .. External Subroutines .. * .. External Subroutines ..
EXTERNAL ZGEMM, ZSCAL, ZLASWP, ZTRSM, ZERBLA EXTERNAL ZGEMM, ZSCAL, ZLASWP, ZTRSM, XERBLA
* .. * ..
* .. Intrinsic Functions .. * .. Intrinsic Functions ..
INTRINSIC MAX, MIN INTRINSIC MAX, MIN