Skip to content

Commit 9ae3b67

Browse files
committed
accelerator: build components as dso's by default
also need to switch rcache/gpsum and rcache/rgpusum to DSO by default. Fix a problem in opal_mca.m4 where the enable-mca-dso list wasn't being processed correctly starting with 5.0.0. related to open-mpi#12036 Signed-off-by: Howard Pritchard <[email protected]> (cherry picked from commit 8601eb5) (cherry picked from commit 9580fd5)
1 parent 10c7bd6 commit 9ae3b67

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

config/opal_mca.m4

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dnl All rights reserved.
1313
dnl Copyright (c) 2010-2021 Cisco Systems, Inc. All rights reserved
1414
dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
1515
dnl Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
16-
dnl Copyright (c) 2021 Triad National Security, LLC. All rights
16+
dnl Copyright (c) 2021-2023 Triad National Security, LLC. All rights
1717
dnl reserved.
1818
dnl $COPYRIGHT$
1919
dnl
@@ -167,32 +167,36 @@ of type-component pairs. For example, --enable-mca-no-build=pml-ob1])
167167
# Second, set the DSO_all and STATIC_all variables. conflict
168168
# resolution (prefer static) is done in the big loop below
169169
#
170+
# Exception here is the components of the accelerator framework,
171+
# which by default are built to be dynamic, except for null.
172+
#
170173
AC_MSG_CHECKING([which components should be run-time loadable])
171174
if test "$enable_static" != "no"; then
172175
DSO_all=0
173176
msg="none (static libraries built)"
174177
elif test "$OPAL_ENABLE_DLOPEN_SUPPORT" = 0; then
175178
DSO_all=0
176179
msg="none (dlopen disabled)"
177-
elif test -z "$enable_mca_dso"; then
178-
DSO_all=0
179-
msg=default
180180
elif test "$enable_mca_dso" = "no"; then
181181
DSO_all=0
182182
msg=none
183183
elif test "$enable_mca_dso" = "yes"; then
184184
DSO_all=1
185185
msg=all
186186
else
187-
DSO_all=0
188-
ifs_save="$IFS"
189-
IFS="${IFS}$PATH_SEPARATOR,"
190-
msg=
191-
for item in $enable_mca_dso; do
192-
AS_VAR_SET([AS_TR_SH([DSO_$item])], [1])
193-
msg="$item $msg"
194-
done
195-
IFS="$ifs_save"
187+
msg=
188+
if test -z "$enable_mca_dso"; then
189+
enable_mca_dso="accelerator-cuda,accelerator-rocm,accelerator-ze,btl-smcuda,rcache-gpusm,rcache-rgpusm"
190+
msg="(default)"
191+
fi
192+
DSO_all=0
193+
ifs_save="$IFS"
194+
IFS="${IFS}$PATH_SEPARATOR,"
195+
for item in $enable_mca_dso; do
196+
AS_VAR_SET([AS_TR_SH([DSO_$item])], [1])
197+
msg="$item $msg"
198+
done
199+
IFS="$ifs_save"
196200
fi
197201
AC_MSG_RESULT([$msg])
198202
unset msg

0 commit comments

Comments
 (0)