Skip to content

Commit 4b216e8

Browse files
bwbarrettbwbarrett
authored
Merge pull request #10166 from bwbarrett/cleanup/opal_summary_uniqify
Make OPAL_SUMMARY_ADD uniqify calls
2 parents 1f6c043 + 5981f90 commit 4b216e8

26 files changed

+127
-67
lines changed

‎config/ompi_check_psm2.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# reserved.
2020
# Copyright (c) 2021 Triad National Security, LLC. All rights
2121
# reserved.
22-
#
22+
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
2323
# $COPYRIGHT$
2424
#
2525
# Additional copyrights may follow
@@ -96,7 +96,7 @@ AC_DEFUN([OMPI_CHECK_PSM2],[
9696
LDFLAGS="$ompi_check_psm2_$1_save_LDFLAGS"
9797
LIBS="$ompi_check_psm2_$1_save_LIBS"
9898

99-
OPAL_SUMMARY_ADD([[Transports]],[[Intel Omnipath (PSM2)]],[$1],[$ompi_check_psm2_happy])
99+
OPAL_SUMMARY_ADD([Transports], [Intel Omnipath (PSM2)], [], [$ompi_check_psm2_happy])
100100
fi
101101

102102
AS_IF([test "$ompi_check_psm2_happy" = "yes"],

‎config/ompi_check_ucx.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
88
# reserved.
99
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
10+
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
1011
# $COPYRIGHT$
1112
#
1213
# Additional copyrights may follow
@@ -161,7 +162,7 @@ AC_DEFUN([OMPI_CHECK_UCX],[
161162
])
162163
CPPFLAGS=$old_CPPFLAGS
163164

164-
OPAL_SUMMARY_ADD([[Transports]],[[Open UCX]],[$1],[$ompi_check_ucx_happy])])])
165+
OPAL_SUMMARY_ADD([Transports], [Open UCX], [], [$ompi_check_ucx_happy])])])
165166

166167
AS_IF([test "$ompi_check_ucx_happy" = "yes"],
167168
[$1_CPPFLAGS="[$]$1_CPPFLAGS $ompi_check_ucx_CPPFLAGS"

‎config/ompi_setup_prrte.m4

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights
1616
dnl reserved.
1717
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
1818
dnl Copyright (c) 2019-2020 Intel, Inc. All rights reserved.
19-
dnl Copyright (c) 2020-2021 Amazon.com, Inc. or its affiliates.
20-
dnl All Rights reserved.
19+
dnl Copyright (c) 2020-2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
2120
dnl Copyright (c) 2021 Nanook Consulting. All rights reserved.
2221
dnl Copyright (c) 2021 IBM Corporation. All rights reserved.
2322
dnl $COPYRIGHT$
@@ -108,7 +107,7 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
108107
[$OMPI_USING_INTERNAL_PRRTE],
109108
[Whether or not we are using the internal PRRTE])
110109
111-
OPAL_SUMMARY_ADD([[Miscellaneous]], [[prrte]], [prrte], [$opal_prrte_mode])
110+
OPAL_SUMMARY_ADD([Miscellaneous], [prrte], [], [$opal_prrte_mode])
112111
113112
OPAL_VAR_SCOPE_POP
114113
])

‎config/opal_check_cma.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# Copyright (c) 2010-2012 IBM Corporation. All rights reserved.
88
# Copyright (c) 2013-2016 Los Alamos National Security, LLC. All rights
99
# reserved.
10+
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
1011
# $COPYRIGHT$
1112
#
1213
# Additional copyrights may follow
@@ -132,5 +133,5 @@ static void do_check (pid_t pid, int *in, int *out)
132133
AS_IF([test $opal_check_cma_happy -eq 1],
133134
[opal_check_cma_msg=yes],
134135
[opal_check_cma_msg=no])
135-
OPAL_SUMMARY_ADD([[Transports]],[[Shared memory/Linux CMA]],[$1],[$opal_check_cma_msg])
136+
OPAL_SUMMARY_ADD([Transports], [Shared memory/Linux CMA], [], [$opal_check_cma_msg])
136137
])

‎config/opal_check_cuda.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dnl -*- shell-script -*-
1+
dnl -*- autoconf -*-
22
dnl
33
dnl Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
44
dnl University Research and Technology
@@ -19,7 +19,7 @@ dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved.
1919
dnl Copyright (c) 2011-2015 NVIDIA Corporation. All rights reserved.
2020
dnl Copyright (c) 2015 Research Organization for Information Science
2121
dnl and Technology (RIST). All rights reserved.
22-
dnl
22+
dnl Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
2323
dnl $COPYRIGHT$
2424
dnl
2525
dnl Additional copyrights may follow
@@ -124,7 +124,7 @@ else
124124
CUDA_SUPPORT=0
125125
fi
126126
127-
OPAL_SUMMARY_ADD([[Miscellaneous]],[[CUDA support]],[opal_cuda], [$opal_check_cuda_happy])
127+
OPAL_SUMMARY_ADD([Miscellaneous], [CUDA support], [], [$opal_check_cuda_happy])
128128
129129
AM_CONDITIONAL([OPAL_cuda_support], [test "x$CUDA_SUPPORT" = "x1"])
130130
AC_DEFINE_UNQUOTED([OPAL_CUDA_SUPPORT],$CUDA_SUPPORT,

‎config/opal_check_knem.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dnl Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
99
dnl reserved.
1010
dnl Copyright (c) 2015 Research Organization for Information Science
1111
dnl and Technology (RIST). All rights reserved.
12+
dnl Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
1213
dnl $COPYRIGHT$
1314
dnl
1415
dnl Additional copyrights may follow
@@ -61,7 +62,7 @@ AC_DEFUN([OPAL_CHECK_KNEM],[
6162

6263
CPPFLAGS="$opal_check_knem_$1_save_CPPFLAGS"
6364

64-
OPAL_SUMMARY_ADD([[Transports]],[[Shared memory/Linux KNEM]],[$1],[$opal_check_knem_happy])
65+
OPAL_SUMMARY_ADD([Transports], [Shared memory/Linux KNEM], [], [$opal_check_knem_happy])
6566
OPAL_VAR_SCOPE_POP
6667
fi
6768

‎config/opal_check_ofi.m4

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ dnl
33
dnl Copyright (c) 2015-2020 Cisco Systems, Inc. All rights reserved.
44
dnl Copyright (c) 2016-2017 Los Alamos National Security, LLC. All rights
55
dnl reserved.
6-
dnl Copyright (c) 2021 Amazon.com, Inc. or its affiliates. All rights
7-
dnl reserved.
6+
dnl Copyright (c) 2021-2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
87
dnl $COPYRIGHT$
98
dnl
109
dnl Additional copyrights may follow
@@ -159,7 +158,7 @@ AC_DEFUN([_OPAL_CHECK_OFI],[
159158
AC_SUBST([opal_ofi_LDFLAGS])
160159
AC_SUBST([opal_ofi_LIBS])
161160

162-
OPAL_SUMMARY_ADD([[Transports]],[[OpenFabrics OFI Libfabric]],[],[$opal_ofi_happy])
161+
OPAL_SUMMARY_ADD([Transports], [OpenFabrics OFI Libfabric], [], [$opal_ofi_happy])
163162

164163
OPAL_VAR_SCOPE_POP
165164

‎config/opal_check_portals4.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dnl Copyright (c) 2015 Research Organization for Information Science
1616
dnl and Technology (RIST). All rights reserved.
1717
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
1818
dnl reserved.
19+
dnl Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
1920
dnl $COPYRIGHT$
2021
dnl
2122
dnl Additional copyrights may follow
@@ -94,7 +95,7 @@ AC_DEFUN([OPAL_CHECK_PORTALS4],[
9495
AS_IF([test $max_md_size -ne 0 && test $max_va_size -ne 0],
9596
[AC_MSG_NOTICE([Portals 4 address space size: $max_md_size, $max_va_size])])
9697

97-
OPAL_SUMMARY_ADD([[Transports]],[[Portals4]],[$1],[$ompi_check_portals4_happy])
98+
OPAL_SUMMARY_ADD([Transports], [Portals4], [], [$ompi_check_portals4_happy])
9899
fi
99100

100101
AS_IF([test "$ompi_check_portals4_happy" = "yes"],

‎config/opal_check_ugni.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ dnl reserved.
1717
dnl Copyright (c) 2014 Intel, Inc. All rights reserved
1818
dnl Copyright (c) 2015 Research Organization for Information Science
1919
dnl and Technology (RIST). All rights reserved.
20+
dnl Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
2021
dnl $COPYRIGHT$
2122
dnl
2223
dnl Additional copyrights may follow
@@ -68,7 +69,7 @@ AC_DEFUN([OPAL_CHECK_UGNI], [
6869
[AC_MSG_WARN([GNI driver does not currently support progress threads. Disabling.])
6970
opal_check_ugni_happy="no"])
7071

71-
OPAL_SUMMARY_ADD([[Transports]],[[Cray uGNI (Gemini/Aries)]],[$1],[$opal_check_ugni_happy])
72+
OPAL_SUMMARY_ADD([Transports], [Cray uGNI (Gemini/Aries)], [], [$opal_check_ugni_happy])
7273
fi
7374

7475
AS_IF([test "$opal_check_ugni_happy" = "yes"],

‎config/opal_check_xpmem.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# Copyright (c) 2014 Intel, Inc. All rights reserved.
1717
# Copyright (c) 2014-2015 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
19+
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
1920
# $COPYRIGHT$
2021
#
2122
# Additional copyrights may follow
@@ -101,7 +102,7 @@ AC_DEFUN([OPAL_CHECK_XPMEM], [
101102
fi
102103
fi
103104
104-
OPAL_SUMMARY_ADD([[Transports]],[[Shared memory/XPMEM]],[$1],[$opal_check_xpmem_happy])
105+
OPAL_SUMMARY_ADD([Transports], [Shared memory/XPMEM], [], [$opal_check_xpmem_happy])
105106
fi
106107
107108
AS_IF([test "$opal_check_xpmem_happy" = "yes"], [

0 commit comments

Comments
 (0)