diff --git a/math/openblas/Makefile b/math/openblas/Makefile index a4ae0eff94a7..a92148643714 100644 --- a/math/openblas/Makefile +++ b/math/openblas/Makefile @@ -1,142 +1,141 @@ # Created by: Eijiro Shibusawa PORTNAME= openblas DISTVERSIONPREFIX= v -DISTVERSION= 0.3.13 -PORTREVISION= 1 +DISTVERSION= 0.3.15 PORTEPOCH= 1 CATEGORIES= math MASTER_SITES= NL/lapack/timing/:lapack_tmg DISTFILES= large.tgz:lapack_tmg \ timing.tgz:lapack_tmg DIST_SUBDIR= openblas MAINTAINER= phd_kimberlite@yahoo.co.jp COMMENT= Optimized BLAS library based on GotoBLAS2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 fortran gmake perl5 pkgconfig CONFLICTS_INSTALL= cblas lapacke USE_GITHUB= yes GH_ACCOUNT= xianyi GH_PROJECT= OpenBLAS LARGE_FILE= large.tgz TIMING_FILE= timing.tgz USE_LDCONFIG= yes USE_PERL5= build OPENBLAS_SVER= 0 TEST_TARGET= tests PLIST_SUB+= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP OPTIONS_DEFAULT= OPENMP OPTIONS_DEFINE_i386= AVX AVX2 OPTIONS_DEFINE_amd64= AVX AVX2 OPTIONS_EXCLUDE_powerpc64le= OPENMP OPTIONS_EXCLUDE_powerpc64= OPENMP OPTIONS_EXCLUDE_powerpc= OPENMP OPTIONS_RADIO= ${OPTIONS_RADIO_${ARCH}} OPTIONS_RADIO_powerpc64= POWER OPTIONS_RADIO_POWER= POWER6 POWER8 OPTIONS_SUB= yes .if defined(BATCH) || defined(PACKAGE_BUILDING) OPTIONS_DEFAULT_i386= DYNAMIC_ARCH OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH OPTIONS_DEFAULT_powerpc64le= DYNAMIC_ARCH .endif DYNAMIC_ARCH_DESC= Optimize for multiple CPU types, otherwise for this CPU INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures 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 .if ${ARCH} == powerpc64 USE_GCC= yes . if ${PORT_OPTIONS:MPOWER6} TARGET_CPU_ARCH= POWER6 . elif ${PORT_OPTIONS:MPOWER8} TARGET_CPU_ARCH= POWER8 .else TARGET_CPU_ARCH= PPC970 . endif .endif .if ${ARCH} == powerpc USE_GCC= yes TARGET_CPU_ARCH= PPCG4 .endif .if ${ARCH} == powerpc64le USE_GCC= yes .endif MAXTHREADS?= 64 .include post-extract: cd ${DISTDIR}/${DIST_SUBDIR} ; \ ${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC} post-patch: @${ECHO_CMD} MAKE_NB_JOBS=-1 >> ${WRKSRC}/Makefile.rule @${ECHO_CMD} NUM_THREADS=${MAXTHREADS} >> ${WRKSRC}/Makefile.rule @${ECHO_CMD} USE_THREAD=1 >> ${WRKSRC}/Makefile.rule .if ! ${PORT_OPTIONS:MAVX} @${ECHO_CMD} NO_AVX=1 >> ${WRKSRC}/Makefile.rule .endif .if ! ${PORT_OPTIONS:MAVX2} @${ECHO_CMD} NO_AVX2=1 >> ${WRKSRC}/Makefile.rule .endif .if ${PORT_OPTIONS:MDYNAMIC_ARCH} @${ECHO_CMD} DYNAMIC_ARCH=1 >> ${WRKSRC}/Makefile.rule @${ECHO_CMD} DYNAMIC_OLDER=1 >> ${WRKSRC}/Makefile.rule .endif .if defined(TARGET_CPU_ARCH) @${ECHO_CMD} TARGET=${TARGET_CPU_ARCH} >> ${WRKSRC}/Makefile.rule .endif .if ${PORT_OPTIONS:MINTERFACE64} @${ECHO_CMD} INTERFACE64=1 >> ${WRKSRC}/Makefile.rule .endif .if ${PORT_OPTIONS:MOPENMP} @${ECHO_CMD} USE_OPENMP=1 >> ${WRKSRC}/Makefile.rule .endif .if ${ARCH:M*64*} == "" @${ECHO_CMD} BINARY=32 >> ${WRKSRC}/Makefile.rule .else @${ECHO_CMD} BINARY=64 >> ${WRKSRC}/Makefile.rule .endif post-patch-OPENMP-on: @${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \ ${WRKSRC}/test/Makefile \ ${WRKSRC}/ctest/Makefile BENCHMARK_MAXTHREADS?= ${MAXTHREADS} .if ${PORT_OPTIONS:MOPENMP} BENCHMARK_THREADS_FLAG= OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS} .else BENCHMARK_THREADS_FLAG= OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS} .endif benchmark: build cd ${WRKSRC} ; ${SETENV} ${MAKE_CMD} ${MAKE_ARGS} hpl cd ${WRKSRC}/benchmark ; ${SETENV} ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS} post-install-DYNAMIC_ARCH-off: cd ${STAGEDIR}${PREFIX} && ls lib/libopenblas_*p-r${PORTVERSION}.* >> ${TMPPLIST} .include diff --git a/math/openblas/distinfo b/math/openblas/distinfo index dbeaee4588b4..737136838285 100644 --- a/math/openblas/distinfo +++ b/math/openblas/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1608090088 +TIMESTAMP = 1620312077 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.3.13_GH0.tar.gz) = 79197543b17cc314b7e43f7a33148c308b0807cd6381ee77f77e15acf3e6459e -SIZE (openblas/xianyi-OpenBLAS-v0.3.13_GH0.tar.gz) = 12437434 +SHA256 (openblas/xianyi-OpenBLAS-v0.3.15_GH0.tar.gz) = 30a99dec977594b387a17f49904523e6bc8dd88bd247266e83485803759e4bbe +SIZE (openblas/xianyi-OpenBLAS-v0.3.15_GH0.tar.gz) = 12498434 diff --git a/math/openblas/files/patch-Makefile.system b/math/openblas/files/patch-Makefile.system deleted file mode 100644 index 1008d4a6cd36..000000000000 --- a/math/openblas/files/patch-Makefile.system +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.system.orig 2020-12-30 14:58:08 UTC -+++ Makefile.system -@@ -21,6 +21,8 @@ ifeq ($(ARCH), amd64) - override ARCH=x86_64 - else ifeq ($(ARCH), powerpc64) - override ARCH=power -+else ifeq ($(ARCH), powerpc64le) -+override ARCH=power - else ifeq ($(ARCH), powerpc) - override ARCH=power - else ifeq ($(ARCH), i386) diff --git a/math/openblas/files/patch-f_check b/math/openblas/files/patch-f_check index 9a193257937d..6636f3cdeab3 100644 --- a/math/openblas/files/patch-f_check +++ b/math/openblas/files/patch-f_check @@ -1,20 +1,28 @@ ---- f_check.orig 2018-12-02 22:41:17 UTC -+++ f_check -@@ -288,7 +288,7 @@ if ($link ne "") { +--- f_check.orig 2021-05-03 06:50:22.000000000 +0900 ++++ f_check 2021-05-06 23:42:10.192934000 +0900 +@@ -326,7 +326,7 @@ foreach $flags (@flags) { if ( - ($flags =~ /^\-L/) + ($flags =~ /^\-L\S/) && ($flags !~ /^-LIST:/) && ($flags !~ /^-LANG:/) ) { -@@ -317,7 +317,7 @@ if ($link ne "") { +@@ -358,7 +358,7 @@ } if ( - ($flags =~ /^\-l/) + ($flags =~ /^\-l\S/) + && ($flags !~ /ibrary/) && ($flags !~ /gfortranbegin/) && ($flags !~ /frtbegin/) - && ($flags !~ /pathfstart/) +@@ -369,6 +369,7 @@ + && ($flags !~ /kernel32/) + && ($flags !~ /advapi32/) + && ($flags !~ /shell32/) ++ && ($flags !~ /gomp/) + && ($flags !~ /omp/ || ($vendor !~ /PGI/ && $vendor !~ /FUJITSU/ && $flags =~ /omp/)) + && ($flags !~ /[0-9]+/ || ($vendor == FUJITSU && $flags =~ /^-lfj90/)) + && ($flags !~ /^\-l$/)