Mercurial > mxe-octave

changeset 6095:15776773d197

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openblas: update to v0.3.20 * src/openblas.mk: update to v0.3.20 * src/openblas-1-skylakex.patch: removed * dist-files.mk: removed ref to patch file
author John Donoghue <john.donoghue@ieee.org>
date Thu, 24 Feb 2022 09:23:25 -0500
parents 1bf47a1e03c1
children b1e81eceee1d
files dist-files.mk src/openblas-1-skylakex.patch src/openblas.mk
diffstat 3 files changed, 2 insertions(+), 123 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed Feb 23 15:37:20 2022 -0500
+++ b/dist-files.mk	Thu Feb 24 09:23:25 2022 -0500
@@ -562,7 +562,6 @@
   openal-1-fixes.patch \
   openal-test.c \
   openal.mk \
-  openblas-1-skylakex.patch \
   openblas.mk \
   opencore-amr.mk \
   opencsg-1-fixes.patch \
--- a/src/openblas-1-skylakex.patch	Wed Feb 23 15:37:20 2022 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-From 15d4b379138b9a5b84a2fbc2d37cb47b33efdeec Mon Sep 17 00:00:00 2001
-From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
-Date: Sat, 8 Jan 2022 23:48:13 +0100
-Subject: [PATCH 1/3] SkylakeX: match parameters to dgemm kernels for
- dyn/non-dyn
-
----
- param.h | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/param.h b/param.h
-index 2dffaae3c..4155131f0 100644
---- a/param.h
-+++ b/param.h
-@@ -1669,10 +1669,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #else
- 
- #define SGEMM_DEFAULT_UNROLL_M 16
--#ifndef DYNAMIC_ARCH
--#define DGEMM_DEFAULT_UNROLL_M 16
--#else
-+#ifdef DYNAMIC_ARCH
- #define DGEMM_DEFAULT_UNROLL_M 4
-+#else
-+#define DGEMM_DEFAULT_UNROLL_M 16
- #endif
- #define QGEMM_DEFAULT_UNROLL_M 2
- #define CGEMM_DEFAULT_UNROLL_M 8
-@@ -1680,10 +1680,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #define XGEMM_DEFAULT_UNROLL_M 1
- 
- #define SGEMM_DEFAULT_UNROLL_N 4
--#ifndef DYNAMIC_ARCH
--#define DGEMM_DEFAULT_UNROLL_N 2
--#else
-+#ifdef DYNAMIC_ARCH
- #define DGEMM_DEFAULT_UNROLL_N 8
-+#else
-+#define DGEMM_DEFAULT_UNROLL_N 2
- #endif
- #define QGEMM_DEFAULT_UNROLL_N 2
- #define CGEMM_DEFAULT_UNROLL_N 2
-@@ -1718,17 +1718,29 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #else
- 
- #define SGEMM_DEFAULT_P 448
-+#ifndef DYNAMIC_ARCH
- #define DGEMM_DEFAULT_P 192
-+#else
-+#define DGEMM_DEFAULT_P 384
-+#endif
- #define CGEMM_DEFAULT_P 384
- #define ZGEMM_DEFAULT_P 256
- 
- #define SGEMM_DEFAULT_Q 448
-+#ifndef DYNAMIC_ARCH
- #define DGEMM_DEFAULT_Q 384
-+#else
-+#define DGEMM_DEFAULT_Q 168
-+#endif
- #define CGEMM_DEFAULT_Q 192
- #define ZGEMM_DEFAULT_Q 128
- 
- #define SGEMM_DEFAULT_R sgemm_r
-+#ifndef DYNAMIC_ARCH
- #define DGEMM_DEFAULT_R 8640
-+#else
-+#define DGEMM_DEFAULT_R 13824
-+#endif
- #define CGEMM_DEFAULT_R cgemm_r
- #define ZGEMM_DEFAULT_R zgemm_r
- 
-
-From f1ac59f20057cefe4dd45122954e2403f1330835 Mon Sep 17 00:00:00 2001
-From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
-Date: Sat, 8 Jan 2022 23:48:58 +0100
-Subject: [PATCH 2/3] Forward DYNAMIC_ARCH option to Makefile.prebuild
-
----
- Makefile.system | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.system b/Makefile.system
-index 97fdc3f91..7909f677a 100644
---- a/Makefile.system
-+++ b/Makefile.system
-@@ -277,7 +277,7 @@ HAVE_GAS := $(shell $(AS) -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null ; echo
- GETARCH_FLAGS += -DHAVE_GAS=$(HAVE_GAS)
- 
- # Generating Makefile.conf and config.h
--DUMMY := $(shell $(MAKE) -C $(TOPDIR) -f Makefile.prebuild CC="$(CC)" FC="$(FC)" HOSTCC="$(HOSTCC)" HOST_CFLAGS="$(GETARCH_FLAGS)" CFLAGS="$(CFLAGS)" BINARY=$(BINARY) USE_OPENMP=$(USE_OPENMP) TARGET_CORE=$(TARGET_CORE) ONLY_CBLAS=$(ONLY_CBLAS) TARGET=$(TARGET) all)
-+DUMMY := $(shell $(MAKE) -C $(TOPDIR) -f Makefile.prebuild CC="$(CC)" FC="$(FC)" HOSTCC="$(HOSTCC)" HOST_CFLAGS="$(GETARCH_FLAGS)" CFLAGS="$(CFLAGS)" BINARY=$(BINARY) USE_OPENMP=$(USE_OPENMP) DYNAMIC_ARCH=$(DYNAMIC_ARCH) TARGET_CORE=$(TARGET_CORE) ONLY_CBLAS=$(ONLY_CBLAS) TARGET=$(TARGET) all)
- 
- ifndef TARGET_CORE
- include $(TOPDIR)/Makefile.conf
-
-From 2573ccfb2e02abec3f537479d65b58c4d6e746f3 Mon Sep 17 00:00:00 2001
-From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
-Date: Sat, 8 Jan 2022 23:50:34 +0100
-Subject: [PATCH 3/3] make DYNAMIC_ARCH option available to getarch_2nd/param.h
-
----
- Makefile.prebuild | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Makefile.prebuild b/Makefile.prebuild
-index d6395da7b..399db956f 100644
---- a/Makefile.prebuild
-+++ b/Makefile.prebuild
-@@ -3,6 +3,10 @@
- export BINARY
- export USE_OPENMP
- 
-+ifdef DYNAMIC_ARCH
-+override HOST_CFLAGS += -DDYNAMIC_ARCH
-+endif
-+
- ifdef TARGET_CORE
- TARGET_MAKE = Makefile_kernel.conf
- TARGET_CONF = config_kernel.h
--- a/src/openblas.mk	Wed Feb 23 15:37:20 2022 -0500
+++ b/src/openblas.mk	Thu Feb 24 09:23:25 2022 -0500
@@ -3,8 +3,8 @@
 
 PKG             := openblas
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.3.19
-$(PKG)_CHECKSUM := 0b0b2d1b56ea338ae07d11ab2780c108c188bebf
+$(PKG)_VERSION  := 0.3.20
+$(PKG)_CHECKSUM := 45ec54b75f53f5b704250e60bd8e82a49b430619
 $(PKG)_SUBDIR   := OpenBLAS-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz