50e5b0937c
.ompi_ignored to allow other developers to test with it. It is expected that we'll remove the .ompi_ignore here soon, and simultaneously remove the hwloc 1.2.2ompi component. There was one very minor patch added to stock hwloc 1.3.1 in hwloc/config/hwloc.m4: {{{ --- hwloc-1.3.1/config/hwloc.m4 2011-12-14 +++ ompi3/opal/mca/hwloc/hwloc131/hwloc/config/hwloc.m4 @@ -583,6 +583,7 @@ ]) fi AC_SUBST(HWLOC_PCI_LIBS) + HWLOC_LIBS="$HWLOC_LIBS $HWLOC_PCI_LIBS" # If we asked for pci support but couldn't deliver, fail AS_IF([test "$enable_pci" = "yes" -a "$hwloc_pci_happy" = "no"], [AC_MSG_WARN([Specified --enable-pci switch, but could not]) }}} This will be pushed upstream to hwloc. This commit was SVN r25706.
69 строки
1.6 KiB
C
69 строки
1.6 KiB
C
/*
|
|
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
|
|
*
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*
|
|
* These symbols are in a file by themselves to provide nice linker
|
|
* semantics. Since linkers generally pull in symbols by object
|
|
* files, keeping these symbols as the only symbols in this file
|
|
* prevents utility programs such as "ompi_info" from having to import
|
|
* entire components just to query their version and parameters.
|
|
*/
|
|
|
|
#include "opal_config.h"
|
|
#include "opal/constants.h"
|
|
|
|
#include "opal/mca/hwloc/hwloc.h"
|
|
#include "hwloc131.h"
|
|
|
|
/*
|
|
* Public string showing the sysinfo ompi_linux component version number
|
|
*/
|
|
const char *opal_hwloc_hwloc131_component_version_string =
|
|
"OPAL hwloc131 hwloc MCA component version " OPAL_VERSION;
|
|
|
|
/*
|
|
* Local function
|
|
*/
|
|
static int hwloc131_open(void);
|
|
|
|
/*
|
|
* Instantiate the public struct with all of our public information
|
|
* and pointers to our public functions in it
|
|
*/
|
|
|
|
const opal_hwloc_component_t mca_hwloc_hwloc131_component = {
|
|
|
|
/* First, the mca_component_t struct containing meta information
|
|
about the component itself */
|
|
|
|
{
|
|
OPAL_HWLOC_BASE_VERSION_2_0_0,
|
|
|
|
/* Component name and version */
|
|
"hwloc131",
|
|
OPAL_MAJOR_VERSION,
|
|
OPAL_MINOR_VERSION,
|
|
OPAL_RELEASE_VERSION,
|
|
|
|
/* Component open and close functions */
|
|
hwloc131_open,
|
|
NULL
|
|
},
|
|
{
|
|
/* The component is checkpoint ready */
|
|
MCA_BASE_METADATA_PARAM_CHECKPOINT
|
|
}
|
|
};
|
|
|
|
|
|
static int hwloc131_open(void)
|
|
{
|
|
return OPAL_SUCCESS;
|
|
}
|
|
|