From 4ad8898ab82d16ce0dadafed807c52573417a4f1 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 24 Jul 2020 11:32:19 +0200 Subject: [PATCH 1/2] Carry patch for xianyi/OpenBLAS/pull/2729 Also, turn gfortran-diff into proper patch & put patches into folder. Remove now-unnecessary patch to revert xianyi/OpenBLAS/pull/2516. --- ...ction-for-ctng-based-cross-compilers.patch | 16 ------- recipe/meta.yaml | 7 +-- ...ection-for-ctng-based-cross-compiler.patch | 28 ++++++++++++ ...E-settings-for-x86_64-again-to-fix-p.patch | 32 ++++++++++++++ recipe/revert-gh2516.patch | 44 ------------------- 5 files changed, 64 insertions(+), 63 deletions(-) delete mode 100644 recipe/0002-Fix-gfortran-detection-for-ctng-based-cross-compilers.patch create mode 100644 recipe/patches/0001-Fix-gfortran-detection-for-ctng-based-cross-compiler.patch create mode 100644 recipe/patches/0002-Unify-BUFFER_SIZE-settings-for-x86_64-again-to-fix-p.patch delete mode 100644 recipe/revert-gh2516.patch diff --git a/recipe/0002-Fix-gfortran-detection-for-ctng-based-cross-compilers.patch b/recipe/0002-Fix-gfortran-detection-for-ctng-based-cross-compilers.patch deleted file mode 100644 index ccc0cb6..0000000 --- a/recipe/0002-Fix-gfortran-detection-for-ctng-based-cross-compilers.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/f_check b/f_check -index fac8fc70..e4c02158 100644 ---- a/f_check -+++ b/f_check -@@ -71,8 +71,9 @@ if ($compiler eq "") { - - if ($data =~ /GNU/) { - -- $data =~ /(\d+)\.(\d+).(\d+)/; -- $major = $1; -+ $data2 = $& if $data=~/GCC.*\n/m; -+ $data2 =~ /(\d+)\.(\d+).(\d+).$/; -+ $major = $1; - $minor = $2; - - if ($major >= 4) { diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 756e1bd..5166440 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "0.3.10" %} -{% set build_number = "3" %} +{% set build_number = "4" %} package: name: openblas @@ -9,8 +9,9 @@ source: url: https://github.com/xianyi/OpenBLAS/archive/v{{ version }}.tar.gz sha256: 0484d275f87e9b8641ff2eecaa9df2830cbe276ac79ad80494822721de6e1693 patches: - - 0002-Fix-gfortran-detection-for-ctng-based-cross-compilers.patch # [c_compiler == 'gcc'] - - revert-gh2516.patch + - patches/0001-Fix-gfortran-detection-for-ctng-based-cross-compiler.patch # [c_compiler == 'gcc'] + # from xianyi/OpenBLAS/pull/2729, can be dropped for 0.3.11 + - patches/0002-Unify-BUFFER_SIZE-settings-for-x86_64-again-to-fix-p.patch build: number: {{ build_number }} diff --git a/recipe/patches/0001-Fix-gfortran-detection-for-ctng-based-cross-compiler.patch b/recipe/patches/0001-Fix-gfortran-detection-for-ctng-based-cross-compiler.patch new file mode 100644 index 0000000..3012e26 --- /dev/null +++ b/recipe/patches/0001-Fix-gfortran-detection-for-ctng-based-cross-compiler.patch @@ -0,0 +1,28 @@ +From f8a45d24b2843d7721b5bffa01f469d2450d1507 Mon Sep 17 00:00:00 2001 +From: Isuru Fernando +Date: Fri, 5 Oct 2018 21:23:40 -0500 +Subject: [PATCH 1/2] Fix gfortran detection for ctng-based cross-compilers + +--- + f_check | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/f_check b/f_check +index 17d86322..7ffa821f 100644 +--- a/f_check ++++ b/f_check +@@ -71,8 +71,9 @@ if ($compiler eq "") { + + if ($data =~ /GNU/) { + +- $data =~ /(\d+)\.(\d+).(\d+)/; +- $major = $1; ++ $data2 = $& if $data=~/GCC.*\n/m; ++ $data2 =~ /(\d+)\.(\d+).(\d+).$/; ++ $major = $1; + $minor = $2; + + if ($major >= 4) { +-- +2.26.2.windows.1 + diff --git a/recipe/patches/0002-Unify-BUFFER_SIZE-settings-for-x86_64-again-to-fix-p.patch b/recipe/patches/0002-Unify-BUFFER_SIZE-settings-for-x86_64-again-to-fix-p.patch new file mode 100644 index 0000000..6fa422c --- /dev/null +++ b/recipe/patches/0002-Unify-BUFFER_SIZE-settings-for-x86_64-again-to-fix-p.patch @@ -0,0 +1,32 @@ +From 8223be8a3f971bb357601e0129871e1891bba3b2 Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Wed, 22 Jul 2020 17:30:55 +0000 +Subject: [PATCH 2/2] Unify BUFFER_SIZE settings for x86_64 again to fix + potentially fatal mismatch in DYNAMIC_ARCH builds + +--- + common_x86_64.h | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/common_x86_64.h b/common_x86_64.h +index 15d0c30a..bee7e8cd 100644 +--- a/common_x86_64.h ++++ b/common_x86_64.h +@@ -228,14 +228,8 @@ static __inline unsigned int blas_quickdivide(unsigned int x, unsigned int y){ + #define HUGE_PAGESIZE ( 2 << 20) + + #ifndef BUFFERSIZE +-#if defined(SKYLAKEX) +-#define BUFFER_SIZE (32 << 21) +-#elif defined(HASWELL) || defined(ZEN) + #define BUFFER_SIZE (32 << 22) + #else +-#define BUFFER_SIZE (32 << 20) +-#endif +-#else + #define BUFFER_SIZE (32 << BUFFERSIZE) + #endif + +-- +2.26.2.windows.1 + diff --git a/recipe/revert-gh2516.patch b/recipe/revert-gh2516.patch deleted file mode 100644 index cc0533a..0000000 --- a/recipe/revert-gh2516.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit c91ef54b18f90b695208887b12ab42c9a5060ce9 -Author: Isuru Fernando -Date: Sun Jul 19 17:29:24 2020 -0500 - - Revert xianyi/OpenBLAS#2516 - -diff --git a/kernel/x86_64/KERNEL.HASWELL b/kernel/x86_64/KERNEL.HASWELL -index ef8b36a5..f6ca5c2d 100644 ---- a/kernel/x86_64/KERNEL.HASWELL -+++ b/kernel/x86_64/KERNEL.HASWELL -@@ -77,10 +77,10 @@ ZGEMMITCOPYOBJ = zgemm_itcopy$(TSUFFIX).$(SUFFIX) - ZGEMMONCOPYOBJ = zgemm_oncopy$(TSUFFIX).$(SUFFIX) - ZGEMMOTCOPYOBJ = zgemm_otcopy$(TSUFFIX).$(SUFFIX) - --STRSMKERNEL_LN = strsm_kernel_8x4_haswell_LN.c --STRSMKERNEL_LT = strsm_kernel_8x4_haswell_LT.c --STRSMKERNEL_RN = strsm_kernel_8x4_haswell_RN.c --STRSMKERNEL_RT = strsm_kernel_8x4_haswell_RT.c -+STRSMKERNEL_LN = ../generic/trsm_kernel_LN.c -+STRSMKERNEL_LT = ../generic/trsm_kernel_LT.c -+STRSMKERNEL_RN = ../generic/trsm_kernel_RN.c -+STRSMKERNEL_RT = ../generic/trsm_kernel_RT.c - - DTRSMKERNEL_LN = ../generic/trsm_kernel_LN.c - DTRSMKERNEL_LT = ../generic/trsm_kernel_LT.c -diff --git a/kernel/x86_64/KERNEL.ZEN b/kernel/x86_64/KERNEL.ZEN -index 7bb308fe..1cd02db7 100644 ---- a/kernel/x86_64/KERNEL.ZEN -+++ b/kernel/x86_64/KERNEL.ZEN -@@ -74,10 +74,10 @@ ZGEMMITCOPYOBJ = zgemm_itcopy$(TSUFFIX).$(SUFFIX) - ZGEMMONCOPYOBJ = zgemm_oncopy$(TSUFFIX).$(SUFFIX) - ZGEMMOTCOPYOBJ = zgemm_otcopy$(TSUFFIX).$(SUFFIX) - --STRSMKERNEL_LN = strsm_kernel_8x4_haswell_LN.c --STRSMKERNEL_LT = strsm_kernel_8x4_haswell_LT.c --STRSMKERNEL_RN = strsm_kernel_8x4_haswell_RN.c --STRSMKERNEL_RT = strsm_kernel_8x4_haswell_RT.c -+STRSMKERNEL_LN = ../generic/trsm_kernel_LN.c -+STRSMKERNEL_LT = ../generic/trsm_kernel_LT.c -+STRSMKERNEL_RN = ../generic/trsm_kernel_RN.c -+STRSMKERNEL_RT = ../generic/trsm_kernel_RT.c - - DTRSMKERNEL_LN = ../generic/trsm_kernel_LN.c - DTRSMKERNEL_LT = ../generic/trsm_kernel_LT.c From bc72f9cda429b54ccf93db0f5f07002791aee8e6 Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Fri, 24 Jul 2020 09:39:00 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.4, and conda-forge-pinning 2020.07.23.07.37.39 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 55f1360..59ccb35 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Package license: BSD-3-Clause Feedstock license: BSD-3-Clause -Summary: An optimized BLAS library (ILP64 interface) based on GotoBLAS2 1.13 BSD version +Summary: An optimized BLAS library based on GotoBLAS2 1.13 BSD version