Skip to content

Commit 291d765

Browse files
kawashima-fjkawashima-fj
authored
Merge pull request #6030 from ggouaillardet/topic/mpiext_short_path
mpiext: keep include path for extension short
2 parents 39daf7a + 27c25fa commit 291d765

Some content is hidden

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

58 files changed

+117
-79
lines changed

‎config/ompi_ext.m4‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ AC_DEFUN([EXT_CONFIGURE_M4_CONFIG_COMPONENT],[
409409
# - c/libmpiext_<component>.la: convneience library slurped into libmpi.la
410410
#
411411
# mpi.f.h:
412-
# - mpif-h/mpiext_<component>_mpifh.h: is included mpi mpif_ext.h
412+
# - mpif-h/<component>_mpifh.h: is included mpi mpif_ext.h
413413
# - mpif-h/libmpiext_<component>_mpifh.la: convenience library slurped
414414
# into libmpi_mpifh.la
415415
#
@@ -461,7 +461,7 @@ AC_DEFUN([EXT_PROCESS_COMPONENT],[
461461
###############
462462
# C Bindings
463463
###############
464-
test_header="${srcdir}/ompi/mpiext/$component/c/mpiext_${component}_c.h"
464+
test_header="${srcdir}/ompi/mpiext/${component}/c/${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/$component/c/mpiext_${component}_c.h"
482+
EXT_C_HEADERS="$EXT_C_HEADERS mpiext/c/${component}_c.h"
483483

484-
component_header="mpiext_${component}_c.h"
484+
component_header="${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/c/$component_header"
489+
#include "openmpi/ompi/mpiext/$component_header"
490490

491491
EOF
492492

@@ -497,7 +497,7 @@ EOF
497497
# Test if this extension has mpif.h bindings
498498
# If not, skip this step.
499499
#
500-
test_header="${srcdir}/ompi/mpiext/$component/mpif-h/mpiext_${component}_mpifh.h"
500+
test_header="${srcdir}/ompi/mpiext/$component/mpif-h/${component}_mpifh.h"
501501
enabled_mpifh=0
502502

503503
AC_MSG_CHECKING([if MPI Extension $component has mpif.h bindings])
@@ -507,10 +507,10 @@ EOF
507507
enabled_mpifh=1
508508

509509
# JMS Where is this needed?
510-
EXT_MPIFH_HEADERS="$EXT_MPIFH_HEADERS mpiext/$component/mpif-h/mpiext_${component}_mpifh.h"
510+
EXT_MPIFH_HEADERS="$EXT_MPIFH_HEADERS mpiext/${component}_mpifh.h"
511511
$4="$$4 $component"
512512

513-
component_header="mpiext_${component}_mpifh.h"
513+
component_header="${component}_mpifh.h"
514514

515515
cat >> $mpif_ext_h <<EOF
516516
!
@@ -519,7 +519,7 @@ EOF
519519
integer $component_define
520520
parameter ($component_define=1)
521521
522-
include 'openmpi/ompi/mpiext/$component/mpif-h/$component_header'
522+
include 'openmpi/ompi/mpiext/$component_header'
523523
524524
EOF
525525
else
@@ -566,7 +566,7 @@ EOF
566566
# srcdir is needed to find the header.
567567
#
568568
if test "$enabled_mpifh" = 1; then
569-
mpifh_component_header="mpiext_${component}_mpifh.h"
569+
mpifh_component_header="${component}_mpifh.h"
570570
cat >> $mpiusempi_ext_h <<EOF
571571
#include "${srcdir}/ompi/mpiext/$component/mpif-h/$mpifh_component_header"
572572
EOF
@@ -619,7 +619,7 @@ EOF
619619
# the srcdir is needed to find the header.
620620
#
621621
if test "$enabled_mpifh" = 1; then
622-
mpifh_component_header="mpiext_${component}_mpifh.h"
622+
mpifh_component_header="${component}_mpifh.h"
623623
cat >> $mpiusempif08_ext_h <<EOF
624624
#include "${srcdir}/ompi/mpiext/$component/mpif-h/$mpifh_component_header"
625625
EOF

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
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.
68
# $COPYRIGHT$
79
#
810
# Additional copyrights may follow
@@ -30,10 +32,10 @@ noinst_LTLIBRARIES = libmpiext_affinity_c.la
3032

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

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

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

ompi/mpiext/affinity/c/mpiext_affinity_c.h renamed to ompi/mpiext/affinity/c/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-2017 Research Organization for Information Science
10-
* and Technology (RIST). All rights reserved.
9+
* Copyright (c) 2015-2018 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/mpiext_affinity_c.h"
40+
#include "ompi/mpiext/affinity/c/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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
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.
68
# $COPYRIGHT$
79
#
810
# Additional copyrights may follow
@@ -22,10 +24,10 @@ noinst_LTLIBRARIES = libmpiext_cr_c.la
2224

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

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

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
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.
68
* $COPYRIGHT$
79
*
810
* Additional copyrights may follow
@@ -18,7 +20,7 @@
1820
#include "ompi/communicator/communicator.h"
1921
#include "orte/mca/snapc/snapc.h"
2022

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

2325
static const char FUNC_NAME[] = "OMPI_CR_Checkpoint";
2426
#define HANDLE_SIZE_MAX 256

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

File renamed without changes.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
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.
68
* $COPYRIGHT$
79
*
810
* Additional copyrights may follow
@@ -14,7 +16,7 @@
1416

1517
#include "ompi/mpi/c/bindings.h"
1618
#include "opal/runtime/opal_cr.h"
17-
#include "ompi/mpiext/cr/c/mpiext_cr_c.h"
19+
#include "ompi/mpiext/cr/c/cr_c.h"
1820

1921
#include "ompi/runtime/params.h"
2022
#include "ompi/communicator/communicator.h"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
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.
68
* $COPYRIGHT$
79
*
810
* Additional copyrights may follow
@@ -20,7 +22,7 @@
2022
#include "ompi/communicator/communicator.h"
2123
#include "orte/mca/snapc/snapc.h"
2224

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

2527
static const char FUNC_NAME[] = "OMPI_CR_Migrate";
2628

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
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.
68
* $COPYRIGHT$
79
*
810
* Additional copyrights may follow
@@ -18,7 +20,7 @@
1820
#include "ompi/communicator/communicator.h"
1921
#include "orte/mca/snapc/snapc.h"
2022

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

2325
static const char FUNC_NAME[] = "OMPI_CR_Quiesce_checkpoint";
2426

0 commit comments

Comments
 (0)