diff --git a/autogen.pl b/autogen.pl index 10d72872d27..42016f709bb 100755 --- a/autogen.pl +++ b/autogen.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved # Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013 Mellanox Technologies, Inc. # All rights reserved. @@ -432,11 +432,28 @@ sub mca_process_project { next if (! -d "$dir/$d" || $d eq "base" || substr($d, 0, 1) eq "."); - # If this directory has a $dir.h file and a base/ + my $framework_header = "$dir/$d/$d.h"; + + # If there's a $dir/$d/autogen.options file, read it + my $ao_file = "$dir/$d/autogen.options"; + if (-r $ao_file) { + verbose "\n>>> Found $dir/$d/autogen.options file\n"; + open(IN, $ao_file) || + die "$ao_file present, but cannot open it"; + while () { + if (m/\s*framework_header\s*=\s*(.+?)\s*$/) { + verbose " Framework header entry: $1\n"; + $framework_header = "$dir/$d/$1"; + } + } + close(IN); + } + + # If this directory has a framework header and a base/ # subdirectory, or its name is "common", then it's a # framework. if ("common" eq $d || !$project->{need_base} || - (-f "$dir/$d/$d.h" && -d "$dir/$d/base")) { + (-f $framework_header && -d "$dir/$d/base")) { verbose "\n=== Found $pname / $d framework\n"; mca_process_framework($topdir, $project, $d); } diff --git a/opal/mca/btl/openib/btl_openib.c b/opal/mca/btl/openib/btl_openib.c index d380c754a49..ddc9720acb3 100644 --- a/opal/mca/btl/openib/btl_openib.c +++ b/opal/mca/btl/openib/btl_openib.c @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2006-2015 Mellanox Technologies. All rights reserved. * Copyright (c) 2006-2016 Los Alamos National Security, LLC. All rights * reserved. @@ -80,7 +80,7 @@ #ifdef HAVE_UNISTD_H #include #endif -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) diff --git a/opal/mca/btl/openib/btl_openib_component.c b/opal/mca/btl/openib/btl_openib_component.c index 449eece7025..cde60ef77bf 100644 --- a/opal/mca/btl/openib/btl_openib_component.c +++ b/opal/mca/btl/openib/btl_openib_component.c @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2006-2015 Mellanox Technologies. All rights reserved. * Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights * reserved. @@ -59,7 +59,7 @@ know its exact path. We have to rely on the framework header files to find the right hwloc verbs helper file for us. */ #define OPAL_HWLOC_WANT_VERBS_HELPER 1 -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/hwloc/base/base.h" #include "opal/mca/installdirs/installdirs.h" #include "opal_stdint.h" diff --git a/opal/mca/btl/usnic/btl_usnic_hwloc.c b/opal/mca/btl/usnic/btl_usnic_hwloc.c index 78ef4c3abcb..75ca62a04df 100644 --- a/opal/mca/btl/usnic/btl_usnic_hwloc.c +++ b/opal/mca/btl/usnic/btl_usnic_hwloc.c @@ -9,7 +9,7 @@ #include "opal_config.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/constants.h" #if BTL_IN_OPAL diff --git a/opal/mca/hwloc/Makefile.am b/opal/mca/hwloc/Makefile.am index c5340da386d..fdda561a64f 100644 --- a/opal/mca/hwloc/Makefile.am +++ b/opal/mca/hwloc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2016 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved # Copyright (c) 2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ @@ -9,17 +9,14 @@ # $HEADER$ # -# We do not want -I$(srcdir) in AM_CPPFLAGS, or there can be a -# conflict between system hwloc.h and opal/mca/hwloc/hwloc.h. So just -# set only what we need to AM_CPPFLAGS. -AM_CPPFLAGS = -I$(top_builddir)/opal/include +EXTRA_DIST = autogen.options # main library setup noinst_LTLIBRARIES = libmca_hwloc.la libmca_hwloc_la_SOURCES = # local files -headers = hwloc.h +headers = hwloc-internal.h libmca_hwloc_la_SOURCES += $(headers) # Conditionally install the header files diff --git a/opal/mca/hwloc/autogen.options b/opal/mca/hwloc/autogen.options new file mode 100644 index 00000000000..2c5ecb747b6 --- /dev/null +++ b/opal/mca/hwloc/autogen.options @@ -0,0 +1,13 @@ +# Copyright (c) 2017 Cisco Systems, Inc. All rights reserved +# $COPYRIGHT$ +# + +# Per https://github.com/open-mpi/ompi/issues/2616, we cannot have an +# "hwloc.h" in the framework directory (due to conflicts of finding +# the system hwloc.h file when using "--with-hwloc=external"). Hence, +# we need to deviate from the framework norm of having +# framework/framework.h (i.e., hwloc/hwloc.h). Instead, we'll have +# hwloc/hwloc-internal.h to make sure that this header file can never +# be mistaken for a system-level hwloc.h. + +framework_header = hwloc-internal.h diff --git a/opal/mca/hwloc/base/base.h b/opal/mca/hwloc/base/base.h index 826aeb81a84..01fcc441f9a 100644 --- a/opal/mca/hwloc/base/base.h +++ b/opal/mca/hwloc/base/base.h @@ -1,6 +1,6 @@ /* - * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2013-2015 Intel, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved + * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -15,7 +15,7 @@ #include "opal/dss/dss_types.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" /* * Global functions for MCA overall hwloc open and close @@ -89,7 +89,7 @@ OPAL_DECLSPEC int opal_hwloc_base_set_binding_policy(opal_binding_policy_t *poli /** * Loads opal_hwloc_my_cpuset (global variable in - * opal/mca/hwloc/hwloc.h) for this process. opal_hwloc_my_cpuset + * opal/mca/hwloc/hwloc-internal.h) for this process. opal_hwloc_my_cpuset * will be loaded with this process' binding, or, if the process is * not bound, use the hwloc root object's (available and online) * cpuset. diff --git a/opal/mca/hwloc/base/hwloc_base_frame.c b/opal/mca/hwloc/base/hwloc_base_frame.c index 40dbd237bd1..a4b9048e631 100644 --- a/opal/mca/hwloc/base/hwloc_base_frame.c +++ b/opal/mca/hwloc/base/hwloc_base_frame.c @@ -1,6 +1,8 @@ /* - * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2013-2015 Intel, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved + * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -20,7 +22,7 @@ #include "opal/mca/base/base.h" #include "opal/threads/tsd.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/hwloc/base/base.h" diff --git a/opal/mca/hwloc/base/hwloc_base_maffinity.c b/opal/mca/hwloc/base/hwloc_base_maffinity.c index 6a9c5939ddf..26298bdca1d 100644 --- a/opal/mca/hwloc/base/hwloc_base_maffinity.c +++ b/opal/mca/hwloc/base/hwloc_base_maffinity.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -12,7 +13,7 @@ #include "opal/constants.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/hwloc/base/base.h" diff --git a/opal/mca/hwloc/base/hwloc_base_proc_mempolicy.c b/opal/mca/hwloc/base/hwloc_base_proc_mempolicy.c index b3715f60928..54c55648a78 100644 --- a/opal/mca/hwloc/base/hwloc_base_proc_mempolicy.c +++ b/opal/mca/hwloc/base/hwloc_base_proc_mempolicy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -12,7 +12,7 @@ #include "opal/constants.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/hwloc/base/base.h" diff --git a/opal/mca/hwloc/base/hwloc_base_util.c b/opal/mca/hwloc/base/hwloc_base_util.c index 7ae16c0496f..e91c18aa838 100644 --- a/opal/mca/hwloc/base/hwloc_base_util.c +++ b/opal/mca/hwloc/base/hwloc_base_util.c @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2012-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2013-2014 Intel, Inc. All rights reserved. @@ -41,7 +41,7 @@ #include "opal/util/show_help.h" #include "opal/threads/tsd.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/hwloc/base/base.h" /* diff --git a/opal/mca/hwloc/configure.m4 b/opal/mca/hwloc/configure.m4 index 10ec72be92a..1f933c34f30 100644 --- a/opal/mca/hwloc/configure.m4 +++ b/opal/mca/hwloc/configure.m4 @@ -1,6 +1,6 @@ dnl -*- shell-script -*- dnl -dnl Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -13,7 +13,7 @@ dnl # their priorities in their configure.m4 files. They must also set # the shell variable $opal_hwloc_base_include to a header file # name (relative to the top OMPI source directory) that will be -# included in opal/mca/hwloc/hwloc.h. +# included in opal/mca/hwloc/hwloc-internal.h. dnl We only want one winning component (vs. STOP_AT_FIRST_PRIORITY, dnl which will allow all components of the same priority who succeed to diff --git a/opal/mca/hwloc/external/configure.m4 b/opal/mca/hwloc/external/configure.m4 index c9c8a272df2..c3f17deb4b6 100644 --- a/opal/mca/hwloc/external/configure.m4 +++ b/opal/mca/hwloc/external/configure.m4 @@ -1,6 +1,6 @@ # -*- shell-script -*- # -# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved # Copyright (c) 2014-2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # @@ -38,7 +38,7 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[ [Version of hwloc]) # Set this variable so that the framework m4 knows what - # file to include in opal/mca/hwloc/hwloc.h + # file to include in opal/mca/hwloc/hwloc-internal.h opal_hwloc_external_basedir=opal/mca/hwloc/external opal_hwloc_base_include="$opal_hwloc_external_basedir/external.h" diff --git a/opal/mca/hwloc/external/external.h b/opal/mca/hwloc/external/external.h index 7cc89d74441..ed76ece744e 100644 --- a/opal/mca/hwloc/external/external.h +++ b/opal/mca/hwloc/external/external.h @@ -1,5 +1,7 @@ /* - * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved + * Copyright (c) 2016 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * * $COPYRIGHT$ * @@ -8,7 +10,7 @@ * $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.h. As such, + * 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. */ diff --git a/opal/mca/hwloc/external/hwloc_external_component.c b/opal/mca/hwloc/external/hwloc_external_component.c index 3c3df188d97..025267bbe53 100644 --- a/opal/mca/hwloc/external/hwloc_external_component.c +++ b/opal/mca/hwloc/external/hwloc_external_component.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. * @@ -14,7 +14,7 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" /* * Public string showing the sysinfo ompi_linux component version number diff --git a/opal/mca/hwloc/hwloc.h b/opal/mca/hwloc/hwloc-internal.h similarity index 100% rename from opal/mca/hwloc/hwloc.h rename to opal/mca/hwloc/hwloc-internal.h diff --git a/opal/mca/hwloc/hwloc1112/hwloc1112.h b/opal/mca/hwloc/hwloc1112/hwloc1112.h index 8b20bf623b9..78946e55acb 100644 --- a/opal/mca/hwloc/hwloc1112/hwloc1112.h +++ b/opal/mca/hwloc/hwloc1112/hwloc1112.h @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. + * 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. @@ -12,7 +12,7 @@ * $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.h. As such, + * 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. */ diff --git a/opal/mca/hwloc/hwloc1112/hwloc1112_component.c b/opal/mca/hwloc/hwloc1112/hwloc1112_component.c index 81177662763..a06e5344be8 100644 --- a/opal/mca/hwloc/hwloc1112/hwloc1112_component.c +++ b/opal/mca/hwloc/hwloc1112/hwloc1112_component.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights * reserved. @@ -21,7 +21,7 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "hwloc1112.h" /* diff --git a/opal/util/proc.h b/opal/util/proc.h index 15d37a1063f..90cee96d196 100644 --- a/opal/util/proc.h +++ b/opal/util/proc.h @@ -6,6 +6,7 @@ * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -18,7 +19,7 @@ #include "opal_config.h" #include "opal/class/opal_list.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/types.h" #include "opal/dss/dss.h" diff --git a/orte/mca/grpcomm/base/base.h b/orte/mca/grpcomm/base/base.h index db1b3264b13..7bec78e049e 100644 --- a/orte/mca/grpcomm/base/base.h +++ b/orte/mca/grpcomm/base/base.h @@ -11,7 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2013 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2013-2014 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -33,7 +34,7 @@ #include "opal/class/opal_hash_table.h" #include "opal/dss/dss_types.h" #include "orte/mca/mca.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "orte/mca/odls/odls_types.h" diff --git a/orte/mca/odls/alps/odls_alps_module.c b/orte/mca/odls/alps/odls_alps_module.c index 63daba20d4c..83f7a52dfc9 100644 --- a/orte/mca/odls/alps/odls_alps_module.c +++ b/orte/mca/odls/alps/odls_alps_module.c @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2007-2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2007 Evergrid, Inc. All rights reserved. - * Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2008-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2010 IBM Corporation. All rights reserved. * Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights * reserved. @@ -106,7 +106,7 @@ #endif -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/hwloc/base/base.h" #include "opal/class/opal_pointer_array.h" #include "opal/util/opal_environ.h" diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c index c9ada49a808..5c05d80b737 100644 --- a/orte/mca/odls/base/odls_base_default_fns.c +++ b/orte/mca/odls/base/odls_base_default_fns.c @@ -13,7 +13,7 @@ * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011-2015 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. @@ -52,7 +52,7 @@ #include "opal/util/path.h" #include "opal/util/sys_limits.h" #include "opal/dss/dss.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/shmem/base/base.h" #include "opal/mca/pstat/pstat.h" #include "opal/mca/pmix/pmix.h" diff --git a/orte/mca/odls/base/odls_base_frame.c b/orte/mca/odls/base/odls_base_frame.c index e615433957b..593a1470286 100644 --- a/orte/mca/odls/base/odls_base_frame.c +++ b/orte/mca/odls/base/odls_base_frame.c @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2011-2013 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science @@ -31,7 +31,7 @@ #include "opal/class/opal_ring_buffer.h" #include "orte/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/util/output.h" #include "opal/util/path.h" #include "opal/util/argv.h" diff --git a/orte/mca/odls/default/odls_default_module.c b/orte/mca/odls/default/odls_default_module.c index bef8e3ab094..cc6c3146272 100644 --- a/orte/mca/odls/default/odls_default_module.c +++ b/orte/mca/odls/default/odls_default_module.c @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2007-2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2007 Evergrid, Inc. All rights reserved. - * Copyright (c) 2008-2016 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2008-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2010 IBM Corporation. All rights reserved. * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights * reserved. @@ -106,7 +106,7 @@ #endif #include -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/hwloc/base/base.h" #include "opal/class/opal_pointer_array.h" #include "opal/util/opal_environ.h" diff --git a/orte/mca/plm/base/plm_base_launch_support.c b/orte/mca/plm/base/plm_base_launch_support.c index 6660655f3ee..a435ba14270 100644 --- a/orte/mca/plm/base/plm_base_launch_support.c +++ b/orte/mca/plm/base/plm_base_launch_support.c @@ -40,7 +40,7 @@ #include "opal/util/argv.h" #include "opal/class/opal_pointer_array.h" #include "opal/dss/dss.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "orte/util/dash_host/dash_host.h" #include "orte/util/session_dir.h" diff --git a/orte/mca/ras/lsf/ras_lsf_module.c b/orte/mca/ras/lsf/ras_lsf_module.c index 2aae886256a..becec82f213 100644 --- a/orte/mca/ras/lsf/ras_lsf_module.c +++ b/orte/mca/ras/lsf/ras_lsf_module.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2014 Intel, Inc. All rights reserved * Copyright (c) 2016 IBM Corporation. All rights reserved. * $COPYRIGHT$ @@ -32,7 +32,7 @@ #include "opal/util/argv.h" #include "opal/util/net.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "orte/mca/rmaps/rmaps_types.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/ras/simulator/ras_sim_module.c b/orte/mca/ras/simulator/ras_sim_module.c index dcf41e09ded..f5a910f6507 100644 --- a/orte/mca/ras/simulator/ras_sim_module.c +++ b/orte/mca/ras/simulator/ras_sim_module.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. @@ -20,7 +20,7 @@ #include #include "opal/class/opal_list.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/util/argv.h" #include "orte/util/show_help.h" diff --git a/orte/mca/rmaps/mindist/rmaps_mindist.h b/orte/mca/rmaps/mindist/rmaps_mindist.h index e437915bd9d..d29ac6d1e80 100644 --- a/orte/mca/rmaps/mindist/rmaps_mindist.h +++ b/orte/mca/rmaps/mindist/rmaps_mindist.h @@ -10,6 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,7 +27,7 @@ #include "orte_config.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/class/opal_list.h" #include "orte/mca/rmaps/rmaps.h" diff --git a/orte/mca/rmaps/ppr/rmaps_ppr.h b/orte/mca/rmaps/ppr/rmaps_ppr.h index 866ee148c0d..b74f32af2ab 100644 --- a/orte/mca/rmaps/ppr/rmaps_ppr.h +++ b/orte/mca/rmaps/ppr/rmaps_ppr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -12,7 +12,7 @@ #include "orte_config.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "orte/mca/rmaps/rmaps.h" diff --git a/orte/mca/rmaps/rmaps_types.h b/orte/mca/rmaps/rmaps_types.h index b4a4c93af62..127a9d445e6 100644 --- a/orte/mca/rmaps/rmaps_types.h +++ b/orte/mca/rmaps/rmaps_types.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. @@ -29,7 +29,7 @@ #include "orte/constants.h" #include "opal/class/opal_pointer_array.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "orte/runtime/orte_globals.h" @@ -101,7 +101,7 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_job_map_t); /* round-robin policies */ /* start with hardware-based options * so the values match the corresponding - * levels in opal/mca/hwloc/hwloc.h + * levels in opal/mca/hwloc/hwloc-internal.h */ #define ORTE_MAPPING_BYNODE 1 #define ORTE_MAPPING_BYBOARD 2 diff --git a/orte/mca/rmaps/round_robin/rmaps_rr.h b/orte/mca/rmaps/round_robin/rmaps_rr.h index d406c1267be..6591a3b6c20 100644 --- a/orte/mca/rmaps/round_robin/rmaps_rr.h +++ b/orte/mca/rmaps/round_robin/rmaps_rr.h @@ -10,6 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,7 +27,7 @@ #include "orte_config.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/class/opal_list.h" #include "orte/mca/rmaps/rmaps.h" diff --git a/orte/mca/rmaps/seq/rmaps_seq.c b/orte/mca/rmaps/seq/rmaps_seq.c index 13fc21c451d..f67500817d3 100644 --- a/orte/mca/rmaps/seq/rmaps_seq.c +++ b/orte/mca/rmaps/seq/rmaps_seq.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2006-2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2011 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. @@ -36,7 +36,7 @@ #include "opal/util/if.h" #include "opal/util/net.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "orte/util/show_help.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/rtc/hwloc/rtc_hwloc.c b/orte/mca/rtc/hwloc/rtc_hwloc.c index 91cb18328bb..8c56efa9793 100644 --- a/orte/mca/rtc/hwloc/rtc_hwloc.c +++ b/orte/mca/rtc/hwloc/rtc_hwloc.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2014-2015 Intel, Inc. All rights reserved + * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -17,7 +18,7 @@ #endif /* HAVE_UNISTD_H */ #include -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" diff --git a/orte/orted/orted_main.c b/orte/orted/orted_main.c index c53e49bc521..3120aa7d5c7 100644 --- a/orte/orted/orted_main.c +++ b/orte/orted/orted_main.c @@ -9,8 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007-2013 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2007-2015 Los Alamos National Security, LLC. All rights + * Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved + * Copyright (c) 2007-2016 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2009 Institut National de Recherche en Informatique * et Automatique. All rights reserved. @@ -63,7 +63,7 @@ #include "opal/mca/base/mca_base_var.h" #include "opal/util/daemon_init.h" #include "opal/dss/dss.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/pmix/pmix.h" #include "orte/util/show_help.h" diff --git a/orte/orted/pmix/pmix_server_dyn.c b/orte/orted/pmix/pmix_server_dyn.c index e9bfe5cd095..74a26dd083d 100644 --- a/orte/orted/pmix/pmix_server_dyn.c +++ b/orte/orted/pmix/pmix_server_dyn.c @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2006-2013 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014 Mellanox Technologies, Inc. @@ -38,7 +38,7 @@ #include "opal/util/output.h" #include "opal/util/path.h" #include "opal/dss/dss.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rmaps/base/base.h" diff --git a/orte/runtime/data_type_support/orte_dt_unpacking_fns.c b/orte/runtime/data_type_support/orte_dt_unpacking_fns.c index f0a4fb5342d..afd5e24b7ef 100644 --- a/orte/runtime/data_type_support/orte_dt_unpacking_fns.c +++ b/orte/runtime/data_type_support/orte_dt_unpacking_fns.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2011-2013 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. @@ -27,7 +27,7 @@ #include "opal/dss/dss.h" #include "opal/dss/dss_internal.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/util/argv.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/runtime/orte_globals.c b/orte/runtime/orte_globals.c index 1daf43cd9c9..ee4391429f9 100644 --- a/orte/runtime/orte_globals.c +++ b/orte/runtime/orte_globals.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011-2013 Los Alamos National Security, LLC. * All rights reserved. @@ -32,7 +32,7 @@ #include #endif -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/pmix/pmix.h" #include "opal/util/argv.h" #include "opal/util/output.h" diff --git a/orte/runtime/orte_globals.h b/orte/runtime/orte_globals.h index d1ca5d66cb1..5c73cf81374 100644 --- a/orte/runtime/orte_globals.h +++ b/orte/runtime/orte_globals.h @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2010 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2011-2013 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2013-2015 Intel, Inc. All rights reserved @@ -44,7 +44,7 @@ #include "opal/class/opal_ring_buffer.h" #include "opal/threads/threads.h" #include "opal/mca/event/event.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/hwloc/base/base.h" #include "orte/mca/plm/plm_types.h" diff --git a/orte/test/mpi/hello.c b/orte/test/mpi/hello.c index e8dbb2ac2c3..a04a3cf7f9e 100644 --- a/orte/test/mpi/hello.c +++ b/orte/test/mpi/hello.c @@ -6,7 +6,7 @@ */ #include -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "mpi.h" #include "orte/util/proc_info.h" diff --git a/orte/util/proc_info.h b/orte/util/proc_info.h index f5d451d50a2..2dc9a1c3f06 100644 --- a/orte/util/proc_info.h +++ b/orte/util/proc_info.h @@ -11,7 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2013-2015 Intel, Inc. All rights reserved + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved + * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -40,7 +41,7 @@ #include "orte/types.h" #include "opal/dss/dss_types.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/util/proc.h" BEGIN_C_DECLS diff --git a/oshmem/proc/proc.h b/oshmem/proc/proc.h index e399f389e85..28d0a7b9d78 100644 --- a/oshmem/proc/proc.h +++ b/oshmem/proc/proc.h @@ -3,6 +3,7 @@ * All rights reserved. * Copyright (c) 2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -21,7 +22,7 @@ #include "opal/class/opal_list.h" #include "opal/util/proc.h" #include "opal/dss/dss_types.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/hwloc-internal.h" #include "orte/types.h" #include "orte/runtime/orte_globals.h"