1 |
commit: 60e60e919bb05a38eecea1fbe9926c9cb91f8937 |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu May 26 23:49:52 2022 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Fri May 27 11:28:07 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=60e60e91 |
7 |
|
8 |
sys-cluster/SOS: move SOS's use expand to profiles/desc |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
profiles/desc/ofi_mr.desc | 8 ++++++++ |
13 |
profiles/desc/total_data_ordering.desc | 8 ++++++++ |
14 |
sys-cluster/SOS/SOS-1.5.0.ebuild | 26 +++++++++++++------------- |
15 |
sys-cluster/SOS/metadata.xml | 6 ------ |
16 |
4 files changed, 29 insertions(+), 19 deletions(-) |
17 |
|
18 |
diff --git a/profiles/desc/ofi_mr.desc b/profiles/desc/ofi_mr.desc |
19 |
new file mode 100644 |
20 |
index 000000000..11fd24e52 |
21 |
--- /dev/null |
22 |
+++ b/profiles/desc/ofi_mr.desc |
23 |
@@ -0,0 +1,8 @@ |
24 |
+# Copyright 2022 Gentoo Authors |
25 |
+# Distributed under the terms of the GNU General Public License v2 |
26 |
+ |
27 |
+# This file contains descriptions of OFI_MR USE_EXPAND flags. |
28 |
+ |
29 |
+basic - OFI memory registration mode: basic |
30 |
+rma-event - The OFI transport will use FI_MR_RMA_EVENT |
31 |
+scalable - The OFI transport will use FI_MR_SCALABLE |
32 |
|
33 |
diff --git a/profiles/desc/total_data_ordering.desc b/profiles/desc/total_data_ordering.desc |
34 |
new file mode 100644 |
35 |
index 000000000..3e77af16b |
36 |
--- /dev/null |
37 |
+++ b/profiles/desc/total_data_ordering.desc |
38 |
@@ -0,0 +1,8 @@ |
39 |
+# Copyright 2022 Gentoo Authors |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+ |
42 |
+# This file contains descriptions of TOTAL_DATA_ORDERING USE_EXPAND flags. |
43 |
+ |
44 |
+always - Always assume total data ordering is available and abort a job if that's not the case |
45 |
+check - Check will result in slightly higher overhead but will provide a fallback if the network doesn't provide total data ordering |
46 |
+never - Never use total data ordering optimizations |
47 |
|
48 |
diff --git a/sys-cluster/SOS/SOS-1.5.0.ebuild b/sys-cluster/SOS/SOS-1.5.0.ebuild |
49 |
index 96836639f..efe8effda 100644 |
50 |
--- a/sys-cluster/SOS/SOS-1.5.0.ebuild |
51 |
+++ b/sys-cluster/SOS/SOS-1.5.0.ebuild |
52 |
@@ -1,4 +1,4 @@ |
53 |
-# Copyright 2019-2021 Gentoo Authors |
54 |
+# Copyright 2019-2022 Gentoo Authors |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
|
57 |
EAPI=8 |
58 |
@@ -15,14 +15,14 @@ LICENSE="BSD public-domain mpich2" |
59 |
SLOT="0" |
60 |
KEYWORDS="~amd64" |
61 |
IUSE_OFI_MR=" |
62 |
- ofi-mr-basic |
63 |
- +ofi-mr-scalable |
64 |
- ofi-mr-rma-event |
65 |
+ ofi_mr_basic |
66 |
+ +ofi_mr_scalable |
67 |
+ ofi_mr_rma-event |
68 |
" |
69 |
IUSE_TOTAL_DATA_ORDERING=" |
70 |
- total-data-ordering-always |
71 |
- +total-data-ordering-check |
72 |
- total-data-ordering-never |
73 |
+ total_data_ordering_always |
74 |
+ +total_data_ordering_check |
75 |
+ total_data_ordering_never |
76 |
" |
77 |
IUSE="${IUSE_OFI_MR} ${IUSE_TOTAL_DATA_ORDERING} av-map bounce-buffers cma completion-polling cxx |
78 |
debug error-checking fortran long-fortran-header manual-progress memcpy ofi ofi-fence openmp |
79 |
@@ -80,14 +80,14 @@ src_prepare() { |
80 |
|
81 |
src_configure() { |
82 |
local ofimr |
83 |
- use ofi-mr-basic && ofimr="basic" |
84 |
- use ofi-mr-scalable && ofimr="scalable" |
85 |
- use ofi-mr-rma-event && ofimr="rma-event" |
86 |
+ use ofi_mr_basic && ofimr="basic" |
87 |
+ use ofi_mr_scalable && ofimr="scalable" |
88 |
+ use ofi_mr_rma-event && ofimr="rma-event" |
89 |
|
90 |
local tda |
91 |
- use total-data-ordering-always && tda="always" |
92 |
- use total-data-ordering-check && tda="check" |
93 |
- use total-data-ordering-never && tda="never" |
94 |
+ use total_data_ordering_always && tda="always" |
95 |
+ use total_data_ordering_check && tda="check" |
96 |
+ use total_data_ordering_never && tda="never" |
97 |
|
98 |
local myconf=( |
99 |
--disable-picky |
100 |
|
101 |
diff --git a/sys-cluster/SOS/metadata.xml b/sys-cluster/SOS/metadata.xml |
102 |
index b671c4dd9..a1df257ec 100644 |
103 |
--- a/sys-cluster/SOS/metadata.xml |
104 |
+++ b/sys-cluster/SOS/metadata.xml |
105 |
@@ -19,9 +19,6 @@ |
106 |
<!--<flag name="nonblocking-fence">By default, shmem_fence() is equivalent to shmem_quiet(), which can be a lengthy operation. Enabling this feature results in the ordering point being moved from the shmem_fence() to the next put-like call, which can help improve overlap in some cases.</flag>--> |
107 |
<flag name="ofi">Use libfabric as transport layer</flag> |
108 |
<flag name="ofi-fence">Use FI_FENCE feature to optimize put-with-signal operations</flag> |
109 |
- <flag name="ofi-mr-basic">OFI memory registration mode: basic</flag> |
110 |
- <flag name="ofi-mr-rma-event">The OFI transport will use FI_MR_RMA_EVENT</flag> |
111 |
- <flag name="ofi-mr-scalable">The OFI transport will use FI_MR_SCALABLE</flag> |
112 |
<flag name="pmi-mpi">Use MPI for process management</flag> |
113 |
<flag name="pmi-simple">Include support for interfacing with a PMI 1.0 launcher. The launcher must be provided by a separate package, such as MPICH, Hydra, or SLURM.</flag> |
114 |
<flag name="portals4">Use portals4 as transport layer</flag> |
115 |
@@ -30,9 +27,6 @@ |
116 |
<flag name="remote-virtual-addressing"> Enable optimizations assuming the symmetric heap is always symmetric with regards to virtual address. This may cause applications to abort during shmem_init() if such a symmetric heap can not be created, but will reduce the instruction count for some operations. This optimization also requires that the Portals 4 implementation support BIND_INACCESSIBLE on LEs. This optimization will reduce the overhead of communication calls.</flag> |
117 |
<flag name="thread-completion">Support SHMEM_THREAD_MULTIPLE in OFI transport using FI_THREAD_COMPLETION thread safety model instead of FI_THREAD_SAFE</flag> |
118 |
<flag name="threads">Enable threading support</flag> |
119 |
- <flag name="total-data-ordering-always">Always assume total data ordering is available and abort a job if that's not the case</flag> |
120 |
- <flag name="total-data-ordering-check">Check will result in slightly higher overhead but will provide a fallback if the network doesn't provide total data ordering</flag> |
121 |
- <flag name="total-data-ordering-never">Never use total data ordering optimizations</flag> |
122 |
<flag name="ucx">Use ucx transport</flag> |
123 |
<flag name="xpmem">Use xpmem transport</flag> |
124 |
</use> |