Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/nanos6/
Date: Sat, 21 Aug 2021 02:01:45
Message-Id: 1629511186.91ed6bc2f5250ffbdf212473567f8295d6303ac8.Alessandro-Barbieri@gentoo
1 commit: 91ed6bc2f5250ffbdf212473567f8295d6303ac8
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Sat Aug 21 01:59:46 2021 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Sat Aug 21 01:59:46 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=91ed6bc2
7
8 sys-cluster/nanos6: EAPI8, mercurium support
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 sys-cluster/nanos6/metadata.xml | 4 +---
13 .../{nanos6-2.6.ebuild => nanos6-2.6-r1.ebuild} | 25 ++++++++++++++--------
14 2 files changed, 17 insertions(+), 12 deletions(-)
15
16 diff --git a/sys-cluster/nanos6/metadata.xml b/sys-cluster/nanos6/metadata.xml
17 index c937f87cc..8fbd76dea 100644
18 --- a/sys-cluster/nanos6/metadata.xml
19 +++ b/sys-cluster/nanos6/metadata.xml
20 @@ -10,16 +10,14 @@
21 <remote-id type="github">bsc-pm/nanos6</remote-id>
22 </upstream>
23 <use>
24 - <flag name="cluster">Enable OmpSs@Cluster support. This requires an MPI version that supports MPI_THREAD_MULTIPLE to be present in your environment</flag>
25 <!--<flag name="cuda">enable CUDA</flag>-->
26 <flag name="debug">enable extra assertions and checks in debug - may cause significant slowdown</flag>
27 <flag name="dlb">enable dynamic management and sharing of computing resources</flag>
28 <flag name="execution-workflow">Enable execution using the Execution Workflow</flag>
29 <flag name="extrae">to generate execution traces for offline performance analysis with paraver</flag>
30 <!--<flag name="jemalloc">use jemalloc as the default memory allocator, providing better performance than the default glibc implementation</flag>-->
31 - <!--<flag name="k1om">specify the installation prefix of the k1om GNU compilers</flag>-->
32 <flag name="memkind">Add support for <pkg>dev-libs/memkind</pkg> in memory allocator</flag>
33 - <!--<flag name="mercurium">specify the installation prefix of the Nanos6 Mercurium compiler</flag>-->
34 + <flag name="mercurium">Enable <pkg>sys-cluster/mcxx</pkg> support</flag>
35 <flag name="papi">enable <pkg>dev-libs/papi</pkg> support</flag>
36 <!--<flag name="pqos"> to generate real-time statistics of hardware counters</flag>-->
37 <flag name="unwind">to generate sample-based profiling</flag>
38
39 diff --git a/sys-cluster/nanos6/nanos6-2.6.ebuild b/sys-cluster/nanos6/nanos6-2.6-r1.ebuild
40 similarity index 83%
41 rename from sys-cluster/nanos6/nanos6-2.6.ebuild
42 rename to sys-cluster/nanos6/nanos6-2.6-r1.ebuild
43 index 546528e60..ca6d8f985 100644
44 --- a/sys-cluster/nanos6/nanos6-2.6.ebuild
45 +++ b/sys-cluster/nanos6/nanos6-2.6-r1.ebuild
46 @@ -1,7 +1,7 @@
47 # Copyright 2019-2021 Gentoo Authors
48 # Distributed under the terms of the GNU General Public License v2
49
50 -EAPI=7
51 +EAPI=8
52
53 inherit autotools
54
55 @@ -9,13 +9,13 @@ DESCRIPTION="runtime that implements the OmpSs-2 parallel programming model"
56 HOMEPAGE="https://github.com/bsc-pm/nanos6"
57 SRC_URI="https://github.com/bsc-pm/nanos6/archive/refs/tags/version-${PV}.tar.gz -> ${P}.tar.gz"
58 S="${WORKDIR}/${PN}-version-${PV}"
59 +
60 LICENSE="GPL-3"
61 SLOT="0"
62 KEYWORDS="~amd64"
63 -IUSE="cluster debug dlb execution-workflow extrae memkind papi unwind"
64 -#chrono-arch build fail
65 +IUSE="debug dlb execution-workflow extrae memkind mercurium papi unwind"
66 #jemalloc require custom stuff
67 -#TODO: cuda pqos mercurium k1om babeltrace2
68 +#TODO: cuda pqos babeltrace2
69 #TODO: llvm-libunwind
70
71 RDEPEND="
72 @@ -24,15 +24,15 @@ RDEPEND="
73 sys-process/numactl
74 virtual/libelf
75
76 - cluster? ( virtual/mpi )
77 dlb? ( sys-cluster/dlb )
78 extrae? ( sys-cluster/extrae[nanos] )
79 memkind? ( dev-libs/memkind )
80 + mercurium? ( sys-cluster/mcxx[ompss2] )
81 papi? ( dev-libs/papi )
82 unwind? ( sys-libs/libunwind )
83 "
84 +# jemalloc? ( dev-libs/jemalloc )
85 DEPEND="${RDEPEND}"
86 -REQUIRED_USE="cluster? ( execution-workflow )"
87
88 src_prepare() {
89 default
90 @@ -54,12 +54,9 @@ src_configure() {
91 --without-git
92 --without-k1om
93 --without-nanos6-clang
94 - --without-nanos6-mercurium
95 --without-pgi
96
97 - $(use_enable cluster)
98 $(use_enable debug extra-debug)
99 - $(use_enable execution-workflow)
100 )
101 use dlb && myconf+=( "--with-dlb=${EPREFIX}/usr" )
102 use memkind && myconf+=( "--with-memkind=${EPREFIX}/usr" )
103 @@ -74,6 +71,16 @@ src_configure() {
104 else
105 myconf+=( "--without-extrae" )
106 fi
107 +# if use jemalloc; then
108 +# myconf+=( "--with-jemalloc=${EPREFIX}/usr" )
109 +# else
110 +# myconf+=( "--without-jemalloc" )
111 +# fi
112 + if use mercurium; then
113 + myconf+=( "--with-nanos6-mercurium=${EPREFIX}/usr" )
114 + else
115 + myconf+=( "--without-nanos6-mercurium" )
116 + fi
117 if use papi; then
118 myconf+=( "--with-papi=${EPREFIX}/usr" )
119 else