From 9b69d8a8e5c6d3d4ccf95413cbf79bc4ad58bb87 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 14 Jul 2016 11:41:57 +0200 Subject: [PATCH 1/4] Update zgetrf2.f Trivial typo correction (ZERBLA => XERBLA) to fix #910 --- lapack-netlib/SRC/zgetrf2.f | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lapack-netlib/SRC/zgetrf2.f b/lapack-netlib/SRC/zgetrf2.f index 290d4847e..7d28b5812 100644 --- a/lapack-netlib/SRC/zgetrf2.f +++ b/lapack-netlib/SRC/zgetrf2.f @@ -144,7 +144,7 @@ EXTERNAL DLAMCH, IZAMAX * .. * .. External Subroutines .. - EXTERNAL ZGEMM, ZSCAL, ZLASWP, ZTRSM, ZERBLA + EXTERNAL ZGEMM, ZSCAL, ZLASWP, ZTRSM, XERBLA * .. * .. Intrinsic Functions .. INTRINSIC MAX, MIN From 7de829f713dcf590c2877ca5e9674ff5a3060852 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 14 Jul 2016 12:22:55 +0200 Subject: [PATCH 2/4] Update dynamic.c Add Braswell (extended model 4, model 12) N3150 as Nehalem --- driver/others/dynamic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/driver/others/dynamic.c b/driver/others/dynamic.c index 9e8cce438..18f85c316 100644 --- a/driver/others/dynamic.c +++ b/driver/others/dynamic.c @@ -261,8 +261,8 @@ static gotoblas_t *get_coretype(void){ return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels. } } - //Intel Avoton - if (model == 13) { + //Intel Braswell / Avoton + if (model == 12 || model == 13) { openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK); return &gotoblas_NEHALEM; } From 97bd1e42c87ed72bcc2d7d124a679b8fcd67642d Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 14 Jul 2016 12:25:17 +0200 Subject: [PATCH 3/4] Update cpuid_x86.c --- cpuid_x86.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpuid_x86.c b/cpuid_x86.c index e5938803d..4ce6a96f0 100644 --- a/cpuid_x86.c +++ b/cpuid_x86.c @@ -1678,6 +1678,8 @@ int get_coretype(void){ #endif else return CORE_NEHALEM; + case 12: + // Braswell case 13: // Avoton return CORE_NEHALEM; From 154729908e8450d2e7d0523354b6c34ebf4b12f2 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 14 Jul 2016 17:29:34 +0200 Subject: [PATCH 4/4] Update cpuid_x86.c --- cpuid_x86.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpuid_x86.c b/cpuid_x86.c index 4ce6a96f0..bbd377f67 100644 --- a/cpuid_x86.c +++ b/cpuid_x86.c @@ -1172,6 +1172,8 @@ int get_cpuname(void){ #endif else return CPUTYPE_NEHALEM; + case 12: + // Braswell case 13: // Avoton return CPUTYPE_NEHALEM;