* [gentoo-commits] repo/gentoo:master commit in: sci-libs/blis/
@ 2019-07-11 11:40 Benda XU
0 siblings, 0 replies; 6+ messages in thread
From: Benda XU @ 2019-07-11 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 57f990e740958ef8183f61cfcc6483678a80796c
Author: Mo Zhou <cdluminate <AT> gmail <DOT> com>
AuthorDate: Thu Jul 11 02:37:54 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 11:40:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f990e7
sci-libs/blis: fix unmatched keywords and maintainer type.
Closes: https://github.com/gentoo/gentoo/pull/12420
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mo Zhou <cdluminate <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-libs/blis/blis-0.5.2.ebuild | 6 +++---
sci-libs/blis/blis-0.6.0.ebuild | 10 +++++-----
sci-libs/blis/metadata.xml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sci-libs/blis/blis-0.5.2.ebuild b/sci-libs/blis/blis-0.5.2.ebuild
index 939d0b608d6..785210e5b5a 100644
--- a/sci-libs/blis/blis-0.5.2.ebuild
+++ b/sci-libs/blis/blis-0.5.2.ebuild
@@ -15,7 +15,7 @@ IUSE="openmp pthread serial static-libs eselect-ldso doc 64bit-index"
REQUIRED_USE="?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )"
RDEPEND="eselect-ldso? ( !app-eselect/eselect-cblas
- >=app-eselect/eselect-blas-0.2 )"
+ >=app-eselect/eselect-blas-0.2 )"
DEPEND="${RDEPEND}
dev-lang/python
@@ -91,8 +91,8 @@ pkg_postinst() {
# check blas
eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
- local current_blas=$(eselect blas show ${libdir})
- if [[ ${current_blas} == blis || -z ${current_blas} ]]; then
+ local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
eselect blas set ${libdir} ${me}
elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
else
diff --git a/sci-libs/blis/blis-0.6.0.ebuild b/sci-libs/blis/blis-0.6.0.ebuild
index fd8ccbe5c4c..ccb44fdd682 100644
--- a/sci-libs/blis/blis-0.6.0.ebuild
+++ b/sci-libs/blis/blis-0.6.0.ebuild
@@ -15,7 +15,7 @@ IUSE="openmp pthread serial static-libs eselect-ldso doc 64bit-index"
REQUIRED_USE="?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )"
RDEPEND="eselect-ldso? ( !app-eselect/eselect-cblas
- >=app-eselect/eselect-blas-0.2 )"
+ >=app-eselect/eselect-blas-0.2 )"
DEPEND="${RDEPEND}
dev-lang/python
@@ -62,8 +62,8 @@ src_configure () {
src_compile() {
DEB_LIBBLAS=libblas.so.3 DEB_LIBCBLAS=libcblas.so.3 \
- LDS_BLAS="${FILESDIR}"/blas.lds LDS_CBLAS="${FILESDIR}"/cblas.lds \
- default
+ LDS_BLAS="${FILESDIR}"/blas.lds LDS_CBLAS="${FILESDIR}"/cblas.lds \
+ default
}
src_test () {
@@ -90,8 +90,8 @@ pkg_postinst() {
# check blas
eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
- local current_blas=$(eselect blas show ${libdir})
- if [[ ${current_blas} == blis || -z ${current_blas} ]]; then
+ local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
eselect blas set ${libdir} ${me}
elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
else
diff --git a/sci-libs/blis/metadata.xml b/sci-libs/blis/metadata.xml
index a27c6853409..21ba26e3bdd 100644
--- a/sci-libs/blis/metadata.xml
+++ b/sci-libs/blis/metadata.xml
@@ -5,7 +5,7 @@
<bugs-to>https://github.com/flame/blis/issues/</bugs-to>
<doc>https://github.com/flame/blis</doc>
</upstream>
- <maintainer type="project">
+ <maintainer type="person">
<name>Mo Zhou</name>
<email>lumin@debian.org</email>
</maintainer>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/blis/
@ 2019-09-04 7:51 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-09-04 7:51 UTC (permalink / raw
To: gentoo-commits
commit: 13c00964fd7f52a9b74e1eba62aae1594f215752
Author: Mo Zhou <cdluminate <AT> gmail <DOT> com>
AuthorDate: Wed Sep 4 07:24:42 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 4 07:51:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c00964
sci-lib/blis: use python-any-r1 eclass instead of hardcoded python deps.
Additionally, quote ${BLIS_FLAGS[@]}, and remove unused `eutils`
Closes: https://bugs.gentoo.org/693130
Signed-off-by: Mo Zhou <cdluminate <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12859
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/blis/blis-0.5.2.ebuild | 7 ++++---
sci-libs/blis/blis-0.6.0.ebuild | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/sci-libs/blis/blis-0.5.2.ebuild b/sci-libs/blis/blis-0.5.2.ebuild
index 785210e5b5a..2c8bf1dbc42 100644
--- a/sci-libs/blis/blis-0.5.2.ebuild
+++ b/sci-libs/blis/blis-0.5.2.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit eutils
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit python-any-r1
DESCRIPTION="BLAS-like Library Instantiation Software Framework"
HOMEPAGE="https://github.com/flame/blis"
@@ -18,7 +19,7 @@ RDEPEND="eselect-ldso? ( !app-eselect/eselect-cblas
>=app-eselect/eselect-blas-0.2 )"
DEPEND="${RDEPEND}
- dev-lang/python
+ ${PYTHON_DEPS}
"
PATCHES=(
@@ -56,7 +57,7 @@ src_configure () {
$(use_enable static-libs static) \
--enable-blas \
--enable-cblas \
- ${BLIS_FLAGS[@]} \
+ "${BLIS_FLAGS[@]}" \
--enable-shared \
$confname || die
}
diff --git a/sci-libs/blis/blis-0.6.0.ebuild b/sci-libs/blis/blis-0.6.0.ebuild
index ccb44fdd682..4d56f562212 100644
--- a/sci-libs/blis/blis-0.6.0.ebuild
+++ b/sci-libs/blis/blis-0.6.0.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit eutils
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit python-any-r1
DESCRIPTION="BLAS-like Library Instantiation Software Framework"
HOMEPAGE="https://github.com/flame/blis"
@@ -18,7 +19,7 @@ RDEPEND="eselect-ldso? ( !app-eselect/eselect-cblas
>=app-eselect/eselect-blas-0.2 )"
DEPEND="${RDEPEND}
- dev-lang/python
+ ${PYTHON_DEPS}
"
PATCHES=(
@@ -55,7 +56,7 @@ src_configure () {
$(use_enable static-libs static) \
--enable-blas \
--enable-cblas \
- ${BLIS_FLAGS[@]} \
+ "${BLIS_FLAGS[@]}" \
--enable-shared \
$confname || die
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/blis/
@ 2020-02-10 13:26 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-02-10 13:26 UTC (permalink / raw
To: gentoo-commits
commit: ea255867d6176dbf0f2b30fa20882c70ca5981e2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 13:05:48 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 13:26:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea255867
sci-libs/blis: Remove py2 where possible
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/blis/blis-0.5.2.ebuild | 2 +-
sci-libs/blis/blis-0.6.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/blis/blis-0.5.2.ebuild b/sci-libs/blis/blis-0.5.2.ebuild
index 2ac88177874..da1dc245a04 100644
--- a/sci-libs/blis/blis-0.5.2.ebuild
+++ b/sci-libs/blis/blis-0.5.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit python-any-r1
DESCRIPTION="BLAS-like Library Instantiation Software Framework"
diff --git a/sci-libs/blis/blis-0.6.0.ebuild b/sci-libs/blis/blis-0.6.0.ebuild
index 7c50cdadba0..15eff4fa716 100644
--- a/sci-libs/blis/blis-0.6.0.ebuild
+++ b/sci-libs/blis/blis-0.6.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit python-any-r1
DESCRIPTION="BLAS-like Library Instantiation Software Framework"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/blis/
@ 2023-05-01 12:52 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-05-01 12:52 UTC (permalink / raw
To: gentoo-commits
commit: 9528f47b0bb76f54973aecc7feda360687285c50
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 12:50:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 1 12:50:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9528f47b
sci-libs/blis: add github upstream metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/blis/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/blis/metadata.xml b/sci-libs/blis/metadata.xml
index 0793096590bb..c2cbc3c280d1 100644
--- a/sci-libs/blis/metadata.xml
+++ b/sci-libs/blis/metadata.xml
@@ -4,6 +4,7 @@
<upstream>
<bugs-to>https://github.com/flame/blis/issues/</bugs-to>
<doc>https://github.com/flame/blis</doc>
+ <remote-id type="github">flame/blis</remote-id>
</upstream>
<maintainer type="person" proxied="yes">
<name>Mo Zhou</name>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/blis/
@ 2024-06-03 13:27 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2024-06-03 13:27 UTC (permalink / raw
To: gentoo-commits
commit: 9d5cefbcb6fdcfe5deb2f679b27f8b510c18c7c9
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Sun Jun 2 11:03:33 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 13:27:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5cefbc
sci-libs/blis: don't autodetect CPU, build according to cpu_flags_*
This PR closes multiple issues:
* binary packaging had flaws, because even on x86-64 target machine won't always match host cpu
* crossdev compilation did not work, because correct compilers were not passed
* tests did not work, because LD_LIBRARY_PATH had hardcoded `haswell` target
* PYTHON_COMPAT: drop 3.9, add 3.12 and 3.13
This also adds few checks for aarch64 architecture, but aarch64 was not added
to KEYWORDS, as few tests failed (in 0.9, not in 1.0).
Note that while cpu_flags_*-based configuration resembles automatic one,
it is not fully the same. For example, there are 2 types of Skylake CPUs:
with 1 or 2 FMA units. Attempt to enable cpu_flags_x86_avx512vl on CPUs with
1 FMA unit will result in reduced performance. Previously this was handled by
automatic detection of 1FMA Skylake as Haswell; now user should not specify
cpu_flags_x86_avx512vl if CPU has degraded AVX-512 support.
Closes: https://bugs.gentoo.org/928018
Closes: https://bugs.gentoo.org/765805
Closes: https://bugs.gentoo.org/929769
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{blis-0.9.0.ebuild => blis-0.9.0-r1.ebuild} | 59 +++++++++++++++-------
1 file changed, 41 insertions(+), 18 deletions(-)
diff --git a/sci-libs/blis/blis-0.9.0.ebuild b/sci-libs/blis/blis-0.9.0-r1.ebuild
similarity index 64%
rename from sci-libs/blis/blis-0.9.0.ebuild
rename to sci-libs/blis/blis-0.9.0-r1.ebuild
index 171a0e9dacbe..1bf6e1ea736e 100644
--- a/sci-libs/blis/blis-0.9.0.ebuild
+++ b/sci-libs/blis/blis-0.9.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit python-any-r1 toolchain-funcs
DESCRIPTION="BLAS-like Library Instantiation Software Framework"
HOMEPAGE="https://github.com/flame/blis"
@@ -13,7 +13,12 @@ SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc eselect-ldso openmp pthread serial static-libs 64bit-index"
+CPU_USE=(
+ cpu_flags_ppc_{vsx,vsx3}
+ cpu_flags_arm_{neon,v7,v8,sve}
+ cpu_flags_x86_{ssse3,avx,fma3,fma4,avx2,avx512vl}
+)
+IUSE="doc eselect-ldso openmp pthread serial static-libs 64bit-index ${CPU_USE[@]}"
REQUIRED_USE="
?? ( openmp pthread serial )
?? ( eselect-ldso 64bit-index )"
@@ -25,7 +30,10 @@ DEPEND="
)"
RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+"
PATCHES=(
"${FILESDIR}"/${PN}-0.6.0-blas-provider.patch
@@ -34,9 +42,31 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.9.0-rpath.patch
)
+get_confname() {
+ local confname=generic
+ if use x86 || use amd64; then
+ use cpu_flags_x86_ssse3 && confname=penryn
+ use cpu_flags_x86_avx && use cpu_flags_x86_fma3 && confname=sandybridge
+ use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && confname=bulldozer
+ use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && use cpu_flags_x86_fma3 && confname=piledriver
+ use cpu_flags_x86_avx2 && confname=haswell
+ use cpu_flags_x86_avx512vl && confname=skx
+ elif use arm || use arm64; then
+ use arm && confname=arm32
+ use arm64 && confname=arm64
+ use cpu_flags_arm_neon && use cpu_flags_arm_v7 && confname=cortexa9
+ use cpu_flags_arm_v8 && confname=cortexa53
+ use cpu_flags_arm_sve && confname=armsve
+ elif use ppc || use ppc64; then
+ confname=power
+ use cpu_flags_ppc_vsx && confname=power7
+ use cpu_flags_ppc_vsx3 && confname=power9
+ fi
+ echo ${confname}
+}
+
src_configure() {
local BLIS_FLAGS=()
- local confname
# determine flags
if use openmp; then
BLIS_FLAGS+=( -t openmp )
@@ -46,17 +76,9 @@ src_configure() {
BLIS_FLAGS+=( -t no )
fi
use 64bit-index && BLIS_FLAGS+=( -b 64 -i 64 )
- # determine config name
- case "${ARCH}" in
- "x86" | "amd64")
- confname=auto ;;
- "ppc64")
- confname=generic ;;
- *)
- confname=generic ;;
- esac
+
# This is not an autotools configure file. We don't use econf here.
- ./configure \
+ CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ./configure \
--enable-verbose-make \
--prefix="${BROOT}"/usr \
--libdir="${BROOT}"/usr/$(get_libdir) \
@@ -65,7 +87,7 @@ src_configure() {
--enable-cblas \
"${BLIS_FLAGS[@]}" \
--enable-shared \
- $confname || die
+ $(get_confname) || die
}
src_compile() {
@@ -75,7 +97,8 @@ src_compile() {
}
src_test() {
- LD_LIBRARY_PATH="${S}/lib/haswell" emake check
+ LD_LIBRARY_PATH=lib/$(get_confname) emake testblis-fast
+ ./testsuite/check-blistest.sh ./output.testsuite || die
}
src_install() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/blis/
@ 2024-06-03 23:07 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-06-03 23:07 UTC (permalink / raw
To: gentoo-commits
commit: 6c1b41a3ee7b5127f2e3b3be93ccc12171746c38
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 23:07:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 23:07:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1b41a3
sci-libs/blis: Keyword 1.0 arm64, #933473
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/blis/blis-1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/blis/blis-1.0.ebuild b/sci-libs/blis/blis-1.0.ebuild
index ecbc704021e8..348b809181a4 100644
--- a/sci-libs/blis/blis-1.0.ebuild
+++ b/sci-libs/blis/blis-1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
CPU_USE=(
cpu_flags_ppc_{vsx,vsx3}
cpu_flags_arm_{neon,v7,v8,sve}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-03 23:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-01 12:52 [gentoo-commits] repo/gentoo:master commit in: sci-libs/blis/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-06-03 23:07 Sam James
2024-06-03 13:27 Andrew Ammerlaan
2020-02-10 13:26 Michał Górny
2019-09-04 7:51 Michał Górny
2019-07-11 11:40 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox