* [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/mfem/
@ 2022-05-25 12:17 Alessandro Barbieri
0 siblings, 0 replies; 5+ messages in thread
From: Alessandro Barbieri @ 2022-05-25 12:17 UTC (permalink / raw
To: gentoo-commits
commit: e637b097f31bc596ae4fc96e4bb562ecfde21592
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed May 25 12:16:06 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed May 25 12:17:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e637b097
sci-libs/mfem: multiple fixes
Respect multilib
Allow multiple amdgpu implementations
Fix include path discovery
Closes: https://bugs.gentoo.org/847355
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sci-libs/mfem/mfem-4.4.ebuild | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/sci-libs/mfem/mfem-4.4.ebuild b/sci-libs/mfem/mfem-4.4.ebuild
index 4df7996a6..166720d0e 100644
--- a/sci-libs/mfem/mfem-4.4.ebuild
+++ b/sci-libs/mfem/mfem-4.4.ebuild
@@ -86,7 +86,7 @@ PATCHES=( "${FILESDIR}/${P}-bump-cmake-version.patch" )
RESTRICT="!test? ( test )"
DOCS=( README CHANGELOG CITATION.cff )
REQUIRED_USE="
- hip? ( ^^ ( ${IUSE_AMDGPU/+/} ) )
+ hip? ( || ( ${IUSE_AMDGPU/+/} ) )
mpi? ( metis )
mumps? ( mpi )
petsc? ( mpi )
@@ -97,18 +97,18 @@ REQUIRED_USE="
#pumi? ( mpi )
#?? ( cuda hip )
-src_prepare() {
- sed -e "s|\"\${CMAKE_INSTALL_PREFIX}/lib\"|\"\${CMAKE_INSTALL_PREFIX}/$(get_libdir)\"|g" -i config/cmake/modules/MfemCmakeUtilities.cmake || die
- cmake_src_prepare
-}
-
src_configure() {
- for u in ${IUSE_AMDGPU} ; do
- if use ${u} ; then
- export HIP_ARCH="${u/amdgpu_/}"
- break
- fi
- done
+ if use hip ; then
+ HIP_ARCH=""
+ for u in ${IUSE_AMDGPU} ; do
+ if use ${u} ; then
+ HIP_ARCH="${HIP_ARCH},${u/amdgpu_/}"
+ fi
+ done
+ # remove first character (,)
+ HIP_ARCH="${HIP_ARCH:1}"
+ export HIP_ARCH
+ fi
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
-DMFEM_ENABLE_MINIAPPS=ON
@@ -156,10 +156,10 @@ src_configure() {
-DMFEM_USE_ZLIB=$(usex zlib)
)
if use codipack; then
- mycmakeargs+=( "-DCODIPACK_INCLUDE_DIRS=${EPREFIX}/usr/include/codi" )
+ mycmakeargs+=( "-DCODIPACK_INCLUDE_DIR=${EPREFIX}/usr/include/codi" )
fi
if use mpi; then
- mycmakeargs+=( "-DHYPRE_INCLUDE_DIRS=${EPREFIX}/usr/include/hypre" )
+ mycmakeargs+=( "-DHYPRE_INCLUDE_DIR=${EPREFIX}/usr/include/hypre" )
fi
if use petsc; then
mycmakeargs+=( "-DPETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc" )
@@ -179,4 +179,7 @@ src_configure() {
src_install() {
cmake_src_install
einstalldocs
+ # https://github.com/mfem/mfem/issues/3019
+ mv "${ED}/usr/lib" _lib || die
+ mv _lib "${ED}/usr/$(get_libdir)" || die
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/mfem/
@ 2022-05-25 19:21 Alessandro Barbieri
0 siblings, 0 replies; 5+ messages in thread
From: Alessandro Barbieri @ 2022-05-25 19:21 UTC (permalink / raw
To: gentoo-commits
commit: 0a38c02adf83dd15322fbba40cae2d2687859db1
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed May 25 19:21:13 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed May 25 19:21:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0a38c02a
sci-libs/mfem: cleanup AMDGPU
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sci-libs/mfem/mfem-4.4.ebuild | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sci-libs/mfem/mfem-4.4.ebuild b/sci-libs/mfem/mfem-4.4.ebuild
index 166720d0e..a764fab4a 100644
--- a/sci-libs/mfem/mfem-4.4.ebuild
+++ b/sci-libs/mfem/mfem-4.4.ebuild
@@ -16,12 +16,11 @@ KEYWORDS="~amd64"
LICENSE="BSD"
SLOT="0"
IUSE_AMDGPU="
- amdgpu_gfx600 amdgpu_gfx601 amdgpu_gfx602
- amdgpu_gfx700 amdgpu_gfx701 amdgpu_gfx702 amdgpu_gfx703 amdgpu_gfx704 amdgpu_gfx705
- amdgpu_gfx801 amdgpu_gfx802 amdgpu_gfx803 amdgpu_gfx805 amdgpu_gfx810
- amdgpu_gfx900 amdgpu_gfx902 amdgpu_gfx904 amdgpu_gfx906 amdgpu_gfx908 amdgpu_gfx909 amdgpu_gfx90a amdgpu_gfx90c amdgpu_gfx940
- amdgpu_gfx1010 amdgpu_gfx1011 amdgpu_gfx1012 amdgpu_gfx1013 amdgpu_gfx1030 amdgpu_gfx1031 amdgpu_gfx1032 amdgpu_gfx1033 amdgpu_gfx1034 amdgpu_gfx1035 amdgpu_gfx1036
- amdgpu_gfx1100 amdgpu_gfx1101 amdgpu_gfx1102 amdgpu_gfx1103
+ amdgpu_gfx701 amdgpu_gfx702 amdgpu_gfx704
+ amdgpu_gfx802 amdgpu_gfx803 amdgpu_gfx805 amdgpu_gfx810
+ amdgpu_gfx900 amdgpu_gfx904 amdgpu_gfx906 amdgpu_gfx908 amdgpu_gfx909 amdgpu_gfx90a amdgpu_gfx940
+ amdgpu_gfx1010 amdgpu_gfx1011 amdgpu_gfx1012 amdgpu_gfx1030 amdgpu_gfx1031 amdgpu_gfx1032 amdgpu_gfx1034
+ amdgpu_gfx1100 amdgpu_gfx1101 amdgpu_gfx1102
"
cpuflags="
cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/mfem/
@ 2022-05-25 20:21 Alessandro Barbieri
0 siblings, 0 replies; 5+ messages in thread
From: Alessandro Barbieri @ 2022-05-25 20:21 UTC (permalink / raw
To: gentoo-commits
commit: b9f678efdad79e24846b09fc43b9a8adf497099e
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed May 25 19:58:51 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed May 25 19:58:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b9f678ef
sci-libs/mfem: use https
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sci-libs/mfem/mfem-4.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/mfem/mfem-4.4.ebuild b/sci-libs/mfem/mfem-4.4.ebuild
index a764fab4a..933130a49 100644
--- a/sci-libs/mfem/mfem-4.4.ebuild
+++ b/sci-libs/mfem/mfem-4.4.ebuild
@@ -7,7 +7,7 @@ inherit cmake
DESCRIPTION="Lightweight, general, scalable C++ library for finite element methods"
HOMEPAGE="
- http://mfem.org/
+ https://mfem.org/
https://github.com/mfem/mfem/
"
SRC_URI="https://github.com/mfem/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/mfem/
@ 2022-05-26 21:20 Alessandro Barbieri
0 siblings, 0 replies; 5+ messages in thread
From: Alessandro Barbieri @ 2022-05-26 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 76222a51fc8e67aae4ea44ef0697d144650938a5
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu May 26 15:35:04 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Thu May 26 21:20:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=76222a51
sci-libs/mfem: use ; as separator
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sci-libs/mfem/mfem-4.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/mfem/mfem-4.4.ebuild b/sci-libs/mfem/mfem-4.4.ebuild
index 933130a49..12c00fc51 100644
--- a/sci-libs/mfem/mfem-4.4.ebuild
+++ b/sci-libs/mfem/mfem-4.4.ebuild
@@ -101,10 +101,10 @@ src_configure() {
HIP_ARCH=""
for u in ${IUSE_AMDGPU} ; do
if use ${u} ; then
- HIP_ARCH="${HIP_ARCH},${u/amdgpu_/}"
+ HIP_ARCH="${HIP_ARCH};${u/amdgpu_/}"
fi
done
- # remove first character (,)
+ # remove first character (;)
HIP_ARCH="${HIP_ARCH:1}"
export HIP_ARCH
fi
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/mfem/
@ 2022-05-31 15:36 Alessandro Barbieri
0 siblings, 0 replies; 5+ messages in thread
From: Alessandro Barbieri @ 2022-05-31 15:36 UTC (permalink / raw
To: gentoo-commits
commit: b1d1dfe27ae8cfa80ceead6e5e8938a0634ed9ff
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue May 31 15:28:05 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Tue May 31 15:36:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b1d1dfe2
sci-libs/mfem: remove moonolith cmake arg
Closes: https://bugs.gentoo.org/848042
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sci-libs/mfem/mfem-4.4.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sci-libs/mfem/mfem-4.4.ebuild b/sci-libs/mfem/mfem-4.4.ebuild
index 12c00fc51..5d96fcc42 100644
--- a/sci-libs/mfem/mfem-4.4.ebuild
+++ b/sci-libs/mfem/mfem-4.4.ebuild
@@ -34,7 +34,7 @@ IUSE="
${cpuflags}
benchmark codipack debug examples exceptions ginkgo hip lapack +metis mpfr mpi mumps netcdf openmp petsc slepc sparse ssl strumpack sundials superlu test threadsafe unwind zlib
"
-# TODO: cuda mesquite gslib
+# TODO: cuda mesquite gslib moonolith
RDEPEND="
benchmark? ( dev-cpp/benchmark )
@@ -121,7 +121,6 @@ src_configure() {
-DMFEM_USE_GSLIB=NO
-DMFEM_USE_HIOP=NO
-DMFEM_USE_MKL_CPARDISO=NO
- -DMFEM_USE_MOONOLITH=NO
-DMFEM_USE_OCCA=NO
-DMFEM_USE_PARELAG=NO
-DMFEM_USE_PUMI=NO
@@ -157,6 +156,9 @@ src_configure() {
if use codipack; then
mycmakeargs+=( "-DCODIPACK_INCLUDE_DIR=${EPREFIX}/usr/include/codi" )
fi
+# if use moonolith; then
+# mycmakeargs+=( "-DMFEM_USE_MOONOLITH=ON" )
+# fi
if use mpi; then
mycmakeargs+=( "-DHYPRE_INCLUDE_DIR=${EPREFIX}/usr/include/hypre" )
fi
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-31 15:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-31 15:36 [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/mfem/ Alessandro Barbieri
-- strict thread matches above, loose matches on Subject: below --
2022-05-26 21:20 Alessandro Barbieri
2022-05-25 20:21 Alessandro Barbieri
2022-05-25 19:21 Alessandro Barbieri
2022-05-25 12:17 Alessandro Barbieri
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox