* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2021-04-25 23:29 Alessandro Barbieri
0 siblings, 0 replies; 11+ messages in thread
From: Alessandro Barbieri @ 2021-04-25 23:29 UTC (permalink / raw
To: gentoo-commits
commit: 497a558f1db8681db4b063270b73ea8fcce6aeb9
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr 25 23:24:41 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Apr 25 23:29:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=497a558f
sys-cluster/sionlib: fix stuff
going to close the bug to trigger rebuild
Closes: https://bugs.gentoo.org/785724
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/sionlib/sionlib-1.7.6.ebuild | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/sys-cluster/sionlib/sionlib-1.7.6.ebuild b/sys-cluster/sionlib/sionlib-1.7.6.ebuild
index e1959dcc2..50b58c797 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
+#TODO: fix installation in multilib
#TODO: cuda sionfwd msa
#--enable-sionfwd=/path/to/sionfwd
#--msa=(hostname-regex|deep-est-sdv)] MSA aware collective operations for the given system
@@ -22,7 +23,6 @@ IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
PATCHES=( "${FILESDIR}/respect-flags.patch" )
RDEPEND="
- ${PYTHON_DEPS}
mpi? ( virtual/mpi )
ompi? (
sys-libs/libomp
@@ -30,7 +30,10 @@ RDEPEND="
)
openmp? ( sys-libs/libomp )
"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ ${PYTHON_DEPS}
+"
BDEPEND="doc? ( app-doc/doxygen )"
S="${WORKDIR}/${PN}"
@@ -59,7 +62,7 @@ src_configure() {
local myconf=(
--disable-mic
- --prefix="${EPREFIX}/usr"
+ --prefix="${T}/prefix/usr"
)
#custom configure?
@@ -78,25 +81,22 @@ src_configure() {
}
src_compile() {
+ export VARTEXFONTS="${T}/fonts"
default
- use doc && doxygen -u doxy && doxygen doxy || die
+ use doc && doxygen -u doxy || die
+ use doc && doxygen doxy || die
}
src_install() {
- sed -e "s|\${PREFIX}|${D}/usr|g" -i mf/common.defs || die
- sed -e "s|\$(PREFIX)|${D}/usr|g" -i src/utils/Makefile || die
- sed \
- -e "s|\$(PREFIX)|${D}/usr|g" \
- -e "s|\${PREFIX}|${D}/usr|g" \
- -i mf/RealMakefile || die
-
+ mkdir -p "${T}/prefix/usr/share/doc/${PF}" || die
default
- use doc && dodoc -r doc/html
-
- mv "${ED}/usr/examples" "${ED}/usr/share/doc/${PF}/" || die
+ mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die
+ rsync -ravXHA "${T}/prefix/usr" "${ED}/" || die
docompress -x "/usr/share/doc/${PF}/examples"
- docompress -x "/usr/share/doc/${PF}/html"
+
+ use doc && dodoc -r doc/html
+ use doc && docompress -x "/usr/share/doc/${PF}/html"
#TODO: build shared libs
#find "${ED}" -name '*.a' -delete || die
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2021-04-26 19:57 Alessandro Barbieri
0 siblings, 0 replies; 11+ messages in thread
From: Alessandro Barbieri @ 2021-04-26 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 1c0de12e40e4e4fbd43c57204d5c7a1ae6e97bfb
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Apr 26 19:55:14 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Mon Apr 26 19:57:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1c0de12e
sys-cluster/sionlib: move 64 bit libs into lib64
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../sionlib/{sionlib-1.7.6.ebuild => sionlib-1.7.6-r1.ebuild} | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/sionlib/sionlib-1.7.6.ebuild b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
similarity index 91%
rename from sys-cluster/sionlib/sionlib-1.7.6.ebuild
rename to sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index cc8336e88..da6004314 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -15,7 +15,6 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
-#TODO: fix installation in multilib
#TODO: cuda sionfwd msa
#--enable-sionfwd=/path/to/sionfwd
#--msa=(hostname-regex|deep-est-sdv)] MSA aware collective operations for the given system
@@ -94,6 +93,16 @@ src_install() {
default
mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die
+
+ #move 64 bit libraries in lib64
+ libs64=( "${T}"/prefix/usr/lib/*64* )
+ if [[ ${#libs64[@]} -gt 0 ]]; then
+ mkdir "${T}/prefix/usr/lib64" || die
+ for l in "${libs64[@]}" ; do
+ mv "${l}" "${T}/prefix/usr/lib64/" || die
+ done
+ fi
+
rsync -ravXHA "${T}/prefix/usr" "${ED}/" || die
docompress -x "/usr/share/doc/${PF}/examples"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2021-04-26 19:57 Alessandro Barbieri
0 siblings, 0 replies; 11+ messages in thread
From: Alessandro Barbieri @ 2021-04-26 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 8c35571c6b354d6cd8546d17ada65e3525c94672
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Apr 26 19:07:12 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Mon Apr 26 19:57:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8c35571c
sys-cluster/sionlib: fix doc building
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/sionlib/sionlib-1.7.6.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/sionlib/sionlib-1.7.6.ebuild b/sys-cluster/sionlib/sionlib-1.7.6.ebuild
index 50b58c797..cc8336e88 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6.ebuild
@@ -83,8 +83,10 @@ src_configure() {
src_compile() {
export VARTEXFONTS="${T}/fonts"
default
- use doc && doxygen -u doxy || die
- use doc && doxygen doxy || die
+ if use doc ; then
+ doxygen -u doxy || die
+ doxygen doxy || die
+ fi
}
src_install() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2021-05-16 14:06 Anna Vyalkova
0 siblings, 0 replies; 11+ messages in thread
From: Anna Vyalkova @ 2021-05-16 14:06 UTC (permalink / raw
To: gentoo-commits
commit: e41e695aadbca19c4c09e8c319073e625c5a126f
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Sun May 16 14:00:50 2021 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun May 16 14:05:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e41e695a
sys-cluster/sionlib: fix compiler vars
Closes: https://bugs.gentoo.org/785727
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>
sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index da6004314..4b8328064 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -45,14 +45,11 @@ pkg_setup() {
}
src_configure() {
- export AR=$(tc-getAR)
- export CC=$(tc-getCC)
- export CXX=$(tc-getCXX)
+ tc-export AR CC CXX F77 FC
export MPICC=/usr/bin/mpicc
export MPICXX=/usr/bin/mpicxx
export MPIF77=/usr/bin/mpif77
export MPIF90=/usr/bin/mpif90
- export F77=$(tc-getF77)
export F90=$(tc-getFC)
export OMPF77=$(tc-getF77)
export OMPF90=$(tc-getFC)
@@ -81,7 +78,8 @@ src_configure() {
src_compile() {
export VARTEXFONTS="${T}/fonts"
- default
+ emake C_AR=$(tc-getAR)
+
if use doc ; then
doxygen -u doxy || die
doxygen doxy || die
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2021-05-16 16:11 Anna Vyalkova
0 siblings, 0 replies; 11+ messages in thread
From: Anna Vyalkova @ 2021-05-16 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 5566e687462c848511bc19f894d33497808a1891
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Sun May 16 15:09:52 2021 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun May 16 16:11:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5566e687
sys-cluster/sionlib: fix tests
Closes: https://bugs.gentoo.org/786204
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>
sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index 4b8328064..bd43b5fa2 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -44,6 +44,11 @@ pkg_setup() {
fortran-2_pkg_setup
}
+src_prepare() {
+ default
+ sed 's/CXXFLAGS = $(CXXFLAGS)/CXXFLAGS = /' -i test/serial/Makefile || die
+}
+
src_configure() {
tc-export AR CC CXX F77 FC
export MPICC=/usr/bin/mpicc
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2021-05-18 22:13 Anna Vyalkova
0 siblings, 0 replies; 11+ messages in thread
From: Anna Vyalkova @ 2021-05-18 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 7a29a09110c5d2834ad092cf25eba1d366692147
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Tue May 18 22:12:37 2021 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Tue May 18 22:12:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7a29a091
sys-cluster/sionlib: compiler vars + docs eclass
Closes: https://bugs.gentoo.org/790755
Closes: https://bugs.gentoo.org/790752
Closes: https://bugs.gentoo.org/785730
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>
sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index bd43b5fa2..132bbc341 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -3,9 +3,11 @@
EAPI=7
+DOCS_BUILDER="doxygen"
+DOCS_CONFIG_NAME="doxy"
FORTRAN_NEEDED="fortran"
PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs
DESCRIPTION="Scalable I/O library for parallel access to task-local files"
HOMEPAGE="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html"
@@ -14,7 +16,7 @@ SRC_URI="http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> ${P
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
+IUSE="+cxx debug doc examples +fortran +mpi +ompi +openmp +parutils +pthreads python"
#TODO: cuda sionfwd msa
#--enable-sionfwd=/path/to/sionfwd
#--msa=(hostname-regex|deep-est-sdv)] MSA aware collective operations for the given system
@@ -33,7 +35,6 @@ DEPEND="
${RDEPEND}
${PYTHON_DEPS}
"
-BDEPEND="doc? ( app-doc/doxygen )"
S="${WORKDIR}/${PN}"
pkg_setup() {
@@ -47,6 +48,7 @@ pkg_setup() {
src_prepare() {
default
sed 's/CXXFLAGS = $(CXXFLAGS)/CXXFLAGS = /' -i test/serial/Makefile || die
+ sed 's/`gcc/`${CC}/' -i config/determine-compiler-version.sh || die
}
src_configure() {
@@ -83,21 +85,21 @@ src_configure() {
src_compile() {
export VARTEXFONTS="${T}/fonts"
- emake C_AR=$(tc-getAR)
-
- if use doc ; then
- doxygen -u doxy || die
- doxygen doxy || die
- fi
+ emake C_AR=$(tc-getAR) F90=$(tc-getFC)
+ docs_compile
}
src_install() {
mkdir -p "${T}/prefix/usr/share/doc/${PF}" || die
default
- mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die
+ if use examples ; then
+ mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die
+ else
+ rm -r "${T}/prefix/usr/examples" || die
+ fi
- #move 64 bit libraries in lib64
+ # move 64 bit libraries to lib64
libs64=( "${T}"/prefix/usr/lib/*64* )
if [[ ${#libs64[@]} -gt 0 ]]; then
mkdir "${T}/prefix/usr/lib64" || die
@@ -109,9 +111,6 @@ src_install() {
rsync -ravXHA "${T}/prefix/usr" "${ED}/" || die
docompress -x "/usr/share/doc/${PF}/examples"
- use doc && dodoc -r doc/html
- use doc && docompress -x "/usr/share/doc/${PF}/html"
-
#TODO: build shared libs
#find "${ED}" -name '*.a' -delete || die
find "${ED}" -name '*.la' -delete || die
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2021-06-11 15:23 Alessandro Barbieri
0 siblings, 0 replies; 11+ messages in thread
From: Alessandro Barbieri @ 2021-06-11 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 5f11bdd50c34d6f82bd0d4a943f6c583fca1b00f
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jun 3 22:49:37 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Fri Jun 11 15:23:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5f11bdd5
sys-cluster/sionlib: don't enforce libomp
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index 132bbc341..a63c7bc0f 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -26,10 +26,10 @@ PATCHES=( "${FILESDIR}/respect-flags.patch" )
RDEPEND="
mpi? ( virtual/mpi )
ompi? (
- sys-libs/libomp
+ || ( sys-devel/gcc:*[openmp] sys-libs/libomp )
virtual/mpi
)
- openmp? ( sys-libs/libomp )
+ openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) )
"
DEPEND="
${RDEPEND}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2021-07-26 23:28 Alessandro Barbieri
0 siblings, 0 replies; 11+ messages in thread
From: Alessandro Barbieri @ 2021-07-26 23:28 UTC (permalink / raw
To: gentoo-commits
commit: 52790b21744761c6bf53a906a900132c231e1f85
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Jul 26 23:21:36 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Mon Jul 26 23:28:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=52790b21
sys-cluster/sionlib: add sionfwd use
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/sionlib/metadata.xml | 7 ++++++-
.../{sionlib-1.7.7-r1.ebuild => sionlib-1.7.7-r2.ebuild} | 14 ++++++++++----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/sys-cluster/sionlib/metadata.xml b/sys-cluster/sionlib/metadata.xml
index 32002cf2d..0f8c4f1a8 100644
--- a/sys-cluster/sionlib/metadata.xml
+++ b/sys-cluster/sionlib/metadata.xml
@@ -18,17 +18,22 @@ Both, the estimated chunk size and file system block size are used to align indi
SIONlib provides two different interfaces: one for parallel access (with implementations for different parallel programming technologies such as MPI, OpenMP and hybrid MPI+OpenMP) and one for sequential access which is also used internally by the SIONlib utilities.
</longdescription>
+ <upstream>
+ <bugs-to>https://gitlab.jsc.fz-juelich.de/cstao-public/SIONlib/SIONlib/-/issues</bugs-to>
+ </upstream>
<use>
<!--<flag name="cuda">enable CUDA aware interface</flag>-->
<flag name="cxx">Enable C++ support</flag>
<flag name="debug">enable SIONlib debug</flag>
+ <flag name="deep-est-sdv">deep-est-sdv collector selection plug-in for MSA-aware collective I/O</flag>
<flag name="fortran">Enable Fortran support</flag>
+ <flag name="hostname-regex">hostname-regex collector selection plug-in for MSA-aware collective I/O</flag>
<flag name="mpi">enable mpi</flag>
<flag name="python">enable python support</flag>
<flag name="ompi">enable hybrid openmp mpi</flag>
<flag name="openmp">enable openmp</flag>
<flag name="parutils">Enable compilation of parutils (used for benchmarking)</flag>
<flag name="pthreads">configure SIONlib to use pthreads for locking</flag>
- <!--<flag name="sionfwd">enable I/O forwarding with SIONfwd</flag>-->
+ <flag name="sionfwd">enable I/O forwarding with <pkg>sys-cluster/SIONfwd</pkg></flag>
</use>
</pkgmetadata>
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r1.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
similarity index 87%
rename from sys-cluster/sionlib/sionlib-1.7.7-r1.ebuild
rename to sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
index cd15e7ad6..87062ea8a 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
@@ -18,11 +18,9 @@ S="${WORKDIR}/${PN}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="+cxx debug doc examples +fortran +mpi +ompi +openmp +parutils +pthreads python"
-#TODO: cuda sionfwd msa
-#--enable-sionfwd=/path/to/sionfwd
-#--msa=(hostname-regex|deep-est-sdv)] MSA aware collective operations for the given system
+IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi +openmp +parutils +pthreads python sionfwd" #cuda
+REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
RDEPEND="
@@ -32,6 +30,7 @@ RDEPEND="
virtual/mpi
)
openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) )
+ sionfwd? ( sys-cluster/SIONfwd )
"
DEPEND="
${RDEPEND}
@@ -64,8 +63,14 @@ src_configure() {
append-fflags -fallow-argument-mismatch
+ local msa="none"
+ use deep-est-sdv && msa="deep-est-sdv"
+ use hostname-regex && msa="hostname-regex"
+
local myconf=(
+ --disable-ime
--disable-mic
+ --msa="${msa}"
--prefix="${T}/prefix/usr"
)
@@ -80,6 +85,7 @@ src_configure() {
use debug && myconf+=( "--enable-debug" )
use python && myconf+=( "--enable-python=3" )
+ use sionfwd && myconf+=( "--enable-sionfwd=${EPREFIX}/usr" )
./configure "${myconf[@]}" || die
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2021-07-26 23:28 Alessandro Barbieri
0 siblings, 0 replies; 11+ messages in thread
From: Alessandro Barbieri @ 2021-07-26 23:28 UTC (permalink / raw
To: gentoo-commits
commit: ae80b56104835cc82b25a753d1013044d5c8a643
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Jul 26 23:28:10 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Mon Jul 26 23:28:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae80b561
sys-cluster/sionlib: remove broken --disable
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
index 87062ea8a..ba466e09b 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
@@ -68,7 +68,6 @@ src_configure() {
use hostname-regex && msa="hostname-regex"
local myconf=(
- --disable-ime
--disable-mic
--msa="${msa}"
--prefix="${T}/prefix/usr"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2022-05-28 12:53 Alessandro Barbieri
0 siblings, 0 replies; 11+ messages in thread
From: Alessandro Barbieri @ 2022-05-28 12:53 UTC (permalink / raw
To: gentoo-commits
commit: 28619647b773f4f11aa6e88a54935bbb495b61da
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat May 28 12:45:31 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sat May 28 12:53:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=28619647
sys-cluster/sionlib: enable py3.11
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
index 3cc5f940f..06981810e 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
DOCS_BUILDER="doxygen"
DOCS_CONFIG_NAME="doxy"
FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
@ 2022-06-10 3:58 Alessandro Barbieri
0 siblings, 0 replies; 11+ messages in thread
From: Alessandro Barbieri @ 2022-06-10 3:58 UTC (permalink / raw
To: gentoo-commits
commit: 58c97e9106f584db6d57c33cfc4d450fc72f3b47
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jun 9 22:47:12 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Fri Jun 10 03:58:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=58c97e91
sys-cluster/sionlib: fix mpich detection
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild | 38 +++++++++++++++++++++++------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
index 06981810e..4e0eba149 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
@@ -8,7 +8,7 @@ DOCS_CONFIG_NAME="doxy"
FORTRAN_NEEDED="fortran"
PYTHON_COMPAT=( pypy3 python3_{8..11} )
-inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+inherit docs edo flag-o-matic fortran-2 python-any-r1 toolchain-funcs
DESCRIPTION="Scalable I/O library for parallel access to task-local files"
HOMEPAGE="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html"
@@ -22,10 +22,6 @@ IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi +o
RDEPEND="
mpi? ( virtual/mpi )
- ompi? (
- || ( sys-devel/gcc:*[openmp] sys-libs/libomp )
- virtual/mpi
- )
openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) )
sionfwd? ( sys-cluster/SIONfwd )
"
@@ -34,7 +30,10 @@ DEPEND="
${PYTHON_DEPS}
"
-REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
+REQUIRED_USE="
+ ompi? ( mpi openmp )
+ ?? ( hostname-regex deep-est-sdv )
+"
PATCHES=(
"${FILESDIR}/${PN}-respect-flags-v3.patch"
"${FILESDIR}/${PN}-build-shared-libraries.patch"
@@ -43,7 +42,6 @@ PATCHES=(
pkg_setup() {
FORTRAN_NEED_OPENMP=0
use openmp && FORTRAN_NEED_OPENMP=1
- use ompi && FORTRAN_NEED_OPENMP=1
fortran-2_pkg_setup
}
@@ -77,7 +75,11 @@ src_configure() {
#custom configure?
use cxx || myconf+=( "--disable-cxx" )
use fortran || myconf+=( "--disable-fortran" )
- use mpi || myconf+=( "--disable-mpi" )
+ if use mpi; then
+ myconf+=( "--mpi=$(detect_mpi_implementation || die)" )
+ else
+ myconf+=( "--disable-mpi" )
+ fi
use ompi || myconf+=( "--disable-ompi" )
use openmp || myconf+=( "--disable-omp" )
use parutils || myconf+=( "--disable-parutils" )
@@ -126,3 +128,23 @@ src_install() {
find "${ED}" -name '*.la' -delete || die
}
+
+detect_mpi_implementation() {
+ cat > testmpi.c <<- EOF
+#include "mpi.h"
+#include "stdio.h"
+
+int main(){
+ #ifdef OPEN_MPI
+ printf("%s","openmpi");
+ #endif
+
+ #ifdef MPICH
+ printf("%s%i","mpich",MPICH_NAME);
+ #endif
+ return 0;
+}
+EOF
+ edo ${CC} testmpi.c -o testmpi
+ ./testmpi || die
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-06-10 3:58 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-26 23:28 [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/ Alessandro Barbieri
-- strict thread matches above, loose matches on Subject: below --
2022-06-10 3:58 Alessandro Barbieri
2022-05-28 12:53 Alessandro Barbieri
2021-07-26 23:28 Alessandro Barbieri
2021-06-11 15:23 Alessandro Barbieri
2021-05-18 22:13 Anna Vyalkova
2021-05-16 16:11 Anna Vyalkova
2021-05-16 14:06 Anna Vyalkova
2021-04-26 19:57 Alessandro Barbieri
2021-04-26 19:57 Alessandro Barbieri
2021-04-25 23:29 Alessandro Barbieri
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox