FreeBSD Bugzilla – Attachment 197101 Details for
Bug 231371
math/openblas: Update to 0.3.7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
openblas.patch (text/plain), 14.94 KB, created by
Yuri Victorovich
on 2018-09-15 04:24:17 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Yuri Victorovich
Created:
2018-09-15 04:24:17 UTC
Size:
14.94 KB
patch
obsolete
>Index: math/openblas/Makefile >=================================================================== >--- math/openblas/Makefile (revision 477407) >+++ math/openblas/Makefile (working copy) >@@ -2,9 +2,8 @@ > # $FreeBSD$ > > PORTNAME= openblas >-PORTVERSION= 0.2.20 >-PORTREVISION= 3 > DISTVERSIONPREFIX= v >+DISTVERSION= 0.3.3 > PORTEPOCH= 1 > CATEGORIES= math > MASTER_SITES= NL/lapack/timing/:lapack_tmg >@@ -17,22 +16,17 @@ > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-USES= fortran gmake perl5 >- >+USES= cmake:outsource fortran perl5 pkgconfig > USE_GITHUB= yes > GH_ACCOUNT= xianyi > GH_PROJECT= OpenBLAS > LARGE_FILE= large.tgz > TIMING_FILE= timing.tgz >- > USE_LDCONFIG= yes > USE_PERL5= build > >-OPENBLAS_SUFX= r${PORTVERSION} >-OPENBLAS_LIBS= libopenblas libopenblasp >-OPENBLAS_SVER= 0 >-OPENBLAS_FILES= ${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|} >-PLIST_FILES= ${OPENBLAS_FILES:S|^|lib/|} >+CMAKE_ON= BUILD_SHARED_LIBS >+ > TEST_TARGET= tests > > OPTIONS_DEFINE= INTERFACE64 OPENMP >@@ -69,81 +63,26 @@ > MANUAL_PACKAGE_BUILD= Optimizes for the build machine. > .endif > >-.if ${PORT_OPTIONS:MDYNAMIC_ARCH} >-BUILDFLAGS+= DYNAMIC_ARCH=1 >-.endif >+DYNAMIC_ARCH_CMAKE_BOOL= DYNAMIC_ARCH > >-.if ${PORT_OPTIONS:MINTERFACE64} >-BUILDFLAGS+= INTERFACE64=1 >-.endif >+INTERFACE64_CMAKE_BOOL= INTERFACE64 > >-.if ${PORT_OPTIONS:MOPENMP} >-USES+= compiler:openmp >-BUILDFLAGS_THREAD+= USE_OPENMP=1 >-.endif >+USE_OPENMP_USES= compiler:openmp >+USE_OPENMP_CMAKE_BOOL= USE_OPENMP > >-.if ! ${PORT_OPTIONS:MAVX} >-BUILDFLAGS+= NO_AVX=1 >-.endif >+AVX_CMAKE_OFF= -DNO_AVX=1 >+AVX2_CMAKE_OFF= -DNO_AVX2=1 > >-.if ! ${PORT_OPTIONS:MAVX2} >-BUILDFLAGS+= NO_AVX2=1 >-.endif >- > post-extract: > cd ${DISTDIR}/${DIST_SUBDIR} ; \ > ${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC} > ${MKDIR} ${WRKDIR}/lib > >-post-patch: >- ${REINPLACE_CMD} -e "s+%%FIND%%+${FIND}+" \ >- -e "s+%%XARGS%%+${XARGS}+" \ >- -e "s+%%REINPLACE_CMD%%+${REINPLACE_CMD}+" \ >- ${WRKSRC}/Makefile >- ${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \ >- ${WRKSRC}/Makefile.rule >- ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \ >- ${WRKSRC}/Makefile.rule \ >- ${WRKSRC}/Makefile.tail \ >- ${WRKSRC}/driver/level3/Makefile \ >- ${WRKSRC}/driver/others/Makefile \ >- ${WRKSRC}/exports/Makefile \ >- ${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 >- ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \ >- -e 's+%%LDFLAGS%%+${LDFLAGS}+' \ >- -e 's+%%LOCALBASE%%+${LOCALBASE}+' \ >- -e 's+%%FIND%%+${FIND}+' \ >- -e 's+%%XARGS%%+${XARGS}+' \ >- -e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \ >- -e 's+$${CROSS_SUFFIX}+${LOCALBASE}/bin/+' \ >- -e '/Clang.*OpenMP/g' \ >- ${WRKSRC}/Makefile.system >- > post-patch-OPENMP-on: > ${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \ > ${WRKSRC}/test/Makefile \ > ${WRKSRC}/ctest/Makefile > >-do-build: >- cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \ >- ${MAKE_CMD} ${MAKE_ARGS} >- ${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblas.a >- ${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER} >- cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean >- cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} ${BUILDFLAGS_THREAD} \ >- ${MAKE_CMD} ${MAKE_ARGS} >- ${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a >- ${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER} >- > BENCHMARK_MAXTHREADS?= ${MAXTHREADS} > .if ${PORT_OPTIONS:MOPENMP} > BENCHMARK_THREADS_FLAG= OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS} >@@ -157,11 +96,4 @@ > cd ${WRKSRC}/benchmark ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \ > USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS} > >-do-install: >-.for L in ${OPENBLAS_LIBS} >- ${INSTALL_DATA} ${WRKDIR}/lib/${L}.a ${STAGEDIR}${PREFIX}/lib >- ${INSTALL_LIB} ${WRKDIR}/lib/${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib >- ${LN} -sf ${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/${L}.so >-.endfor >- > .include <bsd.port.mk> >Index: math/openblas/distinfo >=================================================================== >--- math/openblas/distinfo (revision 477407) >+++ math/openblas/distinfo (working copy) >@@ -1,7 +1,7 @@ >-TIMESTAMP = 1503123719 >+TIMESTAMP = 1536976475 > 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.3_GH0.tar.gz) = 49d88f4494ae780e3d7fa51769c00d982d7cdb73e696054ac3baa81d42f13bab >+SIZE (openblas/xianyi-OpenBLAS-v0.3.3_GH0.tar.gz) = 11821696 >Index: math/openblas/files/patch-Makefile >=================================================================== >--- math/openblas/files/patch-Makefile (revision 477407) >+++ math/openblas/files/patch-Makefile (nonexistent) >@@ -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 > >Property changes on: math/openblas/files/patch-Makefile >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: math/openblas/files/patch-Makefile.rule >=================================================================== >--- math/openblas/files/patch-Makefile.rule (revision 477407) >+++ math/openblas/files/patch-Makefile.rule (nonexistent) >@@ -1,15 +0,0 @@ >---- Makefile.rule.orig 2015-10-27 20:44:50 UTC >-+++ Makefile.rule >-@@ -19,10 +19,10 @@ VERSION = 0.2.15 >- >- # 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. >--# CC = gcc >-+CC = %%CC%% >- >- # Fortran compiler. Default is g77. >--# FC = gfortran >-+FC = %%FC%% >- >- # Even you can specify cross compiler. Meanwhile, please set HOSTCC. >- > >Property changes on: math/openblas/files/patch-Makefile.rule >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: math/openblas/files/patch-Makefile.system >=================================================================== >--- math/openblas/files/patch-Makefile.system (revision 477407) >+++ math/openblas/files/patch-Makefile.system (nonexistent) >@@ -1,62 +0,0 @@ >---- Makefile.system.orig 2015-10-27 20:44:50 UTC >-+++ Makefile.system >-@@ -218,6 +218,7 @@ MD5SUM = md5 -r >- endif >- >- ifeq ($(OSNAME), FreeBSD) >-+EXTRALIB += -lm %%LDFLAGS%% >- MD5SUM = md5 -r >- endif >- >-@@ -889,9 +890,17 @@ SYMBOLSUFFIX = >- endif >- >- ifndef LIBNAMESUFFIX >-+ifndef SMP >- LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX) >- else >-+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX) >-+endif >-+else >-+ifndef SMP >- LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX) >-+else >-+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX) >-+endif >- endif >- >- KERNELDIR = $(TOPDIR)/kernel/$(ARCH) >-@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX >- LIBSUFFIX = a >- endif >- >--ifneq ($(DYNAMIC_ARCH), 1) >--ifndef SMP >--LIBNAME = $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX) >--LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX) >--else >--LIBNAME = $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX) >--LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX) >--endif >--else >--ifndef SMP >- LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX) >- LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX) >--else >--LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX) >--LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX) >--endif >--endif >-- >- >- LIBDLLNAME = $(LIBPREFIX).dll >- LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so) >-@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS >- endif >- >- export OSNAME >--export ARCH >-+export ARCH_ >- export CORE >- export LIBCORE >- export PGCPATH > >Property changes on: math/openblas/files/patch-Makefile.system >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: math/openblas/files/patch-c_check >=================================================================== >--- math/openblas/files/patch-c_check (revision 477407) >+++ math/openblas/files/patch-c_check (working copy) >@@ -1,6 +1,6 @@ >---- c_check.orig 2015-10-27 20:44:50 UTC >+--- c_check.orig 2018-08-30 22:07:48 UTC > +++ c_check >-@@ -235,7 +235,7 @@ open(CONFFILE, "> $config" ) || die "Ca >+@@ -293,7 +293,7 @@ open(CONFFILE, "> $config" ) || die "Ca > # print $data, "\n"; > > print MAKEFILE "OSNAME=$os\n"; >Index: math/openblas/files/patch-common__arm.h >=================================================================== >--- math/openblas/files/patch-common__arm.h (revision 477407) >+++ math/openblas/files/patch-common__arm.h (working copy) >@@ -1,6 +1,6 @@ >---- common_arm.h.orig 2016-09-01 03:58:42 UTC >+--- common_arm.h.orig 2018-08-30 22:07:48 UTC > +++ common_arm.h >-@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint >+@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasi > > #endif > >Index: math/openblas/files/patch-cpuid__arm64.c >=================================================================== >--- math/openblas/files/patch-cpuid__arm64.c (revision 477407) >+++ math/openblas/files/patch-cpuid__arm64.c (working copy) >@@ -1,6 +1,6 @@ >---- cpuid_arm64.c.orig 2016-09-01 03:58:42 UTC >+--- cpuid_arm64.c.orig 2018-08-30 22:07:48 UTC > +++ cpuid_arm64.c >-@@ -132,6 +132,8 @@ int detect(void) >+@@ -151,6 +151,8 @@ int detect(void) > > > } >Index: math/openblas/files/patch-cpuid_sparc.c >=================================================================== >--- math/openblas/files/patch-cpuid_sparc.c (revision 477407) >+++ math/openblas/files/patch-cpuid_sparc.c (nonexistent) >@@ -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"); >- } > >Property changes on: math/openblas/files/patch-cpuid_sparc.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: math/openblas/files/patch-driver_others_memory.c >=================================================================== >--- math/openblas/files/patch-driver_others_memory.c (revision 477407) >+++ math/openblas/files/patch-driver_others_memory.c (working copy) >@@ -1,8 +1,8 @@ > 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.orig 2018-08-30 22:07:48 UTC > +++ driver/others/memory.c >-@@ -144,7 +144,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+@@ -1652,7 +1652,7 @@ void gotoblas_dummy_for_PGI(void) { > #if defined(_MSC_VER) && !defined(__clang__) > #define CONSTRUCTOR __cdecl > #define DESTRUCTOR __cdecl >Index: math/openblas/files/patch-exports+Makefile >=================================================================== >--- math/openblas/files/patch-exports+Makefile (revision 477407) >+++ math/openblas/files/patch-exports+Makefile (nonexistent) >@@ -1,18 +0,0 @@ >---- exports/Makefile.orig 2015-10-27 20:44:50 UTC >-+++ exports/Makefile >-@@ -140,6 +140,7 @@ endif >- #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or >- ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD)) >- >-+EXTRALIB += -lgfortran >- so : ../$(LIBSONAME) >- >- ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX)) >-@@ -151,6 +152,7 @@ else >- endif >- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ >- -Wl,--whole-archive $< -Wl,--no-whole-archive \ >-+ -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \ >- $(FEXTRALIB) $(EXTRALIB) >- $(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK. >- rm -f linktest > >Property changes on: math/openblas/files/patch-exports+Makefile >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: math/openblas/files/patch-f_check >=================================================================== >--- math/openblas/files/patch-f_check (revision 477407) >+++ math/openblas/files/patch-f_check (working copy) >@@ -1,6 +1,6 @@ >---- f_check.orig 2015-10-27 20:44:50 UTC >+--- f_check.orig 2018-08-30 22:07:48 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 "") { >+@@ -326,7 +326,7 @@ if ($link ne "") { > } > > if ( >Index: math/openblas/files/patch-interface__ztrmv.c >=================================================================== >--- math/openblas/files/patch-interface__ztrmv.c (revision 477407) >+++ math/openblas/files/patch-interface__ztrmv.c (working copy) >@@ -1,6 +1,6 @@ >---- interface/ztrmv.c.orig 2016-09-01 03:58:42 UTC >+--- interface/ztrmv.c.orig 2018-08-30 22:07:48 UTC > +++ interface/ztrmv.c >-@@ -242,7 +242,7 @@ void CNAME(enum CBLAS_ORDER order, enum >+@@ -248,7 +248,7 @@ void CNAME(enum CBLAS_ORDER order, enum > else > #endif > {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 231371
:
197101
|
197103
|
205323
|
205333
|
205334
|
205335
|
205347
|
208485
|
208700
|
208701
|
210895