Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/openmpi/files/, sys-cluster/openmpi/
Date: Mon, 03 Jan 2022 00:22:15
Message-Id: 1641169308.1e46e06ae70156fb4d4db508c727b1812e6a7aa4.sam@gentoo
1 commit: 1e46e06ae70156fb4d4db508c727b1812e6a7aa4
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 3 00:20:38 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 3 00:21:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e46e06a
7
8 sys-cluster/openmpi: disable heterogeneous (unsupported, broken)
9
10 Upstream have let us know (thank you!) that heterogeneous should
11 _not_ be used for anything before 5.0.x (which is not out yet).
12
13 We can look at restoring support in the future once it is ready
14 upstream. Upstream documentation has been fixed to reflect this too.
15
16 Closes: https://bugs.gentoo.org/828123
17 Thanks-to: Jeff Squyres <jsquyres <AT> cisco.com>
18 Signed-off-by: Sam James <sam <AT> gentoo.org>
19
20 .../files/openmpi-4.1.2-missing-includes.patch | 32 ----------------------
21 sys-cluster/openmpi/openmpi-4.0.2-r1.ebuild | 6 ++--
22 sys-cluster/openmpi/openmpi-4.0.3-r1.ebuild | 6 ++--
23 sys-cluster/openmpi/openmpi-4.0.4-r1.ebuild | 6 ++--
24 sys-cluster/openmpi/openmpi-4.0.5-r2.ebuild | 6 ++--
25 sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild | 6 ++--
26 sys-cluster/openmpi/openmpi-4.0.6-r1.ebuild | 6 ++--
27 sys-cluster/openmpi/openmpi-4.0.7.ebuild | 6 ++--
28 sys-cluster/openmpi/openmpi-4.1.1-r1.ebuild | 6 ++--
29 sys-cluster/openmpi/openmpi-4.1.2.ebuild | 12 ++++----
30 10 files changed, 30 insertions(+), 62 deletions(-)
31
32 diff --git a/sys-cluster/openmpi/files/openmpi-4.1.2-missing-includes.patch b/sys-cluster/openmpi/files/openmpi-4.1.2-missing-includes.patch
33 deleted file mode 100644
34 index 89abc049df4e..000000000000
35 --- a/sys-cluster/openmpi/files/openmpi-4.1.2-missing-includes.patch
36 +++ /dev/null
37 @@ -1,32 +0,0 @@
38 -https://github.com/open-mpi/ompi/commit/927e9aa97373dac652f9cba4813e6ee609ca2830
39 -https://bugs.gentoo.org/828123
40 -
41 -From: George Bosilca <bosilca@×××××××.edu>
42 -Date: Tue, 23 Nov 2021 14:28:11 -0500
43 -Subject: [PATCH] Fix compile failure with enable-heterogeneous.
44 -
45 -An internal header file was missing, leading to an incomplete type.
46 -
47 -Fixes #9697.
48 -
49 -Signed-off-by: George Bosilca <bosilca@×××××××.edu>
50 ---- a/ompi/mca/coll/base/coll_base_alltoall.c
51 -+++ b/ompi/mca/coll/base/coll_base_alltoall.c
52 -@@ -29,6 +29,7 @@
53 - #include "mpi.h"
54 - #include "ompi/constants.h"
55 - #include "ompi/datatype/ompi_datatype.h"
56 -+#include "opal/datatype/opal_convertor_internal.h"
57 - #include "ompi/communicator/communicator.h"
58 - #include "ompi/mca/coll/coll.h"
59 - #include "ompi/mca/coll/base/coll_tags.h"
60 ---- a/ompi/mca/coll/base/coll_base_alltoallv.c
61 -+++ b/ompi/mca/coll/base/coll_base_alltoallv.c
62 -@@ -31,6 +31,7 @@
63 - #include "mpi.h"
64 - #include "ompi/constants.h"
65 - #include "ompi/datatype/ompi_datatype.h"
66 -+#include "opal/datatype/opal_convertor_internal.h"
67 - #include "ompi/communicator/communicator.h"
68 - #include "ompi/mca/coll/coll.h"
69 - #include "ompi/mca/coll/base/coll_tags.h"
70
71 diff --git a/sys-cluster/openmpi/openmpi-4.0.2-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.2-r1.ebuild
72 index 7dedbcb532f9..6218dc7f7a65 100644
73 --- a/sys-cluster/openmpi/openmpi-4.0.2-r1.ebuild
74 +++ b/sys-cluster/openmpi/openmpi-4.0.2-r1.ebuild
75 @@ -1,4 +1,4 @@
76 -# Copyright 1999-2021 Gentoo Authors
77 +# Copyright 1999-2022 Gentoo Authors
78 # Distributed under the terms of the GNU General Public License v2
79
80 EAPI=7
81 @@ -31,7 +31,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
82 LICENSE="BSD"
83 SLOT="0"
84 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
85 -IUSE="cma cuda cxx fortran heterogeneous ipv6 java romio
86 +IUSE="cma cuda cxx fortran ipv6 java romio
87 ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
88
89 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
90 @@ -111,7 +111,7 @@ multilib_src_configure() {
91 $(use_with cma) \
92 $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
93 $(use_enable romio io-romio) \
94 - $(use_enable heterogeneous) \
95 + --disable-heterogeneous \
96 $(use_enable ipv6) \
97 $(multilib_native_use_enable java mpi-java) \
98 $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
99
100 diff --git a/sys-cluster/openmpi/openmpi-4.0.3-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.3-r1.ebuild
101 index 7dedbcb532f9..6218dc7f7a65 100644
102 --- a/sys-cluster/openmpi/openmpi-4.0.3-r1.ebuild
103 +++ b/sys-cluster/openmpi/openmpi-4.0.3-r1.ebuild
104 @@ -1,4 +1,4 @@
105 -# Copyright 1999-2021 Gentoo Authors
106 +# Copyright 1999-2022 Gentoo Authors
107 # Distributed under the terms of the GNU General Public License v2
108
109 EAPI=7
110 @@ -31,7 +31,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
111 LICENSE="BSD"
112 SLOT="0"
113 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
114 -IUSE="cma cuda cxx fortran heterogeneous ipv6 java romio
115 +IUSE="cma cuda cxx fortran ipv6 java romio
116 ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
117
118 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
119 @@ -111,7 +111,7 @@ multilib_src_configure() {
120 $(use_with cma) \
121 $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
122 $(use_enable romio io-romio) \
123 - $(use_enable heterogeneous) \
124 + --disable-heterogeneous \
125 $(use_enable ipv6) \
126 $(multilib_native_use_enable java mpi-java) \
127 $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
128
129 diff --git a/sys-cluster/openmpi/openmpi-4.0.4-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.4-r1.ebuild
130 index 7dedbcb532f9..6218dc7f7a65 100644
131 --- a/sys-cluster/openmpi/openmpi-4.0.4-r1.ebuild
132 +++ b/sys-cluster/openmpi/openmpi-4.0.4-r1.ebuild
133 @@ -1,4 +1,4 @@
134 -# Copyright 1999-2021 Gentoo Authors
135 +# Copyright 1999-2022 Gentoo Authors
136 # Distributed under the terms of the GNU General Public License v2
137
138 EAPI=7
139 @@ -31,7 +31,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
140 LICENSE="BSD"
141 SLOT="0"
142 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
143 -IUSE="cma cuda cxx fortran heterogeneous ipv6 java romio
144 +IUSE="cma cuda cxx fortran ipv6 java romio
145 ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
146
147 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
148 @@ -111,7 +111,7 @@ multilib_src_configure() {
149 $(use_with cma) \
150 $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
151 $(use_enable romio io-romio) \
152 - $(use_enable heterogeneous) \
153 + --disable-heterogeneous \
154 $(use_enable ipv6) \
155 $(multilib_native_use_enable java mpi-java) \
156 $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
157
158 diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r2.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r2.ebuild
159 index 910b08a8e8f6..3ab02e1aff6a 100644
160 --- a/sys-cluster/openmpi/openmpi-4.0.5-r2.ebuild
161 +++ b/sys-cluster/openmpi/openmpi-4.0.5-r2.ebuild
162 @@ -1,4 +1,4 @@
163 -# Copyright 1999-2021 Gentoo Authors
164 +# Copyright 1999-2022 Gentoo Authors
165 # Distributed under the terms of the GNU General Public License v2
166
167 EAPI=7
168 @@ -31,7 +31,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
169 LICENSE="BSD"
170 SLOT="0"
171 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
172 -IUSE="cma cuda cxx fortran heterogeneous ipv6 java romio
173 +IUSE="cma cuda cxx fortran ipv6 java romio
174 ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
175
176 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
177 @@ -111,7 +111,7 @@ multilib_src_configure() {
178 $(use_with cma) \
179 $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
180 $(use_enable romio io-romio) \
181 - $(use_enable heterogeneous) \
182 + --disable-heterogeneous \
183 $(use_enable ipv6) \
184 $(multilib_native_use_enable java mpi-java) \
185 $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
186
187 diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
188 index 6609fda95cfc..dedc2ebe1349 100644
189 --- a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
190 +++ b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
191 @@ -1,4 +1,4 @@
192 -# Copyright 1999-2021 Gentoo Authors
193 +# Copyright 1999-2022 Gentoo Authors
194 # Distributed under the terms of the GNU General Public License v2
195
196 EAPI=7
197 @@ -31,7 +31,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
198 LICENSE="BSD"
199 SLOT="0"
200 KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux"
201 -IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
202 +IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio
203 ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
204
205 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
206 @@ -112,7 +112,7 @@ multilib_src_configure() {
207 --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
208
209 $(use_enable cxx mpi-cxx)
210 - $(use_enable heterogeneous)
211 + --disable-heterogeneous
212 $(use_enable ipv6)
213 $(use_enable libompitrace)
214 $(use_enable peruse)
215
216 diff --git a/sys-cluster/openmpi/openmpi-4.0.6-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.6-r1.ebuild
217 index 93df7d8495cc..e7d49f6d7e45 100644
218 --- a/sys-cluster/openmpi/openmpi-4.0.6-r1.ebuild
219 +++ b/sys-cluster/openmpi/openmpi-4.0.6-r1.ebuild
220 @@ -1,4 +1,4 @@
221 -# Copyright 1999-2021 Gentoo Authors
222 +# Copyright 1999-2022 Gentoo Authors
223 # Distributed under the terms of the GNU General Public License v2
224
225 EAPI=7
226 @@ -32,7 +32,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
227 LICENSE="BSD"
228 SLOT="0"
229 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
230 -IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
231 +IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio
232 ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
233
234 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
235 @@ -113,7 +113,7 @@ multilib_src_configure() {
236 --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
237
238 $(use_enable cxx mpi-cxx)
239 - $(use_enable heterogeneous)
240 + --disable-heterogeneous
241 $(use_enable ipv6)
242 $(use_enable libompitrace)
243 $(use_enable peruse)
244
245 diff --git a/sys-cluster/openmpi/openmpi-4.0.7.ebuild b/sys-cluster/openmpi/openmpi-4.0.7.ebuild
246 index 93df7d8495cc..e7d49f6d7e45 100644
247 --- a/sys-cluster/openmpi/openmpi-4.0.7.ebuild
248 +++ b/sys-cluster/openmpi/openmpi-4.0.7.ebuild
249 @@ -1,4 +1,4 @@
250 -# Copyright 1999-2021 Gentoo Authors
251 +# Copyright 1999-2022 Gentoo Authors
252 # Distributed under the terms of the GNU General Public License v2
253
254 EAPI=7
255 @@ -32,7 +32,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
256 LICENSE="BSD"
257 SLOT="0"
258 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
259 -IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
260 +IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio
261 ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
262
263 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
264 @@ -113,7 +113,7 @@ multilib_src_configure() {
265 --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
266
267 $(use_enable cxx mpi-cxx)
268 - $(use_enable heterogeneous)
269 + --disable-heterogeneous
270 $(use_enable ipv6)
271 $(use_enable libompitrace)
272 $(use_enable peruse)
273
274 diff --git a/sys-cluster/openmpi/openmpi-4.1.1-r1.ebuild b/sys-cluster/openmpi/openmpi-4.1.1-r1.ebuild
275 index 6652c805f75a..aae744d9642b 100644
276 --- a/sys-cluster/openmpi/openmpi-4.1.1-r1.ebuild
277 +++ b/sys-cluster/openmpi/openmpi-4.1.1-r1.ebuild
278 @@ -1,4 +1,4 @@
279 -# Copyright 1999-2021 Gentoo Authors
280 +# Copyright 1999-2022 Gentoo Authors
281 # Distributed under the terms of the GNU General Public License v2
282
283 EAPI=7
284 @@ -32,7 +32,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
285 LICENSE="BSD"
286 SLOT="0"
287 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
288 -IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
289 +IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio
290 ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
291
292 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
293 @@ -115,7 +115,7 @@ multilib_src_configure() {
294 --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
295
296 $(use_enable cxx mpi-cxx)
297 - $(use_enable heterogeneous)
298 + --disable-heterogeneous
299 $(use_enable ipv6)
300 $(use_enable libompitrace)
301 $(use_enable peruse)
302
303 diff --git a/sys-cluster/openmpi/openmpi-4.1.2.ebuild b/sys-cluster/openmpi/openmpi-4.1.2.ebuild
304 index 036f1cbe8cb6..314ce22c8b3a 100644
305 --- a/sys-cluster/openmpi/openmpi-4.1.2.ebuild
306 +++ b/sys-cluster/openmpi/openmpi-4.1.2.ebuild
307 @@ -32,7 +32,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
308 LICENSE="BSD"
309 SLOT="0"
310 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
311 -IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
312 +IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio
313 ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
314
315 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
316 @@ -71,10 +71,6 @@ MULTILIB_WRAPPED_HEADERS=(
317 /usr/include/openmpi/mpiext/mpiext_cuda_c.h
318 )
319
320 -PATCHES=(
321 - "${FILESDIR}"/${PN}-4.1.2-missing-includes.patch
322 -)
323 -
324 pkg_setup() {
325 fortran-2_pkg_setup
326 java-pkg-opt-2_pkg_setup
327 @@ -118,8 +114,12 @@ multilib_src_configure() {
328 --with-libevent="${EPREFIX}/usr"
329 --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
330
331 + # Re-enable for 5.0!
332 + # See https://github.com/open-mpi/ompi/issues/9697#issuecomment-1003746357
333 + # and https://bugs.gentoo.org/828123#c14
334 + --disable-heterogeneous
335 +
336 $(use_enable cxx mpi-cxx)
337 - $(use_enable heterogeneous)
338 $(use_enable ipv6)
339 $(use_enable libompitrace)
340 $(use_enable peruse)
Report Message
Find on MARC Find on Google Groups