Skip to content

Commit 69bc2e8

Browse files
ggouaillardetjsquyres
ggouaillardet
authored and
jsquyres
committed
misc: fix <> vs "" includes throught the ompi codebase
This commit fixes an issue with the include usage in some ompi source files. These source files are using the <> form of include when the "" form is correct (as these are internal, **not** system headers). Signed-off-by: Gilles Gouaillardet <[email protected]> Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 4c7890d commit 69bc2e8

File tree

56 files changed

+289
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+289
-211
lines changed

‎autogen.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ (\$\@)
399399
#ifndef $ifdef_string
400400
#define $ifdef_string
401401
402-
#include <opal/mca/base/mca_base_framework.h>
402+
#include \"opal/mca/base/mca_base_framework.h\"
403403
404404
$framework_decl_output
405405
static mca_base_framework_t *${project}_frameworks[] = {

‎ompi/mca/coll/monitoring/coll_monitoring.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2016 Inria. All rights reserved.
3-
* Copyright (c) 2017 Research Organization for Information Science
4-
* and Technology (RIST). All rights reserved.
3+
* Copyright (c) 2017-2019 Research Organization for Information Science
4+
* and Technology (RIST). All rights reserved.
55
* Copyright (c) 2017 Amazon.com, Inc. or its affiliates. All Rights
66
* reserved.
77
* $COPYRIGHT$
@@ -16,13 +16,13 @@
1616

1717
BEGIN_C_DECLS
1818

19-
#include <ompi_config.h>
20-
#include <ompi/mca/coll/coll.h>
21-
#include <ompi/op/op.h>
22-
#include <ompi/request/request.h>
23-
#include <ompi/datatype/ompi_datatype.h>
24-
#include <ompi/communicator/communicator.h>
25-
#include <ompi/mca/common/monitoring/common_monitoring.h>
19+
#include "ompi_config.h"
20+
#include "ompi/mca/coll/coll.h"
21+
#include "ompi/op/op.h"
22+
#include "ompi/request/request.h"
23+
#include "ompi/datatype/ompi_datatype.h"
24+
#include "ompi/communicator/communicator.h"
25+
#include "ompi/mca/common/monitoring/common_monitoring.h"
2626

2727
struct mca_coll_monitoring_component_t {
2828
mca_coll_base_component_t super;

‎ompi/mca/coll/monitoring/coll_monitoring_allgather.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
/*
22
* Copyright (c) 2016-2018 Inria. All rights reserved.
3+
* Copyright (c) 2019 Research Organization for Information Science
4+
* and Technology (RIST). All rights reserved.
35
* $COPYRIGHT$
46
*
57
* Additional copyrights may follow
68
*
79
* $HEADER$
810
*/
911

10-
#include <ompi_config.h>
11-
#include <ompi/request/request.h>
12-
#include <ompi/datatype/ompi_datatype.h>
13-
#include <ompi/communicator/communicator.h>
12+
#include "ompi_config.h"
13+
#include "ompi/request/request.h"
14+
#include "ompi/datatype/ompi_datatype.h"
15+
#include "ompi/communicator/communicator.h"
1416
#include "coll_monitoring.h"
1517

1618
int mca_coll_monitoring_allgather(const void *sbuf, int scount,

‎ompi/mca/coll/monitoring/coll_monitoring_allgatherv.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
/*
22
* Copyright (c) 2016-2018 Inria. All rights reserved.
3+
* Copyright (c) 2019 Research Organization for Information Science
4+
* and Technology (RIST). All rights reserved.
35
* $COPYRIGHT$
46
*
57
* Additional copyrights may follow
68
*
79
* $HEADER$
810
*/
911

10-
#include <ompi_config.h>
11-
#include <ompi/request/request.h>
12-
#include <ompi/datatype/ompi_datatype.h>
13-
#include <ompi/communicator/communicator.h>
12+
#include "ompi_config.h"
13+
#include "ompi/request/request.h"
14+
#include "ompi/datatype/ompi_datatype.h"
15+
#include "ompi/communicator/communicator.h"
1416
#include "coll_monitoring.h"
1517

1618
int mca_coll_monitoring_allgatherv(const void *sbuf, int scount,

‎ompi/mca/coll/monitoring/coll_monitoring_allreduce.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
/*
22
* Copyright (c) 2016-2018 Inria. All rights reserved.
3+
* Copyright (c) 2019 Research Organization for Information Science
4+
* and Technology (RIST). All rights reserved.
35
* $COPYRIGHT$
46
*
57
* Additional copyrights may follow
68
*
79
* $HEADER$
810
*/
911

10-
#include <ompi_config.h>
11-
#include <ompi/op/op.h>
12-
#include <ompi/request/request.h>
13-
#include <ompi/datatype/ompi_datatype.h>
14-
#include <ompi/communicator/communicator.h>
12+
#include "ompi_config.h"
13+
#include "ompi/op/op.h"
14+
#include "ompi/request/request.h"
15+
#include "ompi/datatype/ompi_datatype.h"
16+
#include "ompi/communicator/communicator.h"
1517
#include "coll_monitoring.h"
1618

1719
int mca_coll_monitoring_allreduce(const void *sbuf, void *rbuf, int count,

‎ompi/mca/coll/monitoring/coll_monitoring_alltoall.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
/*
22
* Copyright (c) 2016-2018 Inria. All rights reserved.
3+
* Copyright (c) 2019 Research Organization for Information Science
4+
* and Technology (RIST). All rights reserved.
35
* $COPYRIGHT$
46
*
57
* Additional copyrights may follow
68
*
79
* $HEADER$
810
*/
911

10-
#include <ompi_config.h>
11-
#include <ompi/request/request.h>
12-
#include <ompi/datatype/ompi_datatype.h>
13-
#include <ompi/communicator/communicator.h>
12+
#include "ompi_config.h"
13+
#include "ompi/request/request.h"
14+
#include "ompi/datatype/ompi_datatype.h"
15+
#include "ompi/communicator/communicator.h"
1416
#include "coll_monitoring.h"
1517

1618
int mca_coll_monitoring_alltoall(const void *sbuf, int scount, struct ompi_datatype_t *sdtype,

‎ompi/mca/coll/monitoring/coll_monitoring_alltoallv.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
/*
22
* Copyright (c) 2016-2018 Inria. All rights reserved.
3+
* Copyright (c) 2019 Research Organization for Information Science
4+
* and Technology (RIST). All rights reserved.
35
* $COPYRIGHT$
46
*
57
* Additional copyrights may follow
68
*
79
* $HEADER$
810
*/
911

10-
#include <ompi_config.h>
11-
#include <ompi/request/request.h>
12-
#include <ompi/datatype/ompi_datatype.h>
13-
#include <ompi/communicator/communicator.h>
12+
#include "ompi_config.h"
13+
#include "ompi/request/request.h"
14+
#include "ompi/datatype/ompi_datatype.h"
15+
#include "ompi/communicator/communicator.h"
1416
#include "coll_monitoring.h"
1517

1618
int mca_coll_monitoring_alltoallv(const void *sbuf, const int *scounts, const int *sdisps,

‎ompi/mca/coll/monitoring/coll_monitoring_alltoallw.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
/*
22
* Copyright (c) 2016-2018 Inria. All rights reserved.
3+
* Copyright (c) 2019 Research Organization for Information Science
4+
* and Technology (RIST). All rights reserved.
35
* $COPYRIGHT$
46
*
57
* Additional copyrights may follow
68
*
79
* $HEADER$
810
*/
911

10-
#include <ompi_config.h>
11-
#include <ompi/request/request.h>
12-
#include <ompi/datatype/ompi_datatype.h>
13-
#include <ompi/communicator/communicator.h>
12+
#include "ompi_config.h"
13+
#include "ompi/request/request.h"
14+
#include "ompi/datatype/ompi_datatype.h"
15+
#include "ompi/communicator/communicator.h"
1416
#include "coll_monitoring.h"
1517

1618
int mca_coll_monitoring_alltoallw(const void *sbuf, const int *scounts,

‎ompi/mca/coll/monitoring/coll_monitoring_barrier.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
/*
22
* Copyright (c) 2016-2018 Inria. All rights reserved.
3+
* Copyright (c) 2019 Research Organization for Information Science
4+
* and Technology (RIST). All rights reserved.
35
* $COPYRIGHT$
46
*
57
* Additional copyrights may follow
68
*
79
* $HEADER$
810
*/
911

10-
#include <ompi_config.h>
11-
#include <ompi/request/request.h>
12-
#include <ompi/communicator/communicator.h>
12+
#include "ompi_config.h"
13+
#include "ompi/request/request.h"
14+
#include "ompi/communicator/communicator.h"
1315
#include "coll_monitoring.h"
1416

1517
int mca_coll_monitoring_barrier(struct ompi_communicator_t *comm,

‎ompi/mca/coll/monitoring/coll_monitoring_bcast.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*
22
* Copyright (c) 2016-2018 Inria. All rights reserved.
3-
* Copyright (c) 2017 Research Organization for Information Science
4-
* and Technology (RIST). All rights reserved.
3+
* Copyright (c) 2017-2019 Research Organization for Information Science
4+
* and Technology (RIST). All rights reserved.
55
* $COPYRIGHT$
66
*
77
* Additional copyrights may follow
88
*
99
* $HEADER$
1010
*/
1111

12-
#include <ompi_config.h>
13-
#include <ompi/request/request.h>
14-
#include <ompi/datatype/ompi_datatype.h>
15-
#include <ompi/communicator/communicator.h>
12+
#include "ompi_config.h"
13+
#include "ompi/request/request.h"
14+
#include "ompi/datatype/ompi_datatype.h"
15+
#include "ompi/communicator/communicator.h"
1616
#include "coll_monitoring.h"
1717

1818
int mca_coll_monitoring_bcast(void *buff, int count,

0 commit comments

Comments
 (0)