Skip to content

Commit 46bb184

Browse files
authored
Merge pull request #8676 from hjelmn/fix_ompi_header_issues
Fix Open MPI header dependencies and inconsistencies
2 parents 782c6ef + 5eeadf0 commit 46bb184

17 files changed

+26
-15
lines changed

ompi/communicator/comm_request.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* $HEADER$
1010
*/
1111

12-
#if !defined(OMPI_COMM_REQ_H)
12+
#ifndef OMPI_COMM_REQ_H
1313
#define OMPI_COMM_REQ_H
1414

1515
#include "opal/class/opal_list.h"

ompi/datatype/ompi_datatype_internal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#define OMPI_DATATYPE_INTERNAL_H
3030

3131
#include "opal/datatype/opal_datatype_internal.h"
32+
#include "ompi/datatype/ompi_datatype.h"
3233

3334
/*
3435
* This is the OMPI-layered numbering of ALL supported MPI types

ompi/mca/coll/adapt/coll_adapt_topocache.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#ifndef MCA_COLL_ADAPT_TOPOCACHE_H
1414
#define MCA_COLL_ADAPT_TOPOCACHE_H
1515

16+
#include "ompi/communicator/communicator.h"
17+
#include "ompi/mca/coll/adapt/coll_adapt.h"
1618
#include "opal/class/opal_list.h"
1719
#include "ompi/mca/coll/coll.h"
1820
#include "ompi/mca/coll/base/coll_base_topo.h"

ompi/mca/coll/han/coll_han_dynamic.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#include "ompi/mca/mca.h"
2222
#include "opal/util/output.h"
2323
#include "ompi/mca/coll/base/coll_base_functions.h"
24-
#include "ompi/mca/coll/han/coll_han.h"
25-
2624

2725
/*
2826
* @file

ompi/mca/common/monitoring/common_monitoring_coll.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ BEGIN_C_DECLS
1919

2020
#include "ompi_config.h"
2121
#include "opal/mca/base/mca_base_pvar.h"
22+
#include "ompi/mca/common/monitoring/common_monitoring.h"
2223

2324
OMPI_DECLSPEC void mca_common_monitoring_coll_flush(FILE *pf, mca_monitoring_coll_data_t*data);
2425

ompi/mca/osc/rdma/osc_rdma_accumulate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* $HEADER$
1212
*/
1313

14-
#if !defined(OSC_RDMA_ACCUMULATE_H)
14+
#ifndef OSC_RDMA_ACCUMULATE_H
1515
#define OSC_RDMA_ACCUMULATE_H
1616

1717
#include "osc_rdma.h"

ompi/mca/osc/rdma/osc_rdma_active_target.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* $HEADER$
2121
*/
2222

23-
#if !defined(OSC_RDMA_ACTIVE_TARGET_H)
23+
#ifndef OSC_RDMA_ACTIVE_TARGET_H
2424
#define OSC_RDMA_ACTIVE_TARGET_H
2525

2626
#include "osc_rdma.h"

ompi/mca/osc/rdma/osc_rdma_comm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* $HEADER$
1212
*/
1313

14-
#if !defined(OMPI_OSC_RDMA_COMM_H)
14+
#ifndef OMPI_OSC_RDMA_COMM_H
1515
#define OMPI_OSC_RDMA_COMM_H
1616

1717
#include "osc_rdma_dynamic.h"

ompi/mca/osc/rdma/osc_rdma_lock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* $HEADER$
1313
*/
1414

15-
#if !defined(OMPI_OSC_RDMA_LOCK_H)
15+
#ifndef OMPI_OSC_RDMA_LOCK_H
1616
#define OMPI_OSC_RDMA_LOCK_H
1717

1818
#include "osc_rdma_types.h"

ompi/mca/osc/rdma/osc_rdma_passive_target.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* $HEADER$
1111
*/
1212

13-
#if !defined(OSC_RDMA_PASSIVE_TARGET_H)
13+
#ifndef OSC_RDMA_PASSIVE_TARGET_H
1414
#define OSC_RDMA_PASSIVE_TARGET_H
1515

1616
#include "osc_rdma.h"
@@ -129,4 +129,4 @@ int ompi_osc_rdma_flush_local (int target, struct ompi_win_t *win);
129129
*/
130130
int ompi_osc_rdma_flush_local_all (struct ompi_win_t *win);
131131

132-
#endif
132+
#endif /* OSC_RDMA_PASSIVE_TARGET_H */

0 commit comments

Comments
 (0)