Attachment 208701 Details for Bug 231371 – patch

[patch] patch

openblas.diff (text/plain), 14.85 KB, created by Eijiro Shibusawa on 2019-10-30 14:34:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eijiro Shibusawa

Created: 2019-10-30 14:34:15 UTC

Size: 14.85 KB

patch

obsolete

>diff -uNr /usr/ports/math/openblas/./Makefile /tmp/openblas/./Makefile
>--- /usr/ports/math/openblas/./Makefile	2019-10-29 21:30:15.000000000 +0900
>+++ /tmp/openblas/./Makefile	2019-10-30 23:28:31.729433000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/math/openblas/Makefile 515977 2019-10-29 12:30:15Z arrowd $
> 
> PORTNAME=	openblas
>-PORTVERSION=	0.2.20
>-PORTREVISION=	11
>+PORTVERSION=	0.3.7
> DISTVERSIONPREFIX=	v
> PORTEPOCH=	1
> CATEGORIES=	math
>@@ -127,13 +126,7 @@
> 		${WRKSRC}/interface/Makefile \
> 		${WRKSRC}/kernel/Makefile \
> 		${WRKSRC}/kernel/Makefile.L3 \
>-		${WRKSRC}/lapack/laswp/Makefile \
>-		${WRKSRC}/lapack-netlib/SRC/Makefile \
>-		${WRKSRC}/lapack-netlib/SRC/VARIANTS/Makefile \
>-		${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile \
>-		${WRKSRC}/lapack-netlib/LAPACKE/src/Makefile \
>-		${WRKSRC}/lapack-netlib/LAPACKE/utils/Makefile \
>-		${WRKSRC}/reference/Makefile
>+		${WRKSRC}/lapack/laswp/Makefile
> 	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
> 	-e 's+%%LDFLAGS%%+${LDFLAGS}+' \
> 	-e 's+%%LOCALBASE%%+${LOCALBASE}+' \
>@@ -143,10 +136,6 @@
> 	-e 's+$${CROSS_SUFFIX}+${LOCALBASE}/bin/+' \
> 	-e '/Clang.*OpenMP/g' \
> 		${WRKSRC}/Makefile.system
>-	${REINPLACE_CMD} \
>-	-e 's/defined(linux)/(defined(linux) || defined(__FreeBSD__))/g' \
>-	-e 's/ifdef linux/if defined(linux) || defined(__FreeBSD__)/g' \
>-		${WRKSRC}/kernel/power/*.S
> 
> post-patch-OPENMP-on:
> 	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
>@@ -201,7 +190,7 @@
> 		${WRKSRC}/interface/*.c
> 	${MKDIR} ${STAGEDIR}${PREFIX}/include/openblas
> 	${INSTALL_DATA} ${WRKSRC}/openblas_*.h ${STAGEDIR}${PREFIX}/include/openblas
>-	${INSTALL_DATA} ${WRKSRC}/cblas.h ${WRKSRC}/config_kernel.h ${WRKSRC}/config_last.h ${WRKSRC}/l1param.h ${WRKSRC}/l2param.h ${WRKSRC}/symcopy.h \
>+	${INSTALL_DATA} ${WRKSRC}/cblas.h ${WRKSRC}/l1param.h ${WRKSRC}/l2param.h ${WRKSRC}/symcopy.h \
> 		${STAGEDIR}${PREFIX}/include/openblas
> 
> .include <bsd.port.mk>
>diff -uNr /usr/ports/math/openblas/./distinfo /tmp/openblas/./distinfo
>--- /usr/ports/math/openblas/./distinfo	2017-08-26 04:58:51.000000000 +0900
>+++ /tmp/openblas/./distinfo	2019-10-30 22:06:11.204756000 +0900
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1503123719
>+TIMESTAMP = 1572440771
> SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
> SIZE (openblas/large.tgz) = 2595
> SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
> SIZE (openblas/timing.tgz) = 1059485
>-SHA256 (openblas/xianyi-OpenBLAS-v0.2.20_GH0.tar.gz) = 5ef38b15d9c652985774869efd548b8e3e972e1e99475c673b25537ed7bcf394
>-SIZE (openblas/xianyi-OpenBLAS-v0.2.20_GH0.tar.gz) = 11637301
>+SHA256 (openblas/xianyi-OpenBLAS-v0.3.7_GH0.tar.gz) = bde136122cef3dd6efe2de1c6f65c10955bbb0cc01a520c2342f5287c28f9379
>+SIZE (openblas/xianyi-OpenBLAS-v0.3.7_GH0.tar.gz) = 11986592
>diff -uNr /usr/ports/math/openblas/./files/patch-Makefile /tmp/openblas/./files/patch-Makefile
>--- /usr/ports/math/openblas/./files/patch-Makefile	2016-02-19 01:35:48.000000000 +0900
>+++ /tmp/openblas/./files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- Makefile.orig	2015-10-27 20:44:50 UTC
>-+++ Makefile
>-@@ -238,7 +238,7 @@ ifndef NOFORTRAN
>- 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
>- 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
>- 	-@echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
>--	-@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
>-+	-@echo "ARCH_       = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
>- 	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
>- 	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
>- 	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
>diff -uNr /usr/ports/math/openblas/./files/patch-Makefile.rule /tmp/openblas/./files/patch-Makefile.rule
>--- /usr/ports/math/openblas/./files/patch-Makefile.rule	2016-02-19 01:35:48.000000000 +0900
>+++ /tmp/openblas/./files/patch-Makefile.rule	2019-10-30 21:37:55.970024000 +0900
>@@ -1,6 +1,6 @@
>---- Makefile.rule.orig	2015-10-27 20:44:50 UTC
>+--- Makefile.rule.orig	2019-04-29 17:22:19 UTC
> +++ Makefile.rule
>-@@ -19,10 +19,10 @@ VERSION = 0.2.15
>+@@ -24,10 +24,10 @@ VERSION = 0.3.6
>  
>  # C compiler including binary type(32bit / 64bit). Default is gcc.
>  # Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
>diff -uNr /usr/ports/math/openblas/./files/patch-Makefile.system /tmp/openblas/./files/patch-Makefile.system
>--- /usr/ports/math/openblas/./files/patch-Makefile.system	2016-04-05 05:46:22.000000000 +0900
>+++ /tmp/openblas/./files/patch-Makefile.system	2019-10-30 21:37:55.968507000 +0900
>@@ -1,32 +1,33 @@
>---- Makefile.system.orig	2015-10-27 20:44:50 UTC
>-+++ Makefile.system
>-@@ -218,6 +218,7 @@ MD5SUM = md5 -r
>+--- Makefile.system.orig	2019-04-30 02:22:19.000000000 +0900
>++++ Makefile.system	2019-10-06 23:39:21.483212000 +0900
>+@@ -270,6 +270,7 @@
>  endif
>  
>- ifeq ($(OSNAME), FreeBSD)
>+ ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly))
> +EXTRALIB	+= -lm %%LDFLAGS%%
>  MD5SUM = md5 -r
>  endif
>  
>-@@ -889,9 +890,17 @@ SYMBOLSUFFIX =
>+@@ -1064,10 +1065,18 @@
>  endif
>  
>  ifndef LIBNAMESUFFIX
> +ifndef SMP
>- LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
>+ LIBNAMEBASE = $(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
>  else
>-+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)
>++LIBNAMEBASE = $(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)
> +endif
> +else
> +ifndef SMP
>- LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
>+ LIBNAMEBASE = $(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
> +else
>-+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
>-+endif
>++LIBNAMEBASE = $(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
>  endif
>++endif
>  
>- KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)
>-@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX
>+ ifeq ($(OSNAME), CYGWIN_NT)
>+ LIBPREFIX = cyg$(LIBNAMEBASE)
>+@@ -1215,25 +1224,9 @@
>  LIBSUFFIX = a
>  endif
>  
>@@ -47,11 +48,12 @@
> -LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
> -endif
> -endif
>--
>  
>+-
>  LIBDLLNAME   = $(LIBPREFIX).dll
>- LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
>-@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS
>+ IMPLIBNAME   = lib$(LIBNAMEBASE).dll.a
>+ ifneq ($(OSNAME), AIX)
>+@@ -1270,7 +1263,7 @@
>  endif
>  
>  export OSNAME
>diff -uNr /usr/ports/math/openblas/./files/patch-c_check /tmp/openblas/./files/patch-c_check
>--- /usr/ports/math/openblas/./files/patch-c_check	2016-02-19 01:35:48.000000000 +0900
>+++ /tmp/openblas/./files/patch-c_check	2019-10-30 21:37:55.972900000 +0900
>@@ -1,6 +1,6 @@
>---- c_check.orig	2015-10-27 20:44:50 UTC
>+--- c_check.orig	2019-04-29 17:22:19 UTC
> +++ c_check
>-@@ -235,7 +235,7 @@ open(CONFFILE, "> $config"  ) || die "Ca
>+@@ -320,7 +320,7 @@ open(CONFFILE, "> $config"  ) || die "Can't create $co
>  # print $data, "\n";
>  
>  print MAKEFILE "OSNAME=$os\n";
>diff -uNr /usr/ports/math/openblas/./files/patch-common__power.h /tmp/openblas/./files/patch-common__power.h
>--- /usr/ports/math/openblas/./files/patch-common__power.h	2019-07-30 21:11:21.000000000 +0900
>+++ /tmp/openblas/./files/patch-common__power.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,38 +0,0 @@
>---- common_power.h.orig	2017-07-24 04:03:35 UTC
>-+++ common_power.h
>-@@ -241,7 +241,7 @@ static inline int blas_quickdivide(blasint x, blasint 
>- #define HAVE_PREFETCH
>- #endif
>- 
>--#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8)
>-+#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) || defined(PPC970)
>- #define DCBT_ARG	0
>- #else
>- #define DCBT_ARG	8
>-@@ -499,7 +499,7 @@ static inline int blas_quickdivide(blasint x, blasint 
>- 
>- #if defined(ASSEMBLER) && !defined(NEEDPARAM)
>- 
>--#ifdef OS_LINUX
>-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
>- #ifndef __64BIT__
>- #define PROLOGUE \
>- 	.section .text;\
>-@@ -774,7 +774,7 @@ Lmcount$lazy_ptr:
>- 
>- #define HALT		mfspr	r0, 1023
>- 
>--#ifdef OS_LINUX
>-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
>- #if defined(PPC440) || defined(PPC440FP2)
>- #undef  MAX_CPU_NUMBER
>- #define MAX_CPU_NUMBER 1
>-@@ -819,7 +819,7 @@ Lmcount$lazy_ptr:
>- #define MAP_ANONYMOUS MAP_ANON
>- #endif
>- 
>--#ifdef OS_LINUX
>-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
>- #ifndef __64BIT__
>- #define FRAMESLOT(X) (((X) * 4) + 8)
>- #else
>diff -uNr /usr/ports/math/openblas/./files/patch-cpuid__arm64.c /tmp/openblas/./files/patch-cpuid__arm64.c
>--- /usr/ports/math/openblas/./files/patch-cpuid__arm64.c	2017-06-30 13:28:08.000000000 +0900
>+++ /tmp/openblas/./files/patch-cpuid__arm64.c	2019-10-30 21:37:55.978690000 +0900
>@@ -1,6 +1,6 @@
>---- cpuid_arm64.c.orig	2016-09-01 03:58:42 UTC
>+--- cpuid_arm64.c.orig	2019-04-29 17:22:19 UTC
> +++ cpuid_arm64.c
>-@@ -132,6 +132,8 @@ int detect(void)
>+@@ -180,6 +180,8 @@ int detect(void)
>  
>  
>  	}
>diff -uNr /usr/ports/math/openblas/./files/patch-cpuid_ia64.c /tmp/openblas/./files/patch-cpuid_ia64.c
>--- /usr/ports/math/openblas/./files/patch-cpuid_ia64.c	2016-02-19 01:35:48.000000000 +0900
>+++ /tmp/openblas/./files/patch-cpuid_ia64.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,12 +0,0 @@
>---- cpuid_ia64.c.orig	2015-10-27 20:44:50 UTC
>-+++ cpuid_ia64.c
>-@@ -38,7 +38,9 @@
>- 
>- #include <stdio.h>
>- #include <string.h>
>-+#ifdef linux
>- #include <sys/sysinfo.h>
>-+#endif
>- #include "cpuid.h"
>- 
>- #ifdef __ECC
>diff -uNr /usr/ports/math/openblas/./files/patch-cpuid_sparc.c /tmp/openblas/./files/patch-cpuid_sparc.c
>--- /usr/ports/math/openblas/./files/patch-cpuid_sparc.c	2016-02-19 01:35:48.000000000 +0900
>+++ /tmp/openblas/./files/patch-cpuid_sparc.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- cpuid_sparc.c.orig	2015-10-27 20:44:50 UTC
>-+++ cpuid_sparc.c
>-@@ -49,6 +49,7 @@ void get_subdirname(void){
>- }
>- 
>- void get_cpuconfig(void){
>-+  printf("#define SPARC\n");
>-   printf("#define V9\n");
>-   printf("#define DTB_DEFAULT_ENTRIES 32\n");
>- }
>diff -uNr /usr/ports/math/openblas/./files/patch-cpuid_x86.c /tmp/openblas/./files/patch-cpuid_x86.c
>--- /usr/ports/math/openblas/./files/patch-cpuid_x86.c	2018-11-17 12:14:21.000000000 +0900
>+++ /tmp/openblas/./files/patch-cpuid_x86.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,18 +0,0 @@
>---- cpuid_x86.c.orig	2017-07-24 04:03:35 UTC
>-+++ cpuid_x86.c
>-@@ -1329,6 +1329,7 @@ int get_cpuname(void){
>-       case 8:
>- 	switch (model) {
>- 	case 1:
>-+	case 8:
>- 	  // AMD Ryzen
>- 	  if(support_avx())
>- #ifndef NO_AVX2
>-@@ -1865,6 +1866,7 @@ int get_coretype(void){
>-       } else if (exfamily == 8) {
>- 	switch (model) {
>- 	case 1:
>-+	case 8:
>- 	  // AMD Ryzen
>- 	  if(support_avx())
>- #ifndef NO_AVX2
>diff -uNr /usr/ports/math/openblas/./files/patch-driver_others_memory.c /tmp/openblas/./files/patch-driver_others_memory.c
>--- /usr/ports/math/openblas/./files/patch-driver_others_memory.c	2016-04-24 17:09:27.000000000 +0900
>+++ /tmp/openblas/./files/patch-driver_others_memory.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,13 +0,0 @@
>-Passing a priority level to constructor/destructor only works on GCC >= 4.3.0;
>-improve the upstream check so that the build works with base GCC.
>---- driver/others/memory.c.orig	2016-04-12 19:29:19 UTC
>-+++ driver/others/memory.c
>-@@ -144,7 +144,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- #if defined(_MSC_VER) && !defined(__clang__)
>- #define CONSTRUCTOR __cdecl
>- #define DESTRUCTOR __cdecl
>--#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) && defined(C_GCC)
>-+#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) || (defined(C_GCC) && ((__GNUC__ == 4) && (__GNUC_MINOR__ < 3)))
>- #define CONSTRUCTOR	__attribute__ ((constructor))
>- #define DESTRUCTOR	__attribute__ ((destructor))
>- #else
>diff -uNr /usr/ports/math/openblas/./files/patch-exports+Makefile /tmp/openblas/./files/patch-exports+Makefile
>--- /usr/ports/math/openblas/./files/patch-exports+Makefile	2016-04-05 05:46:22.000000000 +0900
>+++ /tmp/openblas/./files/patch-exports+Makefile	2019-10-30 21:37:55.982917000 +0900
>@@ -1,14 +1,14 @@
>---- exports/Makefile.orig	2015-10-27 20:44:50 UTC
>+--- exports/Makefile.orig	2019-04-29 17:22:19 UTC
> +++ exports/Makefile
>-@@ -140,6 +140,7 @@ endif
>- #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
>- ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
>+@@ -124,6 +124,7 @@ dllinit.$(SUFFIX) : dllinit.c
>  
>+ ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku))
>+ 
> +EXTRALIB += -lgfortran
>  so : ../$(LIBSONAME)
>  
>- ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
>-@@ -151,6 +152,7 @@ else
>+ ifeq ($(OSNAME), Android)
>+@@ -180,6 +181,7 @@ else
>  endif
>  	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
>  	-Wl,--whole-archive $< -Wl,--no-whole-archive \
>diff -uNr /usr/ports/math/openblas/./files/patch-f_check /tmp/openblas/./files/patch-f_check
>--- /usr/ports/math/openblas/./files/patch-f_check	2016-02-19 01:35:48.000000000 +0900
>+++ /tmp/openblas/./files/patch-f_check	2019-10-30 21:37:55.984316000 +0900
>@@ -1,6 +1,6 @@
>---- f_check.orig	2015-10-27 20:44:50 UTC
>+--- f_check.orig	2019-04-29 17:22:19 UTC
> +++ f_check
>-@@ -261,7 +261,7 @@ if ($link ne "") {
>+@@ -288,7 +288,7 @@ if ($link ne "") {
>  
>      foreach $flags (@flags) {
>  	if (
>@@ -9,7 +9,7 @@
>  	    && ($flags !~ /^-LIST:/)
>  	    && ($flags !~ /^-LANG:/)
>  	    ) {
>-@@ -292,7 +292,7 @@ if ($link ne "") {
>+@@ -317,7 +317,7 @@ if ($link ne "") {
>  	}
>  
>  	if (
>diff -uNr /usr/ports/math/openblas/./files/patch-interface__ztrmv.c /tmp/openblas/./files/patch-interface__ztrmv.c
>--- /usr/ports/math/openblas/./files/patch-interface__ztrmv.c	2017-02-26 03:19:50.000000000 +0900
>+++ /tmp/openblas/./files/patch-interface__ztrmv.c	2019-10-30 21:37:55.981482000 +0900
>@@ -1,6 +1,6 @@
>---- interface/ztrmv.c.orig	2016-09-01 03:58:42 UTC
>+--- interface/ztrmv.c.orig	2019-04-29 17:22:19 UTC
> +++ interface/ztrmv.c
>-@@ -242,7 +242,7 @@ void CNAME(enum CBLAS_ORDER order, enum 
>+@@ -245,7 +245,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Upl
>    else
>  #endif
>    {
>diff -uNr /usr/ports/math/openblas/./files/patch-param.h /tmp/openblas/./files/patch-param.h
>--- /usr/ports/math/openblas/./files/patch-param.h	2019-07-30 21:11:21.000000000 +0900
>+++ /tmp/openblas/./files/patch-param.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- param.h.orig	2019-06-28 14:19:50 UTC
>-+++ param.h
>-@@ -1877,7 +1877,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILI
>- #define ZGEMM_DEFAULT_UNROLL_M 2
>- #define ZGEMM_DEFAULT_UNROLL_N 2
>- 
>--#ifdef OS_LINUX
>-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
>- #if L2_SIZE == 1024976
>- #define SGEMM_DEFAULT_P 320
>- #define DGEMM_DEFAULT_P 256
>diff -uNr /usr/ports/math/openblas/./pkg-plist /tmp/openblas/./pkg-plist
>--- /usr/ports/math/openblas/./pkg-plist	2019-10-29 19:25:42.000000000 +0900
>+++ /tmp/openblas/./pkg-plist	2019-10-30 22:32:52.604960000 +0900
>@@ -29,8 +29,6 @@
> include/openblas/openblas_common_z.h
> include/openblas/openblas_common_zarch.h
> include/openblas/openblas_config.h
>-include/openblas/config_kernel.h
>-include/openblas/config_last.h
> include/openblas/openblas_cpuid.h
> include/openblas/l1param.h
> include/openblas/l2param.h
>@@ -38,3 +36,4 @@
> include/openblas/openblas_param.h
> include/openblas/symcopy.h
> include/openblas/openblas_version.h
>+

Actions: View | Diff

Attachments on bug 231371: 197101 | 197103 | 205323 | 205333 | 205334 | 205335 | 205347 | 208485 | 208700 | 208701 | 210895