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.
67 строки
2.1 KiB
Makefile
67 строки
2.1 KiB
Makefile
#
|
|
# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
|
|
# $COPYRIGHT$
|
|
#
|
|
# Additional copyrights may follow
|
|
#
|
|
# $HEADER$
|
|
#
|
|
|
|
# Need to include these files so that these directories are carried in
|
|
# the tarball (in case someone invokes autogen.sh on a dist tarball).
|
|
EXTRA_DIST = \
|
|
hwloc/doc/README.txt \
|
|
hwloc/tests/README.txt \
|
|
hwloc/utils/README.txt
|
|
|
|
SUBDIRS = hwloc
|
|
|
|
# Headers and sources
|
|
headers = hwloc131.h
|
|
sources = hwloc131_component.c hwloc131_module.c
|
|
|
|
# We only ever build this component statically
|
|
noinst_LTLIBRARIES = libmca_hwloc_hwloc131.la
|
|
libmca_hwloc_hwloc131_la_SOURCES = $(headers) $(sources)
|
|
libmca_hwloc_hwloc131_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc131_LDFLAGS)
|
|
libmca_hwloc_hwloc131_la_LIBADD = $(opal_hwloc_hwloc131_LIBS)
|
|
libmca_hwloc_hwloc131_la_DEPENDENCIES = \
|
|
$(HWLOC_top_builddir)/src/libhwloc_embedded.la
|
|
|
|
# Since the rest of the code base includes the underlying hwloc.h, we
|
|
# also have to install the underlying header files when
|
|
# --with-devel-headers is specified. hwloc doesn't support this; the
|
|
# least gross way to make this happen is just to list all of hwloc's
|
|
# header files here. :-(
|
|
headers += \
|
|
hwloc/include/hwloc.h \
|
|
hwloc/include/hwloc/bitmap.h \
|
|
hwloc/include/hwloc/cpuset.h \
|
|
hwloc/include/hwloc/helper.h \
|
|
hwloc/include/hwloc/myriexpress.h \
|
|
hwloc/include/hwloc/openfabrics-verbs.h \
|
|
hwloc/include/hwloc/cuda.h \
|
|
hwloc/include/hwloc/cudart.h \
|
|
hwloc/include/hwloc/rename.h \
|
|
hwloc/include/hwloc/autogen/config.h \
|
|
hwloc/include/private/private.h \
|
|
hwloc/include/private/debug.h \
|
|
hwloc/include/private/misc.h \
|
|
hwloc/include/private/cpuid.h
|
|
|
|
if HWLOC_HAVE_LINUX
|
|
headers += \
|
|
hwloc/include/hwloc/linux.h \
|
|
hwloc/include/hwloc/linux-libnuma.h
|
|
endif HWLOC_HAVE_LINUX
|
|
|
|
if HWLOC_HAVE_SCHED_SETAFFINITY
|
|
headers += hwloc/include/hwloc/glibc-sched.h
|
|
endif HWLOC_HAVE_SCHED_SETAFFINITY
|
|
|
|
# Conditionally install the header files
|
|
if WANT_INSTALL_HEADERS
|
|
opaldir = $(includedir)/openmpi/$(subdir)
|
|
nobase_opal_HEADERS = $(headers)
|
|
endif
|