summaryrefslogtreecommitdiff
path: root/sci-libs/blis
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-06-04 00:07:50 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-06-04 00:07:50 +0100
commitdafa6f367240d1f5329ca89fb6f78985dbdc025b (patch)
tree96ba5ff3cc1d06604d928ca1b58ed15a4f8733dc /sci-libs/blis
parenta3bb28551df94028000fb72308a9e9baa01458b0 (diff)
gentoo auto-resync : 04:06:2024 - 00:07:50
Diffstat (limited to 'sci-libs/blis')
-rw-r--r--sci-libs/blis/Manifest5
-rw-r--r--sci-libs/blis/blis-0.9.0-r1.ebuild (renamed from sci-libs/blis/blis-0.9.0.ebuild)59
-rw-r--r--sci-libs/blis/blis-1.0.ebuild137
-rw-r--r--sci-libs/blis/files/blis-1.0-no-helper-headers.patch13
4 files changed, 195 insertions, 19 deletions
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
index c08d936a31f3..e9480bb4f540 100644
--- a/sci-libs/blis/Manifest
+++ b/sci-libs/blis/Manifest
@@ -2,7 +2,10 @@ AUX blas.lds 204 BLAKE2B 0e24237d75a95258e8e8bb6880fa8e5ecf0b59c15d03ed94af2a75f
AUX blis-0.6.0-blas-provider.patch 581 BLAKE2B bde52a363fa6a7b26da98ae6cf8af06311bd9fe2f5729d1759621238cc33437abb9b0fbf01d80a6f6a80a7871fd687e9fe047efcb8cc05c5a3cdc0cdf7e4a7d9 SHA512 e291becb8f5b99a11b75779f7a549681fb38cf04fe15516225caadf2672dda8ed5db9e24030c5cd3c261f5fc2b6d96d7e078aa9076e3fd46dfce39afc5681515
AUX blis-0.8.1-pkg-config.patch 332 BLAKE2B da0a76014ea73f251ac57fa609a20c73dc2c942104ac7cee11845084f0d5c107b5e572c4f2ee05eda6416f26f8285bf13d85865d73c9f84a35b940d884a41554 SHA512 00aabb7992bd90f508c054c23c2db3ccbee6e8db2c499b73bfc82e008a5df66eec3980d7a71935573a7905e2598bc9ae154cb4d1ff12d24df93afb8b8930e993
AUX blis-0.9.0-rpath.patch 562 BLAKE2B 97faafa73f5aaa448ee04ec9ee1cd8e5ce09ff451fd5dbf6e94e71bcb8dbf589d54e336ef3c4dc65857a47d6504e0d71bbfa71c8700683c95a4c097b1e76db8f SHA512 92773654cbfe97eb554a0be49a63ce144a793b7ea035de748f9d8cdced2d7b99a41d296a6c4a18d757048e52b5165a1ccf39707d84f6314754d6ef25ef392a70
+AUX blis-1.0-no-helper-headers.patch 418 BLAKE2B 6ac848fefc385d4be79c8a4850043ced2f050a4a74c6a08aef1a667e3c893a0bfecc778a9d754f2e6e71acb25575ecc88b2e18721c6f1fc538c9e5f48a2b2845 SHA512 e973d4801b39278fd078758b02d60441c611461a7d6d20696fbc8c65447c99ce566ed2731d1fd920d05695a90d9508f7cf2b7aae940eb0afb8cf291fad281c87
AUX cblas.lds 205 BLAKE2B ab2c41b571dbb9b55e36fa5afe4344ed9ef33454f6b7a5cda0726aa7f98a61dcef3065976cc02ab593aad94c5d6c0a23efce726da30673bd06cf57b64e826b93 SHA512 23008248e2b2c221a9ce36c2aca3e2acf58a6d434ffde498a058689af5d16d6e87ab56900508bb0403c5f5a1fc9366b202a7fc44a42d04c409197ec1ec164408
DIST blis-0.9.0.tar.gz 15078619 BLAKE2B f7c9632024e0adbba370a4077a7a47f05c54779ad6195b2ccda0950df8e784b8988b4338758ec2fabd424a69009010f8f02cbaef0eda1d74f6794127b43b4f70 SHA512 01e1990eefa4387839ac404089e4ffa32922ceaa30a1747c08a931c67706bcf29fed9d25e30c0faa36bba4f460821290e7973ed6b657d2cd95e126caaf853f81
-EBUILD blis-0.9.0.ebuild 2812 BLAKE2B e1c33281f09b658b12655532c3801c975fe6b9490a3354c30d43ac6eed862cc7de0e4b1d0af54ceee712859c0e490ed68a1122f875e1f4c73b69912f08f11bc5 SHA512 6e78b1779463e84da8779c282ce8338f2c2f5b56b2578485e8c7402867ecb01740803a62c528ef5e7fdd09a792b815be6b4cdacc6854468ec58bd339f5c03606
+DIST blis-1.0.tar.gz 15714356 BLAKE2B 7e9b6132ab556adf7ccb2d1bff6c5195eb2f48a9193a6df57d409e25b42f1aaa64f053f97996a6467ad42cbe5848c3689f3e6c501579d5d1083523ca9ed52ce1 SHA512 91cd2a2944762e584f11cb931ba11c4b296e93040b553f105ba8579d748a49cfcb6db8ae2ce1b5a537c0ae88182c9d212a4a5daa757ca4d0a7beee552d2eb55c
+EBUILD blis-0.9.0-r1.ebuild 3810 BLAKE2B 2d366602aa9fc7238b20d616a382a028bb197c5c154646e4cbdd6356ebb6f1e17fe805ccc293abb0f4213b3d9b4ec58a3b103d7ed62a0483f335c5cd34f902fb SHA512 b6dd44034a305115217476661db3867de3e03b76bf14e25c466b36893e0bd95cabb0f408c9be7fed6fc2eb5ddbf7fab8ec499220e4ad496e1bff922ad38838ee
+EBUILD blis-1.0.ebuild 3859 BLAKE2B 54759081c57f4c63c7c9c9335971247ba86fd686b91e93c739b722913ec071ceef10053b390e00b386ce1a8c6b4311d2d1a8564a6113cae3dc68f404b2c0c919 SHA512 48528822e265ab79eb95781eb2406dd620e3ca17d8596d72b44cb02a40bbc267f8e6ff9a791c68ef78ec9b53bf012d41309f8b3903889b9dbf4f56410a0ae45c
MISC metadata.xml 1675 BLAKE2B 9051257d6a1e8e53c9e5433ed62c1b6799cac15ec21f55821f4274cf942545adf207c5c1a862ef8d0f7cb3919337915bc27f26ff1e6a46d30bfabd0b42894420 SHA512 e7c13ff56e901ab78da5bb0dcba586c27605c2b8e20758753ba451b7f6feff36bf2e1434578246ad4415db1f37fb65a232362b9a4f436e0ab2233d069fb8c61f
diff --git a/sci-libs/blis/blis-0.9.0.ebuild b/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() {
diff --git a/sci-libs/blis/blis-1.0.ebuild b/sci-libs/blis/blis-1.0.ebuild
new file mode 100644
index 000000000000..ecbc704021e8
--- /dev/null
+++ b/sci-libs/blis/blis-1.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="BLAS-like Library Instantiation Software Framework"
+HOMEPAGE="https://github.com/flame/blis"
+SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+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 )"
+
+DEPEND="
+ eselect-ldso? (
+ !app-eselect/eselect-cblas
+ >=app-eselect/eselect-blas-0.2
+ )"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6.0-blas-provider.patch
+ # to prevent QA Notice: pkg-config files with wrong LDFLAGS detected
+ "${FILESDIR}"/${PN}-0.8.1-pkg-config.patch
+ "${FILESDIR}"/${PN}-0.9.0-rpath.patch
+ "${FILESDIR}"/${PN}-1.0-no-helper-headers.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=()
+ # determine flags
+ if use openmp; then
+ BLIS_FLAGS+=( -t openmp )
+ elif use pthread; then
+ BLIS_FLAGS+=( -t pthreads )
+ else
+ BLIS_FLAGS+=( -t no )
+ fi
+ use 64bit-index && BLIS_FLAGS+=( -b 64 -i 64 )
+
+ # This is not an autotools configure file. We don't use econf here.
+ CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ./configure \
+ --enable-verbose-make \
+ --prefix="${BROOT}"/usr \
+ --libdir="${BROOT}"/usr/$(get_libdir) \
+ $(use_enable static-libs static) \
+ --enable-blas \
+ --enable-cblas \
+ "${BLIS_FLAGS[@]}" \
+ --enable-shared \
+ $(get_confname) || die
+}
+
+src_compile() {
+ DEB_LIBBLAS=libblas.so.3 DEB_LIBCBLAS=libcblas.so.3 \
+ LDS_BLAS="${FILESDIR}"/blas.lds LDS_CBLAS="${FILESDIR}"/cblas.lds \
+ default
+}
+
+src_test() {
+ LD_LIBRARY_PATH=lib/$(get_confname) emake testblis-fast
+ ./testsuite/check-blistest.sh ./output.testsuite || die
+}
+
+src_install() {
+ default
+ use doc && dodoc README.md docs/*.md
+
+ if use eselect-ldso; then
+ insinto /usr/$(get_libdir)/blas/blis
+ doins lib/*/lib{c,}blas.so.3
+ dosym libblas.so.3 usr/$(get_libdir)/blas/blis/libblas.so
+ dosym libcblas.so.3 usr/$(get_libdir)/blas/blis/libcblas.so
+ fi
+}
+
+pkg_postinst() {
+ use eselect-ldso || return
+
+ local libdir=$(get_libdir) me="blis"
+
+ # check blas
+ eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+ 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
+ elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+ elog "To use blas [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect blas set ${libdir} ${me}"
+ fi
+}
+
+pkg_postrm() {
+ use eselect-ldso && eselect blas validate
+}
diff --git a/sci-libs/blis/files/blis-1.0-no-helper-headers.patch b/sci-libs/blis/files/blis-1.0-no-helper-headers.patch
new file mode 100644
index 000000000000..ec747824e7dc
--- /dev/null
+++ b/sci-libs/blis/files/blis-1.0-no-helper-headers.patch
@@ -0,0 +1,13 @@
+Don't install one-line "helper header" cblas.h into /usr/include,
+as it conflicts with sci-libs/lapack.
+--- a/Makefile
++++ b/Makefile
+@@ -1052,7 +1052,7 @@ endif
+
+ # --- Install header rules ---
+
+-install-headers: check-env $(MK_INCL_DIR_INST) install-helper-headers
++install-headers: check-env $(MK_INCL_DIR_INST)
+
+ # Rule for installing main headers.
+ $(MK_INCL_DIR_INST): $(HEADERS_TO_INSTALL) $(CONFIG_MK_FILE)