fec519a793
Per a prior commit, the presence of "hwloc.h" can cause ambiguity when using --with-hwloc=external (i.e., whether to include opal/mca/hwloc/hwloc.h or whether to include the system-installed hwloc.h). This commit: 1. Renames opal/mca/hwloc/hwloc.h to hwloc-internal.h. 2. Adds opal/mca/hwloc/autogen.options to tell autogen.pl to expect to find hwloc-internal.h (instead of hwloc.h) in opal/mca/hwloc. 3. s@opal/mca/hwloc/hwloc.h@opal/mca/hwloc/hwloc-internal.h@g in the rest of the code base. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
49 строки
1.7 KiB
C
49 строки
1.7 KiB
C
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
|
|
/*
|
|
* Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved
|
|
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
|
|
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
|
* reserved.
|
|
*
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*
|
|
* When this component is used, this file is included in the rest of
|
|
* the OPAL/ORTE/OMPI code base via opal/mca/hwloc/hwloc-internal.h. As such,
|
|
* this header represents the public interface to this static component.
|
|
*/
|
|
|
|
#ifndef MCA_OPAL_HWLOC_HWLOC1113_H
|
|
#define MCA_OPAL_HWLOC_HWLOC1113_H
|
|
|
|
BEGIN_C_DECLS
|
|
|
|
#include "hwloc/include/hwloc.h"
|
|
|
|
/* If the including file requested it, also include the hwloc verbs
|
|
helper file. We can't just always include this file (even if we
|
|
know we have <infiniband/verbs.h>) because there are some inline
|
|
functions in that file that invoke ibv_* functions. Some linkers
|
|
(e.g., Solaris Studio Compilers) will instantiate those static
|
|
inline functions even if we don't use them, and therefore we need
|
|
to be able to resolve the ibv_* symbols at link time.
|
|
|
|
Since -libverbs is only specified in places where we use other
|
|
ibv_* functions (e.g., the OpenFabrics-based BTLs), that means that
|
|
linking random executables can/will fail (e.g., orterun).
|
|
*/
|
|
#if defined(OPAL_HWLOC_WANT_VERBS_HELPER) && OPAL_HWLOC_WANT_VERBS_HELPER
|
|
# if defined(HAVE_INFINIBAND_VERBS_H)
|
|
# include "hwloc/include/hwloc/openfabrics-verbs.h"
|
|
# else
|
|
# error Tried to include hwloc verbs helper file, but hwloc was compiled with no OpenFabrics support
|
|
# endif
|
|
#endif
|
|
|
|
END_C_DECLS
|
|
|
|
#endif /* MCA_OPAL_HWLOC_HWLOC1113_H */
|