svn commit: r523749 - in head: Mk/Uses biology/gemma games/leela-zero lang/julia06 lang/julia07 lang/julia10 lang/julia11 math/armadillo math/hmat-oss math/octave-forge-ltfat math/openblas math/ope...
Steve Wills
swills at FreeBSD.org
Tue Jan 21 22:03:23 UTC 2020
Author: swills
Date: Tue Jan 21 22:03:19 2020
New Revision: 523749
URL: https://svnweb.freebsd.org/changeset/ports/523749
Log:
math/openblas: Update to 0.3.7
While here, improve formatting and fix build of dependant ports.
PR: 231371
Submitted by: yuri (initial version), pkubaj (ppc fixes)
Approved by: Eijiro Shibusawa <phd_kimberlite at yahoo.co.jp> (maintainer)
Deleted:
head/math/openblas/files/patch-Makefile
head/math/openblas/files/patch-Makefile.rule
head/math/openblas/files/patch-Makefile.system
head/math/openblas/files/patch-common__power.h
head/math/openblas/files/patch-cpuid_ia64.c
head/math/openblas/files/patch-cpuid_sparc.c
head/math/openblas/files/patch-cpuid_x86.c
head/math/openblas/files/patch-driver_others_memory.c
head/math/openblas/files/patch-exports+Makefile
head/math/openblas/files/patch-param.h
head/science/libcint/files/patch-CMakeLists.txt
Modified:
head/Mk/Uses/blaslapack.mk
head/biology/gemma/Makefile (contents, props changed)
head/games/leela-zero/Makefile (contents, props changed)
head/lang/julia06/Makefile (contents, props changed)
head/lang/julia07/Makefile (contents, props changed)
head/lang/julia10/Makefile (contents, props changed)
head/lang/julia11/Makefile (contents, props changed)
head/math/armadillo/Makefile (contents, props changed)
head/math/hmat-oss/Makefile (contents, props changed)
head/math/octave-forge-ltfat/Makefile (contents, props changed)
head/math/openblas/Makefile (contents, props changed)
head/math/openblas/distinfo (contents, props changed)
head/math/openblas/files/patch-c_check (contents, props changed)
head/math/openblas/files/patch-common__arm.h (contents, props changed)
head/math/openblas/files/patch-cpuid__arm64.c (contents, props changed)
head/math/openblas/files/patch-f_check (contents, props changed)
head/math/openblas/files/patch-interface__ztrmv.c (contents, props changed)
head/math/openblas/pkg-plist (contents, props changed)
head/math/py-numpy/Makefile (contents, props changed)
head/misc/mxnet/Makefile (contents, props changed)
head/science/erkale/Makefile (contents, props changed)
Modified: head/Mk/Uses/blaslapack.mk
==============================================================================
--- head/Mk/Uses/blaslapack.mk Tue Jan 21 21:47:53 2020 (r523748)
+++ head/Mk/Uses/blaslapack.mk Tue Jan 21 22:03:19 2020 (r523749)
@@ -41,8 +41,8 @@ _BLASLIB= blas
LAPACKLIB= -llapack
.elif ${blaslapack_ARGS} == openblas
LIB_DEPENDS+= libopenblas.so:math/openblas
-_BLASLIB= openblasp
-LAPACKLIB= -lopenblasp
+_BLASLIB= openblas
+LAPACKLIB= -lopenblas
.else
IGNORE= USES=blaslapack: invalid arguments: ${blaslapack_ARGS}
.endif
Modified: head/biology/gemma/Makefile
==============================================================================
--- head/biology/gemma/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/biology/gemma/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -22,7 +22,7 @@ GH_PROJECT= GEMMA
MAKEFILE= ${FILESDIR}/Makefile
# Assuming openblas is built with pthreads, not openmp
CXXFLAGS+= -I${LOCALBASE}/include/eigen3 -DOPENBLAS -pthread
-LDFLAGS+= -lopenblasp -pthread
+LDFLAGS+= -lopenblas -pthread
OPTIONS_DEFINE= EXAMPLES
Modified: head/games/leela-zero/Makefile
==============================================================================
--- head/games/leela-zero/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/games/leela-zero/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -12,8 +12,7 @@ COMMENT= Go engine without human-provided knowledge ba
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= cblas>0:math/cblas \
- opencl>0:devel/opencl
+BUILD_DEPENDS= opencl>0:devel/opencl
LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
libopenblas.so:math/openblas \
libOpenCL.so:devel/ocl-icd
Modified: head/lang/julia06/Makefile
==============================================================================
--- head/lang/julia06/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/lang/julia06/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -113,7 +113,7 @@ OPENBLAS_DESC= Private OpenBLAS v0.3.0\
(ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!})
OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1
OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1
-OPENBLAS_LIB_DEPENDS_OFF= libopenblasp.so:math/openblas
+OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas
.include <bsd.port.options.mk>
@@ -156,8 +156,8 @@ post-patch-OPENBLAS-on:
${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch
post-patch-OPENBLAS-off:
- echo "LIBBLAS= -lopenblasp -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
- echo "LIBBLASNAME=libopenblasp" >> ${WRKSRC}/Make.user
+ echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
+ echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user
echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user
echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user
Modified: head/lang/julia07/Makefile
==============================================================================
--- head/lang/julia07/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/lang/julia07/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -102,7 +102,7 @@ OPENBLAS_DESC= Private OpenBLAS v0.3.2\
(ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!})
OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1
OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1
-OPENBLAS_LIB_DEPENDS_OFF= libopenblasp.so:math/openblas
+OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas
.include <bsd.port.options.mk>
@@ -145,8 +145,8 @@ post-patch-OPENBLAS-on:
${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch
post-patch-OPENBLAS-off:
- echo "LIBBLAS= -lopenblasp -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
- echo "LIBBLASNAME=libopenblasp" >> ${WRKSRC}/Make.user
+ echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
+ echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user
echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user
echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user
Modified: head/lang/julia10/Makefile
==============================================================================
--- head/lang/julia10/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/lang/julia10/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -106,7 +106,7 @@ OPENBLAS_DESC= Private OpenBLAS v0.3.2\
(ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!})
OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1
OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1
-OPENBLAS_LIB_DEPENDS_OFF= libopenblasp.so:math/openblas
+OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas
.include <bsd.port.options.mk>
@@ -150,8 +150,8 @@ post-patch-OPENBLAS-on:
${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch
post-patch-OPENBLAS-off:
- echo "LIBBLAS= -lopenblasp -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
- echo "LIBBLASNAME=libopenblasp" >> ${WRKSRC}/Make.user
+ echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
+ echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user
echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user
echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user
Modified: head/lang/julia11/Makefile
==============================================================================
--- head/lang/julia11/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/lang/julia11/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -106,7 +106,7 @@ OPENBLAS_DESC= Private OpenBLAS v0.3.3\
(ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!})
OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1
OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1
-OPENBLAS_LIB_DEPENDS_OFF= libopenblasp.so:math/openblas
+OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas
.include <bsd.port.options.mk>
@@ -150,8 +150,8 @@ post-patch-OPENBLAS-on:
${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch
post-patch-OPENBLAS-off:
- echo "LIBBLAS= -lopenblasp -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
- echo "LIBBLASNAME=libopenblasp" >> ${WRKSRC}/Make.user
+ echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
+ echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user
echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user
echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user
Modified: head/math/armadillo/Makefile
==============================================================================
--- head/math/armadillo/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/armadillo/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BROKEN_powerpc64= Does not build
LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \
- libopenblasp.so:math/openblas \
+ libopenblas.so:math/openblas \
libarpack.so:math/arpack-ng \
libhdf5.so:science/hdf5 \
libsuperlu.so:math/superlu \
Modified: head/math/hmat-oss/Makefile
==============================================================================
--- head/math/hmat-oss/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/hmat-oss/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -12,8 +12,7 @@ COMMENT= Hierarchical matrix C/C++ library
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-LIB_DEPENDS= libcblas.so:math/cblas \
- libopenblas.so:math/openblas
+LIB_DEPENDS= libopenblas.so:math/openblas
USES= cmake compiler:openmp
USE_GITHUB= yes
@@ -21,8 +20,7 @@ GH_ACCOUNT= jeromerobert
USE_LDCONFIG= yes
CMAKE_ARGS= -DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \
- -DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \
- -DCBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libcblas.so
+ -DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so
post-configure: # fix the error in math/openturns: /usr/local/lib/libhmat-oss.so.1: undefined reference to `openblas_set_num_threads(int)'
@${REINPLACE_CMD} "s|#define OPENBLAS_DISABLE_THREADS|\/\/&|" ${BUILD_WRKSRC}/config.h # OPENBLAS_DISABLE_THREADS enables openblas_set_num_threads(int) here
Modified: head/math/octave-forge-ltfat/Makefile
==============================================================================
--- head/math/octave-forge-ltfat/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/octave-forge-ltfat/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
LIB_DEPENDS= libfftw3.so:math/fftw3 \
libportaudio.so:audio/portaudio \
- libcblas.so:math/cblas
+ libopenblas.so:math/openblas
# OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
Modified: head/math/openblas/Makefile
==============================================================================
--- head/math/openblas/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/openblas/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -2,13 +2,13 @@
# $FreeBSD$
PORTNAME= openblas
-PORTVERSION= 0.2.20
-PORTREVISION= 11
+PORTVERSION= 0.3.7
DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= math
MASTER_SITES= NL/lapack/timing/:lapack_tmg
-DISTFILES= large.tgz:lapack_tmg timing.tgz:lapack_tmg
+DISTFILES= large.tgz:lapack_tmg \
+ timing.tgz:lapack_tmg
DIST_SUBDIR= openblas
MAINTAINER= phd_kimberlite at yahoo.co.jp
@@ -17,8 +17,10 @@ COMMENT= Optimized BLAS library based on GotoBLAS2
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= fortran gmake perl5
+USES= fortran gmake perl5 pkgconfig
+CONFLICTS_INSTALL= cblas lapacke
+
USE_GITHUB= yes
GH_ACCOUNT= xianyi
GH_PROJECT= OpenBLAS
@@ -28,19 +30,15 @@ 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/|}
TEST_TARGET= tests
BUILDFLAGS= FCOMMON_OPT=-frecursive MAKE_NB_JOBS=-1
-OPTIONS_DEFINE= INTERFACE64 OPENMP
-OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2
-OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386}
-OPTIONS_DEFINE_powerpc64= POWER6
+OPTIONS_DEFINE= INTERFACE64 OPENMP
+OPTIONS_DEFINE_i386= AVX AVX2 DYNAMIC_ARCH
+OPTIONS_DEFINE_amd64= AVX AVX2 DYNAMIC_ARCH
+OPTIONS_DEFINE_powerpc64= POWER8
OPTIONS_EXCLUDE_powerpc64= OPENMP
.if defined(BATCH) || defined(PACKAGE_BUILDING)
@@ -53,14 +51,14 @@ INTERFACE64_DESC= Use 8 byte integers on 64-bit archit
OPENMP_DESC= Use OpenMP for threading
AVX_DESC= Support Advanced Vector Extensions (AVX)
AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)
-POWER6_DESC= Optimize for POWER6, instead of the default PPC970
+POWER8_DESC= Optimize for POWER8, instead of the default PPC970
.include <bsd.port.options.mk>
.if ${ARCH} == powerpc64
-USE_GCC= yes
-. if ${PORT_OPTIONS:MPOWER6}
-TARGET_CPU_ARCH= POWER6
+USE_GCC= yes
+. if ${PORT_OPTIONS:MPOWER8}
+TARGET_CPU_ARCH= POWER8
.else
TARGET_CPU_ARCH= PPC970
. endif
@@ -68,9 +66,10 @@ TARGET_CPU_ARCH= PPC970
.if defined(TARGET_CPU_ARCH)
BUILDFLAGS+= TARGET=${TARGET_CPU_ARCH}
+MAKE_ENV+= TARGET=${TARGET_CPU_ARCH}
.endif
-MAXTHREADS?= 64
+MAXTHREADS?= 64
BUILDFLAGS_THREAD+= NUM_THREADS=${MAXTHREADS} USE_THREAD=1
.if ${ARCH:M*64} == ""
@@ -94,84 +93,43 @@ PLIST_SUB+= DYNARCH="@comment "
BUILDFLAGS+= INTERFACE64=1
.endif
+.if ! ${PORT_OPTIONS:MAVX}
+BUILDFLAGS+= NO_AVX=1
+.endif
+
+.if ! ${PORT_OPTIONS:MAVX2}
+BUILDFLAGS+= NO_AVX2=1
+.endif
+
.if ${PORT_OPTIONS:MOPENMP}
-USES+= compiler:openmp
+USES+= compiler:openmp
BUILDFLAGS_THREAD+= USE_OPENMP=1
.else
USES+= compiler:c11
.endif
-.if ! ${PORT_OPTIONS:MAVX}
-BUILDFLAGS+= NO_AVX=1
-.endif
+.include <bsd.port.pre.mk>
-.if ! ${PORT_OPTIONS:MAVX2}
-BUILDFLAGS+= NO_AVX2=1
+.if ${PORT_OPTIONS:MOPENMP}
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+USE_GCC= yes
.endif
+.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
- ${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" \
+ @${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}
+BENCHMARK_THREADS_FLAG= OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
.else
-BENCHMARK_THREADS_FLAG= OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
+BENCHMARK_THREADS_FLAG= OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
.endif
benchmark: build
@@ -180,12 +138,7 @@ benchmark: build
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
+post-install:
cd ${WRKSRC} && \
${FIND} . -name 'common*.h' -print | ${XARGS} ${BASENAME} | ${XARGS} -I {} ${MV} {} openblas_{}
${MV} ${WRKSRC}/version.h ${WRKSRC}/openblas_version.h
@@ -206,8 +159,9 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/openblas_*.h ${STAGEDIR}${PREFIX}/include/openblas
${INSTALL_DATA} ${WRKSRC}/cblas.h ${WRKSRC}/config_last.h ${WRKSRC}/l1param.h ${WRKSRC}/l2param.h ${WRKSRC}/symcopy.h \
${STAGEDIR}${PREFIX}/include/openblas
+ ${MV} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}_*-r${PORTVERSION}.a ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.a
+ ${MV} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}_*-r${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${OPENBLAS_SVER}
+ ${RM} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
+ ${LN} -sf lib${PORTNAME}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
-do-install-DYNAMIC_ARCH-on:
- ${INSTALL_DATA} ${WRKSRC}/config_kernel.h ${STAGEDIR}${PREFIX}/include/openblas
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/math/openblas/distinfo
==============================================================================
--- head/math/openblas/distinfo Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/openblas/distinfo Tue Jan 21 22:03:19 2020 (r523749)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1503123719
+TIMESTAMP = 1571670934
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
Modified: head/math/openblas/files/patch-c_check
==============================================================================
--- head/math/openblas/files/patch-c_check Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/openblas/files/patch-c_check Tue Jan 21 22:03:19 2020 (r523749)
@@ -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";
Modified: head/math/openblas/files/patch-common__arm.h
==============================================================================
--- head/math/openblas/files/patch-common__arm.h Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/openblas/files/patch-common__arm.h Tue Jan 21 22:03:19 2020 (r523749)
@@ -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(blasint x, blasint
#endif
Modified: head/math/openblas/files/patch-cpuid__arm64.c
==============================================================================
--- head/math/openblas/files/patch-cpuid__arm64.c Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/openblas/files/patch-cpuid__arm64.c Tue Jan 21 22:03:19 2020 (r523749)
@@ -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)
}
Modified: head/math/openblas/files/patch-f_check
==============================================================================
--- head/math/openblas/files/patch-f_check Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/openblas/files/patch-f_check Tue Jan 21 22:03:19 2020 (r523749)
@@ -1,6 +1,6 @@
---- f_check.orig 2015-10-27 20:44:50 UTC
+--- f_check.orig 2018-12-02 22:41:17 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 (
Modified: head/math/openblas/files/patch-interface__ztrmv.c
==============================================================================
--- head/math/openblas/files/patch-interface__ztrmv.c Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/openblas/files/patch-interface__ztrmv.c Tue Jan 21 22:03:19 2020 (r523749)
@@ -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
{
Modified: head/math/openblas/pkg-plist
==============================================================================
--- head/math/openblas/pkg-plist Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/openblas/pkg-plist Tue Jan 21 22:03:19 2020 (r523749)
@@ -1,4 +1,13 @@
+include/cblas.h
+include/f77blas.h
+include/lapacke.h
+include/lapacke_config.h
+include/lapacke_mangling.h
+include/lapacke_utils.h
include/openblas/cblas.h
+include/openblas/config_last.h
+include/openblas/l1param.h
+include/openblas/l2param.h
include/openblas/openblas_common.h
include/openblas/openblas_common_alpha.h
include/openblas/openblas_common_arm.h
@@ -29,12 +38,15 @@ include/openblas/openblas_common_x86_64.h
include/openblas/openblas_common_z.h
include/openblas/openblas_common_zarch.h
include/openblas/openblas_config.h
-%%DYNARCH%%include/openblas/config_kernel.h
-include/openblas/config_last.h
include/openblas/openblas_cpuid.h
-include/openblas/l1param.h
-include/openblas/l2param.h
include/openblas/openblas_config_template.h
include/openblas/openblas_param.h
-include/openblas/symcopy.h
include/openblas/openblas_version.h
+include/openblas/symcopy.h
+include/openblas_config.h
+lib/cmake/openblas/OpenBLASConfig.cmake
+lib/cmake/openblas/OpenBLASConfigVersion.cmake
+lib/libopenblas.a
+lib/libopenblas.so
+lib/libopenblas.so.0
+libdata/pkgconfig/openblas.pc
Modified: head/math/py-numpy/Makefile
==============================================================================
--- head/math/py-numpy/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/math/py-numpy/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -3,7 +3,7 @@
PORTNAME= numpy
PORTVERSION= 1.16.5
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= math python
MASTER_SITES= CHEESESHOP \
@@ -44,7 +44,7 @@ NETLIB_USES= blaslapack:netlib
NETLIB_VARS= BLASLIBS="blas, cblas" BLASNAME=atlas LAPACKLIBS=lapack LIBRARIES=atlas_libs
NETLIB_LIB_DEPENDS= libcblas.so:math/cblas
OPENBLAS_USES= blaslapack:openblas
-OPENBLAS_VARS= BLASLIBS="openblasp, gfortran" BLASNAME=openblas LAPACKLIBS="openblasp, gfortran" LIBRARIES=libraries
+OPENBLAS_VARS= BLASLIBS="openblas, gfortran" BLASNAME=openblas LAPACKLIBS="openblas, gfortran" LIBRARIES=libraries
SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse
post-extract:
Modified: head/misc/mxnet/Makefile
==============================================================================
--- head/misc/mxnet/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/misc/mxnet/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -3,7 +3,7 @@
PORTNAME= mxnet
DISTVERSION= 1.6.0
DISTVERSIONSUFFIX= .rc0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc # machine-learning
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -16,7 +16,6 @@ COMMENT= Apache MXNet: Ultra-scalable deep learning fr
LICENSE= APACHE20
BUILD_DEPENDS= googletest>0:devel/googletest \
- ${LOCALBASE}/include/cblas.h:math/cblas \
${LOCALBASE}/include/dnnl.h:math/mkl-dnn
LIB_DEPENDS= libdmlc.so:devel/dmlc-core \
liblapack.so:math/lapack \
Modified: head/science/erkale/Makefile
==============================================================================
--- head/science/erkale/Makefile Tue Jan 21 21:47:53 2020 (r523748)
+++ head/science/erkale/Makefile Tue Jan 21 22:03:19 2020 (r523749)
@@ -17,7 +17,6 @@ LIB_DEPENDS= libderiv.so:science/libint \
libgsl.so:math/gsl \
libhdf5.so:science/hdf5 \
libint.so:science/libint \
- libopenblas.so:math/openblas \
libsz.so:science/szip \
libxc.so:science/libxc
RUN_DEPENDS= ${LOCALBASE}/share/erkale/basis/6-21G.gbs:science/erkale-pseudopotentials
@@ -49,7 +48,7 @@ LIB_DEPENDS+= libomp.so:devel/llvm${LLVM_DEFAULT}
OPTIONS_SINGLE= LINALG
OPTIONS_SINGLE_LINALG= NETLIB OPENBLAS
-OPTIONS_DEFAULT= NETLIB
+OPTIONS_DEFAULT= OPENBLAS
LINALG_DESC= Linear algebra library
NETLIB_USES= blaslapack:netlib
@@ -58,8 +57,8 @@ NETLIB_LDFLAGS= ${LOCALBASE}/lib/libcblas.so ${LOCALB
NETLIB_LIB_DEPENDS= libcblas.so:math/cblas
OPENBLAS_USES= blaslapack:openblas
-OPENBLAS_CMAKE_ON= -DLAPACK_LIBRARIES:STRING=-lopenblas -DBLAS_LIBRARIES:STRING=-lopenblasp
-OPENBLAS_BROKEN= hits the number of threads limit: https://github.com/xianyi/OpenBLAS/issues/1882
+OPENBLAS_CMAKE_ON= -DLAPACK_LIBRARIES:STRING=-lopenblas -DBLAS_LIBRARIES:STRING=-lopenblas
+OPENBLAS_LIB_DEPENDS= libopenblas.so:math/openblas
# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678
# have the same compiler for both serial and parallel flavors so that performance numbers can be compared
More information about the svn-ports-head
mailing list