Skip to content

Commit cb1837e

Browse files
committed
Merge pull request #1417 from jsquyres/rfc/mpirun-warn-if-debug-build
RFC: change default build to always be optimized (even for developers)
2 parents f6069c5 + 54687d0 commit cb1837e

File tree

1 file changed

+6
-25
lines changed

1 file changed

+6
-25
lines changed

config/opal_configure_options.m4

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
1010
dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
13-
dnl Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
13+
dnl Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
1414
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
1515
dnl Copyright (c) 2009 IBM Corporation. All rights reserved.
1616
dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
@@ -92,20 +92,14 @@ fi
9292
AC_MSG_CHECKING([if want to debug memory usage])
9393
AC_ARG_ENABLE(mem-debug,
9494
AC_HELP_STRING([--enable-mem-debug],
95-
[enable memory debugging (debugging only) (default: disabled)]))
95+
[enable memory debugging (not for general MPI users!) (default: disabled)]))
9696
if test "$enable_mem_debug" = "yes"; then
9797
AC_MSG_RESULT([yes])
9898
WANT_MEM_DEBUG=1
9999
else
100100
AC_MSG_RESULT([no])
101101
WANT_MEM_DEBUG=0
102102
fi
103-
#################### Early development override ####################
104-
if test "$WANT_MEM_DEBUG" = "0" && test -z "$enable_mem_debug" && test "$OPAL_DEVEL" = 1; then
105-
WANT_MEM_DEBUG=1
106-
echo "--> developer override: enable mem profiling by default"
107-
fi
108-
#################### Early development override ####################
109103
AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_DEBUG, $WANT_MEM_DEBUG,
110104
[Whether we want the memory profiling or not])
111105

@@ -116,20 +110,14 @@ AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_DEBUG, $WANT_MEM_DEBUG,
116110
AC_MSG_CHECKING([if want to profile memory usage])
117111
AC_ARG_ENABLE(mem-profile,
118112
AC_HELP_STRING([--enable-mem-profile],
119-
[enable memory profiling (debugging only) (default: disabled)]))
113+
[enable memory profiling (not for general MPI users!) (default: disabled)]))
120114
if test "$enable_mem_profile" = "yes"; then
121115
AC_MSG_RESULT([yes])
122116
WANT_MEM_PROFILE=1
123117
else
124118
AC_MSG_RESULT([no])
125119
WANT_MEM_PROFILE=0
126120
fi
127-
#################### Early development override ####################
128-
if test "$WANT_MEM_PROFILE" = "0" && test -z "$enable_mem_profile" && test "$OPAL_DEVEL" = 1; then
129-
WANT_MEM_PROFILE=1
130-
echo "--> developer override: enable mem profiling by default"
131-
fi
132-
#################### Early development override ####################
133121
AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_PROFILE, $WANT_MEM_PROFILE,
134122
[Whether we want the memory profiling or not])
135123

@@ -140,20 +128,20 @@ AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_PROFILE, $WANT_MEM_PROFILE,
140128
AC_MSG_CHECKING([if want developer-level compiler pickyness])
141129
AC_ARG_ENABLE(picky,
142130
AC_HELP_STRING([--enable-picky],
143-
[enable developer-level compiler pickyness when building Open MPI (default: disabled)]))
131+
[enable developer-level compiler pickyness when building Open MPI (default: disabled, unless a .git directory is found in the build tree)]))
144132
if test "$enable_picky" = "yes"; then
145133
AC_MSG_RESULT([yes])
146134
WANT_PICKY_COMPILER=1
147135
else
148136
AC_MSG_RESULT([no])
149137
WANT_PICKY_COMPILER=0
150138
fi
151-
#################### Early development override ####################
139+
#################### Developer default override ####################
152140
if test "$WANT_PICKY_COMPILER" = "0" && test -z "$enable_picky" && test "$OPAL_DEVEL" = 1; then
153141
WANT_PICKY_COMPILER=1
154142
echo "--> developer override: enable picky compiler by default"
155143
fi
156-
#################### Early development override ####################
144+
#################### Developer default override ####################
157145

158146
#
159147
# Developer debugging
@@ -190,13 +178,6 @@ AC_DEFINE_UNQUOTED(OPAL_ENABLE_TIMING, $WANT_TIMING,
190178
AM_CONDITIONAL([OPAL_COMPILE_TIMING], [test "$WANT_TIMING" = "1"])
191179
AM_CONDITIONAL([OPAL_INSTALL_TIMING_BINARIES], [test "$WANT_TIMING" = "1" && test "$enable_binaries" != "no"])
192180

193-
194-
#################### Early development override ####################
195-
if test "$WANT_DEBUG" = "0" && test -z "$enable_debug" && test "$OPAL_DEVEL" = 1; then
196-
WANT_DEBUG=1
197-
echo "--> developer override: enable debugging code by default"
198-
fi
199-
#################### Early development override ####################
200181
if test "$WANT_DEBUG" = "0"; then
201182
CFLAGS="-DNDEBUG $CFLAGS"
202183
CXXFLAGS="-DNDEBUG $CXXFLAGS"

0 commit comments

Comments
 (0)