2012-02-14 21:01:36 +00:00
|
|
|
/*
|
2013-01-12 02:08:04 +00:00
|
|
|
* Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved.
|
2012-02-14 21:01:36 +00:00
|
|
|
*
|
|
|
|
* $COPYRIGHT$
|
|
|
|
*
|
|
|
|
* Additional copyrights may follow
|
|
|
|
*
|
|
|
|
* $HEADER$
|
|
|
|
*
|
|
|
|
* When this component is used, this file is included in the rest of
|
2012-07-26 18:09:33 +00:00
|
|
|
* the OPAL/ORTE/OMPI code base via opal/mca/hwloc/hwloc.h. As such,
|
2012-02-14 21:01:36 +00:00
|
|
|
* this header represents the public interface to this static component.
|
|
|
|
*/
|
|
|
|
|
2013-03-18 23:02:56 +00:00
|
|
|
#ifndef MCA_OPAL_HWLOC_HWLOC152_H
|
|
|
|
#define MCA_OPAL_HWLOC_HWLOC152_H
|
2012-02-14 21:01:36 +00:00
|
|
|
|
Per RFC, bring in the following changes:
* Remove paffinity, maffinity, and carto frameworks -- they've been
wholly replaced by hwloc.
* Move ompi_mpi_init() affinity-setting/checking code down to ORTE.
* Update sm, smcuda, wv, and openib components to no longer use carto.
Instead, use hwloc data. There are still optimizations possible in
the sm/smcuda BTLs (i.e., making multiple mpools). Also, the old
carto-based code found out how many NUMA nodes were ''available''
-- not how many were used ''in this job''. The new hwloc-using
code computes the same value -- it was not updated to calculate how
many NUMA nodes are used ''by this job.''
* Note that I cannot compile the smcuda and wv BTLs -- I ''think''
they're right, but they need to be verified by their owners.
* The openib component now does a bunch of stuff to figure out where
"near" OpenFabrics devices are. '''THIS IS A CHANGE IN DEFAULT
BEHAVIOR!!''' and still needs to be verified by OpenFabrics vendors
(I do not have a NUMA machine with an OpenFabrics device that is a
non-uniform distance from multiple different NUMA nodes).
* Completely rewrite the OMPI_Affinity_str() routine from the
"affinity" mpiext extension. This extension now understands
hyperthreads; the output format of it has changed a bit to reflect
this new information.
* Bunches of minor changes around the code base to update names/types
from maffinity/paffinity-based names to hwloc-based names.
* Add some helper functions into the hwloc base, mainly having to do
with the fact that we have the hwloc data reporting ''all''
topology information, but sometimes you really only want the
(online | available) data.
This commit was SVN r26391.
2012-05-07 14:52:54 +00:00
|
|
|
BEGIN_C_DECLS
|
|
|
|
|
2012-02-14 21:01:36 +00:00
|
|
|
#include "hwloc/include/hwloc.h"
|
|
|
|
|
2012-05-09 20:18:31 +00:00
|
|
|
/* 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
|
Per RFC, bring in the following changes:
* Remove paffinity, maffinity, and carto frameworks -- they've been
wholly replaced by hwloc.
* Move ompi_mpi_init() affinity-setting/checking code down to ORTE.
* Update sm, smcuda, wv, and openib components to no longer use carto.
Instead, use hwloc data. There are still optimizations possible in
the sm/smcuda BTLs (i.e., making multiple mpools). Also, the old
carto-based code found out how many NUMA nodes were ''available''
-- not how many were used ''in this job''. The new hwloc-using
code computes the same value -- it was not updated to calculate how
many NUMA nodes are used ''by this job.''
* Note that I cannot compile the smcuda and wv BTLs -- I ''think''
they're right, but they need to be verified by their owners.
* The openib component now does a bunch of stuff to figure out where
"near" OpenFabrics devices are. '''THIS IS A CHANGE IN DEFAULT
BEHAVIOR!!''' and still needs to be verified by OpenFabrics vendors
(I do not have a NUMA machine with an OpenFabrics device that is a
non-uniform distance from multiple different NUMA nodes).
* Completely rewrite the OMPI_Affinity_str() routine from the
"affinity" mpiext extension. This extension now understands
hyperthreads; the output format of it has changed a bit to reflect
this new information.
* Bunches of minor changes around the code base to update names/types
from maffinity/paffinity-based names to hwloc-based names.
* Add some helper functions into the hwloc base, mainly having to do
with the fact that we have the hwloc data reporting ''all''
topology information, but sometimes you really only want the
(online | available) data.
This commit was SVN r26391.
2012-05-07 14:52:54 +00:00
|
|
|
#endif
|
|
|
|
|
2012-02-14 21:01:36 +00:00
|
|
|
END_C_DECLS
|
|
|
|
|
2013-03-18 23:02:56 +00:00
|
|
|
#endif /* MCA_OPAL_HWLOC_HWLOC152_H */
|