Skip to content

Commit ccbdc8f

Browse files
ggouaillardetggouaillardet
committed
Revert "c: keep include path for extension short"
This reverts commit 27c25fa. Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent a21602d commit ccbdc8f

Some content is hidden

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

54 files changed

+68
-104
lines changed

‎config/ompi_ext.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ AC_DEFUN([EXT_PROCESS_COMPONENT],[
461461
###############
462462
# C Bindings
463463
###############
464-
test_header="${srcdir}/ompi/mpiext/${component}/c/${component}_c.h"
464+
test_header="${srcdir}/ompi/mpiext/$component/c/mpiext_${component}_c.h"
465465

466466
AC_MSG_CHECKING([if MPI Extension $component has C bindings])
467467

@@ -479,14 +479,14 @@ AC_DEFUN([EXT_PROCESS_COMPONENT],[
479479
$3="$$3 $component"
480480

481481
# JMS Where is this needed?
482-
EXT_C_HEADERS="$EXT_C_HEADERS mpiext/c/${component}_c.h"
482+
EXT_C_HEADERS="$EXT_C_HEADERS mpiext/$component/c/mpiext_${component}_c.h"
483483

484-
component_header="${component}_c.h"
484+
component_header="mpiext_${component}_c.h"
485485

486486
cat >> $mpi_ext_h <<EOF
487487
/* Enabled Extension: $component */
488488
#define $component_define 1
489-
#include "openmpi/ompi/mpiext/$component_header"
489+
#include "openmpi/ompi/mpiext/$component/c/$component_header"
490490

491491
EOF
492492

‎ompi/mpiext/affinity/c/Makefile.am

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
# University Research and Technology
44
# Corporation. All rights reserved.
55
# Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
6-
# Copyright (c) 2018 Research Organization for Information Science
7-
# and Technology (RIST). All rights reserved.
86
# $COPYRIGHT$
97
#
108
# Additional copyrights may follow
@@ -32,10 +30,10 @@ noinst_LTLIBRARIES = libmpiext_affinity_c.la
3230

3331
# This is where the top-level header file (that is included in
3432
# <mpi-ext.h>) must be installed.
35-
ompidir = $(ompiincludedir)/ompi/mpiext
33+
ompidir = $(ompiincludedir)/ompi/mpiext/affinity/c
3634

3735
# This is the header file that is installed.
38-
ompi_HEADERS = affinity_c.h
36+
ompi_HEADERS = mpiext_affinity_c.h
3937

4038
# Sources for the convenience libtool library. Other than the one
4139
# header file, all source files in the extension have no file naming

‎ompi/mpiext/affinity/c/affinity_c.h renamed to ‎ompi/mpiext/affinity/c/mpiext_affinity_c.h

File renamed without changes.

‎ompi/mpiext/affinity/c/mpiext_affinity_str.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
77
* Copyright (c) 2012 Los Alamos National Security, LLC. All rights
88
* reserved.
9-
* Copyright (c) 2015-2018 Research Organization for Information Science
10-
* and Technology (RIST). All rights reserved.
9+
* Copyright (c) 2015-2017 Research Organization for Information Science
10+
* and Technology (RIST). All rights reserved.
1111
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
1212
* $COPYRIGHT$
1313
*
@@ -37,7 +37,7 @@
3737
#include "ompi/errhandler/errhandler.h"
3838
#include "ompi/mca/rte/rte.h"
3939
#include "ompi/mpi/c/bindings.h"
40-
#include "ompi/mpiext/affinity/c/affinity_c.h"
40+
#include "ompi/mpiext/affinity/c/mpiext_affinity_c.h"
4141

4242
static const char FUNC_NAME[] = "OMPI_Affinity";
4343
static const char ompi_nobind_str[] = "Open MPI did not bind this process";

‎ompi/mpiext/cr/c/Makefile.am

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
# University Research and Technology
44
# Corporation. All rights reserved.
55
# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
6-
# Copyright (c) 2018 Research Organization for Information Science
7-
# and Technology (RIST). All rights reserved.
86
# $COPYRIGHT$
97
#
108
# Additional copyrights may follow
@@ -24,10 +22,10 @@ noinst_LTLIBRARIES = libmpiext_cr_c.la
2422

2523
# This is where the top-level header file (that is included in
2624
# <mpi-ext.h>) must be installed.
27-
ompidir = $(ompiincludedir)/ompi/mpiext
25+
ompidir = $(ompiincludedir)/ompi/mpiext/cr/c
2826

2927
# This is the header file that is installed.
30-
ompi_HEADERS = cr_c.h
28+
ompi_HEADERS = mpiext_cr_c.h
3129

3230
# Sources for the convenience libtool library. Other than the one
3331
# header file, all source files in the extension have no file naming

‎ompi/mpiext/cr/c/checkpoint.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* University Research and Technology
44
* Corporation. All rights reserved.
55
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
6-
* Copyright (c) 2018 Research Organization for Information Science
7-
* and Technology (RIST). All rights reserved.
86
* $COPYRIGHT$
97
*
108
* Additional copyrights may follow
@@ -20,7 +18,7 @@
2018
#include "ompi/communicator/communicator.h"
2119
#include "orte/mca/snapc/snapc.h"
2220

23-
#include "ompi/mpiext/cr/c/cr_c.h"
21+
#include "ompi/mpiext/cr/c/mpiext_cr_c.h"
2422

2523
static const char FUNC_NAME[] = "OMPI_CR_Checkpoint";
2624
#define HANDLE_SIZE_MAX 256

‎ompi/mpiext/cr/c/inc_register_callback.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* University Research and Technology
44
* Corporation. All rights reserved.
55
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
6-
* Copyright (c) 2018 Research Organization for Information Science
7-
* and Technology (RIST). All rights reserved.
86
* $COPYRIGHT$
97
*
108
* Additional copyrights may follow
@@ -16,7 +14,7 @@
1614

1715
#include "ompi/mpi/c/bindings.h"
1816
#include "opal/runtime/opal_cr.h"
19-
#include "ompi/mpiext/cr/c/cr_c.h"
17+
#include "ompi/mpiext/cr/c/mpiext_cr_c.h"
2018

2119
#include "ompi/runtime/params.h"
2220
#include "ompi/communicator/communicator.h"

‎ompi/mpiext/cr/c/migrate.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* University Research and Technology
44
* Corporation. All rights reserved.
55
* Copyright (c) 2012-2018 Cisco Systems, Inc. All rights reserved
6-
* Copyright (c) 2018 Research Organization for Information Science
7-
* and Technology (RIST). All rights reserved.
86
* $COPYRIGHT$
97
*
108
* Additional copyrights may follow
@@ -22,7 +20,7 @@
2220
#include "ompi/communicator/communicator.h"
2321
#include "orte/mca/snapc/snapc.h"
2422

25-
#include "ompi/mpiext/cr/c/cr_c.h"
23+
#include "ompi/mpiext/cr/c/mpiext_cr_c.h"
2624

2725
static const char FUNC_NAME[] = "OMPI_CR_Migrate";
2826

‎ompi/mpiext/cr/c/cr_c.h renamed to ‎ompi/mpiext/cr/c/mpiext_cr_c.h

File renamed without changes.

‎ompi/mpiext/cr/c/quiesce_checkpoint.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* University Research and Technology
44
* Corporation. All rights reserved.
55
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
6-
* Copyright (c) 2018 Research Organization for Information Science
7-
* and Technology (RIST). All rights reserved.
86
* $COPYRIGHT$
97
*
108
* Additional copyrights may follow
@@ -20,7 +18,7 @@
2018
#include "ompi/communicator/communicator.h"
2119
#include "orte/mca/snapc/snapc.h"
2220

23-
#include "ompi/mpiext/cr/c/cr_c.h"
21+
#include "ompi/mpiext/cr/c/mpiext_cr_c.h"
2422

2523
static const char FUNC_NAME[] = "OMPI_CR_Quiesce_checkpoint";
2624

0 commit comments

Comments
 (0)