ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

hwloc: rename opal/mca/hwloc/hwloc.h -> hwloc-internal.h

Просмотр исходного кода 
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>
Этот коммит содержится в:
Jeff Squyres 2017-02-10 04:48:43 -08:00
родитель a065b9b83b
Коммит fec519a793
46 изменённых файлов: 98 добавлений и 82 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c
Просмотреть файл

@ -10,6 +10,7 @@
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights * Copyright (c) 2016 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -20,7 +21,7 @@
#include "ompi_config.h" #include "ompi_config.h"
#include "opal/constants.h" #include "opal/constants.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "ompi/mca/topo/treematch/topo_treematch.h" #include "ompi/mca/topo/treematch/topo_treematch.h"
#include "ompi/mca/topo/treematch/treematch/tm_mapping.h" #include "ompi/mca/topo/treematch/treematch/tm_mapping.h"

2
ompi/mca/topo/treematch/treematch/tm_hwloc.c
Просмотреть файл

@ -1,4 +1,4 @@
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "tm_tree.h" #include "tm_tree.h"
#include "tm_mapping.h" #include "tm_mapping.h"
#include <ctype.h> #include <ctype.h>

2
ompi/mca/topo/treematch/treematch/tm_hwloc.h
Просмотреть файл

@ -1,4 +1,4 @@
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "tm_tree.h" #include "tm_tree.h"
void hwloc_topology_tag(hwloc_topology_t topology); void hwloc_topology_tag(hwloc_topology_t topology);

2
ompi/mca/topo/treematch/treematch/tm_thread_pool.c
Просмотреть файл

@ -1,7 +1,7 @@
#include <pthread.h> #include <pthread.h>
#include "tm_thread_pool.h" #include "tm_thread_pool.h"
#include "tm_verbose.h" #include "tm_verbose.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "tm_verbose.h" #include "tm_verbose.h"
#include "tm_tree.h" #include "tm_tree.h"
#include <errno.h> #include <errno.h>

2
ompi/mca/topo/treematch/treematch/tm_thread_pool.h
Просмотреть файл

@ -2,7 +2,7 @@
#define THREAD_POOL_H #define THREAD_POOL_H
#include <pthread.h> #include <pthread.h>
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
typedef struct _work_t{ typedef struct _work_t{

4
opal/mca/btl/openib/btl_openib.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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-2015 Mellanox Technologies. All rights reserved.
* Copyright (c) 2006-2016 Los Alamos National Security, LLC. All rights * Copyright (c) 2006-2016 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
@ -84,7 +84,7 @@
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#ifndef MIN #ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b)) #define MIN(a,b) ((a)<(b)?(a):(b))

4
opal/mca/btl/openib/btl_openib_component.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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 Mellanox Technologies. All rights reserved.
* Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
@ -59,7 +59,7 @@
know its exact path. We have to rely on the framework header files know its exact path. We have to rely on the framework header files
to find the right hwloc verbs helper file for us. */ to find the right hwloc verbs helper file for us. */
#define OPAL_HWLOC_WANT_VERBS_HELPER 1 #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/hwloc/base/base.h"
#include "opal/mca/installdirs/installdirs.h" #include "opal/mca/installdirs/installdirs.h"
#include "opal_stdint.h" #include "opal_stdint.h"

9
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 # Copyright (c) 2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
@ -9,17 +9,12 @@
# $HEADER$ # $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
# main library setup # main library setup
noinst_LTLIBRARIES = libmca_hwloc.la noinst_LTLIBRARIES = libmca_hwloc.la
libmca_hwloc_la_SOURCES = libmca_hwloc_la_SOURCES =
# local files # local files
headers = hwloc.h headers = hwloc-internal.h
libmca_hwloc_la_SOURCES += $(headers) libmca_hwloc_la_SOURCES += $(headers)
# Conditionally install the header files # Conditionally install the header files

13
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

6
opal/mca/hwloc/base/base.h
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2012 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) 2013-2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -15,7 +15,7 @@
#include "opal/dss/dss_types.h" #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 * Global functions for MCA overall hwloc open and close
@ -88,7 +88,7 @@ OPAL_DECLSPEC int opal_hwloc_base_set_binding_policy(opal_binding_policy_t *poli
/** /**
* Loads opal_hwloc_my_cpuset (global variable in * 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 * will be loaded with this process' binding, or, if the process is
* not bound, use the hwloc root object's (available and online) * not bound, use the hwloc root object's (available and online)
* cpuset. * cpuset.

4
opal/mca/hwloc/base/hwloc_base_frame.c
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2014 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) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
@ -22,7 +22,7 @@
#include "opal/mca/base/base.h" #include "opal/mca/base/base.h"
#include "opal/threads/tsd.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" #include "opal/mca/hwloc/base/base.h"

4
opal/mca/hwloc/base/hwloc_base_maffinity.c
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* 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 (c) 2016 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -13,7 +13,7 @@
#include "opal/constants.h" #include "opal/constants.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/mca/hwloc/base/base.h" #include "opal/mca/hwloc/base/base.h"

4
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$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,7 +12,7 @@
#include "opal/constants.h" #include "opal/constants.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/mca/hwloc/base/base.h" #include "opal/mca/hwloc/base/base.h"

4
opal/mca/hwloc/base/hwloc_base_util.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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. * Copyright (c) 2012-2015 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
@ -42,7 +42,7 @@
#include "opal/threads/tsd.h" #include "opal/threads/tsd.h"
#include "opal/mca/pmix/pmix.h" #include "opal/mca/pmix/pmix.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/mca/hwloc/base/base.h" #include "opal/mca/hwloc/base/base.h"
/* /*

4
opal/mca/hwloc/configure.m4
Просмотреть файл

@ -1,6 +1,6 @@
dnl -*- shell-script -*- dnl -*- shell-script -*-
dnl 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 $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow
@ -13,7 +13,7 @@ dnl
# their priorities in their configure.m4 files. They must also set # their priorities in their configure.m4 files. They must also set
# the shell variable $opal_hwloc_base_include to a header file # the shell variable $opal_hwloc_base_include to a header file
# name (relative to the top OMPI source directory) that will be # 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 We only want one winning component (vs. STOP_AT_FIRST_PRIORITY,
dnl which will allow all components of the same priority who succeed to dnl which will allow all components of the same priority who succeed to

4
opal/mca/hwloc/external/configure.m4 поставляемый
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*- # -*- 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 # Copyright (c) 2014-2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# #
@ -38,7 +38,7 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
[Version of hwloc]) [Version of hwloc])
# Set this variable so that the framework m4 knows what # 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_external_basedir=opal/mca/hwloc/external
opal_hwloc_base_include="$opal_hwloc_external_basedir/external.h" opal_hwloc_base_include="$opal_hwloc_external_basedir/external.h"

4
opal/mca/hwloc/external/external.h поставляемый
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* 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 * Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* *
@ -11,7 +11,7 @@
* $HEADER$ * $HEADER$
* *
* When this component is used, this file is included in the rest of * 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. * this header represents the public interface to this static component.
*/ */

4
opal/mca/hwloc/external/hwloc_external_component.c поставляемый
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- 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 * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* *
@ -14,7 +14,7 @@
#include "opal_config.h" #include "opal_config.h"
#include "opal/constants.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 * Public string showing the sysinfo ompi_linux component version number

0
opal/mca/hwloc/hwloc.h → opal/mca/hwloc/hwloc-internal.h
Просмотреть файл

4
opal/mca/hwloc/hwloc1113/configure.m4
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*- # -*- shell-script -*-
# #
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
# Copyright (c) 2014-2015 Intel, Inc. All rights reserved. # Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
# Copyright (c) 2015-2016 Research Organization for Information Science # Copyright (c) 2015-2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
@ -45,7 +45,7 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_POST_CONFIG],[
AS_IF([test "$1" = "1" && test "$opal_hwloc_hwloc1113_support" = "yes"], AS_IF([test "$1" = "1" && test "$opal_hwloc_hwloc1113_support" = "yes"],
[ [
# Set this variable so that the framework m4 knows what # 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_hwloc1113_basedir=opal/mca/hwloc/hwloc1113 opal_hwloc_hwloc1113_basedir=opal/mca/hwloc/hwloc1113
opal_hwloc_base_include="$opal_hwloc_hwloc1113_basedir/hwloc1113.h" opal_hwloc_base_include="$opal_hwloc_hwloc1113_basedir/hwloc1113.h"

4
opal/mca/hwloc/hwloc1113/hwloc1113.h
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- 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) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights * Copyright (c) 2016 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
@ -12,7 +12,7 @@
* $HEADER$ * $HEADER$
* *
* When this component is used, this file is included in the rest of * 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. * this header represents the public interface to this static component.
*/ */

4
opal/mca/hwloc/hwloc1113/hwloc1113_component.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- 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) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
@ -21,7 +21,7 @@
#include "opal_config.h" #include "opal_config.h"
#include "opal/constants.h" #include "opal/constants.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "hwloc1113.h" #include "hwloc1113.h"
/* /*

3
opal/util/proc.h
Просмотреть файл

@ -6,6 +6,7 @@
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2016 Research Organization for Information Science * Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -18,7 +19,7 @@
#include "opal_config.h" #include "opal_config.h"
#include "opal/class/opal_list.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/types.h"
#include "opal/dss/dss.h" #include "opal/dss/dss.h"

3
orte/mca/grpcomm/base/base.h
Просмотреть файл

@ -12,6 +12,7 @@
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -33,7 +34,7 @@
#include "opal/class/opal_hash_table.h" #include "opal/class/opal_hash_table.h"
#include "opal/dss/dss_types.h" #include "opal/dss/dss_types.h"
#include "orte/mca/mca.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" #include "orte/mca/odls/odls_types.h"
#include "orte/mca/rml/rml_types.h" #include "orte/mca/rml/rml_types.h"

4
orte/mca/odls/alps/odls_alps_module.c
Просмотреть файл

@ -11,7 +11,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2010 Oracle and/or its affiliates. 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) 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) 2010 IBM Corporation. All rights reserved.
* Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights * Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
@ -106,7 +106,7 @@
#endif #endif
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/mca/hwloc/base/base.h" #include "opal/mca/hwloc/base/base.h"
#include "opal/class/opal_pointer_array.h" #include "opal/class/opal_pointer_array.h"
#include "opal/util/opal_environ.h" #include "opal/util/opal_environ.h"

4
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 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * 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) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science * Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
@ -52,7 +52,7 @@
#include "opal/util/path.h" #include "opal/util/path.h"
#include "opal/util/sys_limits.h" #include "opal/util/sys_limits.h"
#include "opal/dss/dss.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/shmem/base/base.h"
#include "opal/mca/pstat/pstat.h" #include "opal/mca/pstat/pstat.h"
#include "opal/mca/pmix/pmix.h" #include "opal/mca/pmix/pmix.h"

4
orte/mca/odls/base/odls_base_frame.c
Просмотреть файл

@ -10,7 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2010-2011 Oracle and/or its affiliates. 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. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science * Copyright (c) 2014-2015 Research Organization for Information Science
@ -31,7 +31,7 @@
#include "opal/class/opal_ring_buffer.h" #include "opal/class/opal_ring_buffer.h"
#include "orte/mca/mca.h" #include "orte/mca/mca.h"
#include "opal/mca/base/base.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/output.h"
#include "opal/util/path.h" #include "opal/util/path.h"
#include "opal/util/argv.h" #include "opal/util/argv.h"

4
orte/mca/odls/default/odls_default_module.c
Просмотреть файл

@ -11,7 +11,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2010 Oracle and/or its affiliates. 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) 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) 2010 IBM Corporation. All rights reserved.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
@ -106,7 +106,7 @@
#endif #endif
#include <ctype.h> #include <ctype.h>
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/mca/hwloc/base/base.h" #include "opal/mca/hwloc/base/base.h"
#include "opal/class/opal_pointer_array.h" #include "opal/class/opal_pointer_array.h"
#include "opal/util/opal_environ.h" #include "opal/util/opal_environ.h"

2
orte/mca/plm/base/plm_base_launch_support.c
Просмотреть файл

@ -40,7 +40,7 @@
#include "opal/util/argv.h" #include "opal/util/argv.h"
#include "opal/class/opal_pointer_array.h" #include "opal/class/opal_pointer_array.h"
#include "opal/dss/dss.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/dash_host/dash_host.h"
#include "orte/util/session_dir.h" #include "orte/util/session_dir.h"

4
orte/mca/ras/lsf/ras_lsf_module.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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) 2014 Intel, Inc. All rights reserved
* Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -32,7 +32,7 @@
#include "opal/util/argv.h" #include "opal/util/argv.h"
#include "opal/util/net.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/rmaps/rmaps_types.h"
#include "orte/mca/errmgr/errmgr.h" #include "orte/mca/errmgr/errmgr.h"

4
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) 2012 Los Alamos National Security, LLC. All rights reserved
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
@ -20,7 +20,7 @@
#include <ctype.h> #include <ctype.h>
#include "opal/class/opal_list.h" #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 "opal/util/argv.h"
#include "orte/util/show_help.h" #include "orte/util/show_help.h"

4
orte/mca/rmaps/lama/rmaps_lama.h
Просмотреть файл

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* *
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013-2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -34,7 +34,7 @@ extern orte_rmaps_base_module_t orte_rmaps_lama_module;
*********************************/ *********************************/
/* /*
* JJH: Can we reuse the opal_hwloc_level_t data structure in * JJH: Can we reuse the opal_hwloc_level_t data structure in
* opal/mca/hwloc/hwloc.h * opal/mca/hwloc/hwloc-internal.h
*/ */
typedef enum { typedef enum {
LAMA_LEVEL_MACHINE = 0, LAMA_LEVEL_MACHINE = 0,

4
orte/mca/rmaps/lama/rmaps_lama_module.c
Просмотреть файл

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* *
* Copyright (c) 2012-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2017 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2014 Intel, Inc. All rights reserved * Copyright (c) 2014 Intel, Inc. All rights reserved
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
@ -22,7 +22,7 @@
#endif /* HAVE_UNISTD_H */ #endif /* HAVE_UNISTD_H */
#include <string.h> #include <string.h>
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/util/argv.h" #include "opal/util/argv.h"
#include "opal/class/opal_tree.h" #include "opal/class/opal_tree.h"

3
orte/mca/rmaps/mindist/rmaps_mindist.h
Просмотреть файл

@ -10,6 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -26,7 +27,7 @@
#include "orte_config.h" #include "orte_config.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/class/opal_list.h" #include "opal/class/opal_list.h"
#include "orte/mca/rmaps/rmaps.h" #include "orte/mca/rmaps/rmaps.h"

4
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$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,7 +12,7 @@
#include "orte_config.h" #include "orte_config.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "orte/mca/rmaps/rmaps.h" #include "orte/mca/rmaps/rmaps.h"

6
orte/mca/rmaps/rmaps_types.h
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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 * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
@ -29,7 +29,7 @@
#include "orte/constants.h" #include "orte/constants.h"
#include "opal/class/opal_pointer_array.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" #include "orte/runtime/orte_globals.h"
@ -101,7 +101,7 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_job_map_t);
/* round-robin policies */ /* round-robin policies */
/* start with hardware-based options /* start with hardware-based options
* so the values match the corresponding * 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_BYNODE 1
#define ORTE_MAPPING_BYBOARD 2 #define ORTE_MAPPING_BYBOARD 2

3
orte/mca/rmaps/round_robin/rmaps_rr.h
Просмотреть файл

@ -10,6 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved.
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -26,7 +27,7 @@
#include "orte_config.h" #include "orte_config.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/class/opal_list.h" #include "opal/class/opal_list.h"
#include "orte/mca/rmaps/rmaps.h" #include "orte/mca/rmaps/rmaps.h"

4
orte/mca/rmaps/seq/rmaps_seq.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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. * Copyright (c) 2011 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
@ -36,7 +36,7 @@
#include "opal/util/if.h" #include "opal/util/if.h"
#include "opal/util/net.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/util/show_help.h"
#include "orte/mca/errmgr/errmgr.h" #include "orte/mca/errmgr/errmgr.h"

3
orte/mca/rtc/hwloc/rtc_hwloc.c
Просмотреть файл

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved * Copyright (c) 2014-2015 Intel, Inc. All rights reserved
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -17,7 +18,7 @@
#endif /* HAVE_UNISTD_H */ #endif /* HAVE_UNISTD_H */
#include <string.h> #include <string.h>
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/util/argv.h" #include "opal/util/argv.h"
#include "opal/util/opal_environ.h" #include "opal/util/opal_environ.h"

4
orte/orted/orted_main.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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) 2007-2016 Los Alamos National Security, LLC. All rights * Copyright (c) 2007-2016 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2009 Institut National de Recherche en Informatique * Copyright (c) 2009 Institut National de Recherche en Informatique
@ -65,7 +65,7 @@
#include "opal/mca/base/mca_base_var.h" #include "opal/mca/base/mca_base_var.h"
#include "opal/util/daemon_init.h" #include "opal/util/daemon_init.h"
#include "opal/dss/dss.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 "opal/mca/pmix/pmix.h"
#include "orte/util/show_help.h" #include "orte/util/show_help.h"

4
orte/orted/pmix/pmix_server_dyn.c
Просмотреть файл

@ -11,7 +11,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2006-2013 Los Alamos National Security, LLC. * Copyright (c) 2006-2013 Los Alamos National Security, LLC.
* All rights reserved. * 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) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Mellanox Technologies, Inc. * Copyright (c) 2014 Mellanox Technologies, Inc.
@ -38,7 +38,7 @@
#include "opal/util/output.h" #include "opal/util/output.h"
#include "opal/util/path.h" #include "opal/util/path.h"
#include "opal/dss/dss.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/errmgr/errmgr.h"
#include "orte/mca/rmaps/base/base.h" #include "orte/mca/rmaps/base/base.h"

4
orte/runtime/data_type_support/orte_dt_unpacking_fns.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
@ -27,7 +27,7 @@
#include "opal/dss/dss.h" #include "opal/dss/dss.h"
#include "opal/dss/dss_internal.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 "opal/util/argv.h"
#include "orte/mca/errmgr/errmgr.h" #include "orte/mca/errmgr/errmgr.h"

4
orte/runtime/orte_globals.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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) 2009-2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
@ -32,7 +32,7 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/mca/pmix/pmix.h" #include "opal/mca/pmix/pmix.h"
#include "opal/util/argv.h" #include "opal/util/argv.h"
#include "opal/util/output.h" #include "opal/util/output.h"

4
orte/runtime/orte_globals.h
Просмотреть файл

@ -10,7 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2010 Oracle and/or its affiliates. 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. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
@ -44,7 +44,7 @@
#include "opal/class/opal_ring_buffer.h" #include "opal/class/opal_ring_buffer.h"
#include "opal/threads/threads.h" #include "opal/threads/threads.h"
#include "opal/mca/event/event.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 "opal/mca/hwloc/base/base.h"
#include "orte/mca/plm/plm_types.h" #include "orte/mca/plm/plm_types.h"

3
orte/util/proc_info.h
Просмотреть файл

@ -12,6 +12,7 @@
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -40,7 +41,7 @@
#include "orte/types.h" #include "orte/types.h"
#include "opal/dss/dss_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" #include "opal/util/proc.h"
BEGIN_C_DECLS BEGIN_C_DECLS

3
oshmem/proc/proc.h
Просмотреть файл

@ -3,6 +3,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -21,7 +22,7 @@
#include "opal/class/opal_list.h" #include "opal/class/opal_list.h"
#include "opal/util/proc.h" #include "opal/util/proc.h"
#include "opal/dss/dss_types.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/types.h"
#include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_globals.h"