Fixed #769. Merge branch 'martin-frbg-develop' into develop

This commit is contained in:
Zhang Xianyi 2016-02-02 13:43:51 -05:00
commit 52eba814ce
2 changed files with 11 additions and 0 deletions

View File

@ -1172,6 +1172,9 @@ int get_cpuname(void){
#endif #endif
else else
return CPUTYPE_NEHALEM; return CPUTYPE_NEHALEM;
case 13:
// Avoton
return CPUTYPE_NEHALEM;
} }
break; break;
case 5: case 5:
@ -1675,6 +1678,9 @@ int get_coretype(void){
#endif #endif
else else
return CORE_NEHALEM; return CORE_NEHALEM;
case 13:
// Avoton
return CORE_NEHALEM;
} }
break; break;
case 5: case 5:

View File

@ -261,6 +261,11 @@ 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
if (model == 13) {
openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK);
return &gotoblas_NEHALEM;
}
return NULL; return NULL;
case 5: case 5:
//Intel Broadwell //Intel Broadwell