c: keep include path for extension short

move openmpi/ompi/mpiext/FOO/c/mpiext_FOO_c.h to openmpi/ompi/mpiext/FOO_c.h in order to use consistent paths with mpif.h extensions Refs. open-mpi/ompi#6019 Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
2018-11-27 10:06:25 +09:00 · 2018-11-27 10:06:25 +09:00 · 27c25fa721
--- a/config/ompi_ext.m4
+++ b/config/ompi_ext.m4
@ -461,7 +461,7 @@ AC_DEFUN([EXT_PROCESS_COMPONENT],[
    ###############
    # C Bindings
    ###############
-    test_header="${srcdir}/ompi/mpiext/$component/c/mpiext_${component}_c.h"
+    test_header="${srcdir}/ompi/mpiext/${component}/c/${component}_c.h"

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

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

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

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

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

 EOF

--- a/ompi/mpiext/affinity/c/Makefile.am
+++ b/ompi/mpiext/affinity/c/Makefile.am
@ -3,6 +3,8 @@
 #                         University Research and Technology
 #                         Corporation.  All rights reserved.
 # Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2018      Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@ -30,10 +32,10 @@ noinst_LTLIBRARIES = libmpiext_affinity_c.la

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

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

 # Sources for the convenience libtool library.  Other than the one
 # header file, all source files in the extension have no file naming
--- a/ompi/mpiext/affinity/c/mpiext_affinity_c.h
+++ b/ompi/mpiext/affinity/c/mpiext_affinity_c.h
--- a/ompi/mpiext/affinity/c/mpiext_affinity_str.c
+++ b/ompi/mpiext/affinity/c/mpiext_affinity_str.c
@ -6,8 +6,8 @@
 * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
 * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights
 *                         reserved.
- * Copyright (c) 2015-2017 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2018 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
 * $COPYRIGHT$
 *
@ -37,7 +37,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/mca/rte/rte.h"
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mpiext/affinity/c/mpiext_affinity_c.h"
+#include "ompi/mpiext/affinity/c/affinity_c.h"

 static const char FUNC_NAME[] = "OMPI_Affinity";
 static const char ompi_nobind_str[] = "Open MPI did not bind this process";
--- a/ompi/mpiext/cr/c/Makefile.am
+++ b/ompi/mpiext/cr/c/Makefile.am
@ -3,6 +3,8 @@
 #                         University Research and Technology
 #                         Corporation.  All rights reserved.
 # Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2018      Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@ -22,10 +24,10 @@ noinst_LTLIBRARIES = libmpiext_cr_c.la

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

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

 # Sources for the convenience libtool library.  Other than the one
 # header file, all source files in the extension have no file naming
--- a/ompi/mpiext/cr/c/checkpoint.c
+++ b/ompi/mpiext/cr/c/checkpoint.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -18,7 +20,7 @@
 #include "ompi/communicator/communicator.h"
 #include "orte/mca/snapc/snapc.h"

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

 static const char FUNC_NAME[] = "OMPI_CR_Checkpoint";
 #define HANDLE_SIZE_MAX 256
--- a/ompi/mpiext/cr/c/mpiext_cr_c.h
+++ b/ompi/mpiext/cr/c/mpiext_cr_c.h
--- a/ompi/mpiext/cr/c/inc_register_callback.c
+++ b/ompi/mpiext/cr/c/inc_register_callback.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -14,7 +16,7 @@

 #include "ompi/mpi/c/bindings.h"
 #include "opal/runtime/opal_cr.h"
-#include "ompi/mpiext/cr/c/mpiext_cr_c.h"
+#include "ompi/mpiext/cr/c/cr_c.h"

 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"
--- a/ompi/mpiext/cr/c/migrate.c
+++ b/ompi/mpiext/cr/c/migrate.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2012-2018 Cisco Systems, Inc.  All rights reserved
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -20,7 +22,7 @@
 #include "ompi/communicator/communicator.h"
 #include "orte/mca/snapc/snapc.h"

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

 static const char FUNC_NAME[] = "OMPI_CR_Migrate";

--- a/ompi/mpiext/cr/c/quiesce_checkpoint.c
+++ b/ompi/mpiext/cr/c/quiesce_checkpoint.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -18,7 +20,7 @@
 #include "ompi/communicator/communicator.h"
 #include "orte/mca/snapc/snapc.h"

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

 static const char FUNC_NAME[] = "OMPI_CR_Quiesce_checkpoint";

--- a/ompi/mpiext/cr/c/quiesce_end.c
+++ b/ompi/mpiext/cr/c/quiesce_end.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -18,7 +20,7 @@
 #include "ompi/communicator/communicator.h"
 #include "orte/mca/snapc/snapc.h"

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

 static const char FUNC_NAME[] = "OMPI_CR_Quiesce_end";

--- a/ompi/mpiext/cr/c/quiesce_start.c
+++ b/ompi/mpiext/cr/c/quiesce_start.c
@ -7,6 +7,8 @@
 *                         reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -22,7 +24,7 @@
 #include "ompi/communicator/communicator.h"
 #include "orte/mca/snapc/snapc.h"

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

 static const char FUNC_NAME[] = "OMPI_CR_Quiesce_start";

--- a/ompi/mpiext/cr/c/restart.c
+++ b/ompi/mpiext/cr/c/restart.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -18,7 +20,7 @@
 #include "ompi/communicator/communicator.h"
 #include "orte/mca/snapc/snapc.h"

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

 static const char FUNC_NAME[] = "OMPI_CR_Restart";

--- a/ompi/mpiext/cr/c/self_register_checkpoint.c
+++ b/ompi/mpiext/cr/c/self_register_checkpoint.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -14,7 +16,7 @@

 #include "ompi/mpi/c/bindings.h"
 #include "opal/runtime/opal_cr.h"
-#include "ompi/mpiext/cr/c/mpiext_cr_c.h"
+#include "ompi/mpiext/cr/c/cr_c.h"

 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"
--- a/ompi/mpiext/cr/c/self_register_continue.c
+++ b/ompi/mpiext/cr/c/self_register_continue.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -14,7 +16,7 @@

 #include "ompi/mpi/c/bindings.h"
 #include "opal/runtime/opal_cr.h"
-#include "ompi/mpiext/cr/c/mpiext_cr_c.h"
+#include "ompi/mpiext/cr/c/cr_c.h"

 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"
--- a/ompi/mpiext/cr/c/self_register_restart.c
+++ b/ompi/mpiext/cr/c/self_register_restart.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -14,7 +16,7 @@

 #include "ompi/mpi/c/bindings.h"
 #include "opal/runtime/opal_cr.h"
-#include "ompi/mpiext/cr/c/mpiext_cr_c.h"
+#include "ompi/mpiext/cr/c/cr_c.h"

 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"
--- a/ompi/mpiext/cuda/c/Makefile.am
+++ b/ompi/mpiext/cuda/c/Makefile.am
@ -27,10 +27,10 @@ noinst_LTLIBRARIES = libmpiext_cuda_c.la

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

 # This is the header file that is installed.
-nodist_ompi_HEADERS = mpiext_cuda_c.h
+nodist_ompi_HEADERS = cuda_c.h

 # Sources for the convenience libtool library.  Other than the one
 # header file, all source files in the extension have no file naming
--- a/ompi/mpiext/cuda/c/mpiext_cuda_c.h.in
+++ b/ompi/mpiext/cuda/c/mpiext_cuda_c.h.in
--- a/ompi/mpiext/cuda/c/mpiext_cuda.c
+++ b/ompi/mpiext/cuda/c/mpiext_cuda.c
@ -7,6 +7,8 @@
 * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights
 *                         reserved.
 * Copyright (c) 2015      NVIDIA, Inc. All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -21,7 +23,7 @@
 #include <string.h>

 #include "opal/constants.h"
-#include "ompi/mpiext/cuda/c/mpiext_cuda_c.h"
+#include "ompi/mpiext/cuda/c/cuda_c.h"

 /* If CUDA-aware support is configured in, return 1. Otherwise, return 0.
 * This API may be extended to return more features in the future. */
--- a/ompi/mpiext/cuda/configure.m4
+++ b/ompi/mpiext/cuda/configure.m4
@ -5,6 +5,8 @@
 # Copyright (c) 2012-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2015      Intel, Inc. All rights reserved.
 # Copyright (c) 2015      NVIDIA, Inc.  All rights reserved.
+# Copyright (c) 2018      Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@ -17,7 +19,7 @@
 AC_DEFUN([OMPI_MPIEXT_cuda_CONFIG],[
    AC_CONFIG_FILES([ompi/mpiext/cuda/Makefile])
    AC_CONFIG_FILES([ompi/mpiext/cuda/c/Makefile])
-    AC_CONFIG_HEADER([ompi/mpiext/cuda/c/mpiext_cuda_c.h])
+    AC_CONFIG_HEADER([ompi/mpiext/cuda/c/cuda_c.h])

    AC_DEFINE_UNQUOTED([MPIX_CUDA_AWARE_SUPPORT],[$CUDA_SUPPORT],
                       [Macro that is set to 1 when CUDA-aware support is configured in and 0 when it is not])
--- a/ompi/mpiext/example/README.txt
+++ b/ompi/mpiext/example/README.txt
@ -73,17 +73,17 @@ directory name: ompi/mpiext/<extension name>
 Under this top-level directory, the extension *must* have a directory
 named "c" (for the C bindings) that:

- contains a file named mpiext_<ext_name>_c.h
- installs mpiext_<ext_name>_c.h to
-  $includedir/openmpi/mpiext/<ext_name>/c
+- contains a file named <ext_name>_c.h
+- installs <ext_name>_c.h to
+  $includedir/openmpi/mpiext/c
 - builds a Libtool convenience library named libmpiext_<ext_name>_c.la

 Optionally, the extension may have a director named "mpif-h" (for the
 Fortran mpif.h bindings) that:

- contains a file named mpiext_<ext_name>_mpifh.h
- installs mpiext_<ext_name>_mpih.h to
-  $includedir/openmpi/mpiext/<ext_name>/mpif-h
+- contains a file named <ext_name>_mpifh.h
+- installs <ext_name>_mpih.h to
+  $includedir/openmpi/mpiext
 - builds a Libtool convenience library named libmpiext_<ext_name>_mpifh.la

 Optionally, the extension may have a director named "use-mpi" (for the
--- a/ompi/mpiext/example/c/Makefile.am
+++ b/ompi/mpiext/example/c/Makefile.am
@ -4,6 +4,8 @@
 #                         Corporation.  All rights reserved.
 # Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
 # Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2018      Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@ -23,10 +25,10 @@ noinst_LTLIBRARIES = libmpiext_example_c.la

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

 # This is the header file that is installed.
-ompi_HEADERS = mpiext_example_c.h
+ompi_HEADERS = example_c.h

 # Sources for the convenience libtool library.  Other than the one
 # header file, all source files in the extension have no file naming
--- a/ompi/mpiext/example/c/mpiext_example_c.h
+++ b/ompi/mpiext/example/c/mpiext_example_c.h
--- a/ompi/mpiext/example/c/mpiext_example_module.c
+++ b/ompi/mpiext/example/c/mpiext_example_module.c
@ -4,6 +4,8 @@
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -23,7 +25,7 @@

 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mpiext/mpiext.h"
-#include "ompi/mpiext/example/c/mpiext_example_c.h"
+#include "ompi/mpiext/example/c/example_c.h"

 /*
 * The init/fini functions and the component struct are not required,
--- a/ompi/mpiext/example/c/mpiext_example_progress.c
+++ b/ompi/mpiext/example/c/mpiext_example_progress.c
@ -4,8 +4,8 @@
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2018 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,7 +25,7 @@

 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mpiext/mpiext.h"
-#include "ompi/mpiext/example/c/mpiext_example_c.h"
+#include "ompi/mpiext/example/c/example_c.h"

 static const char FUNC_NAME[] = "OMPI_Progress";

--- a/ompi/mpiext/example/c/progress.c
+++ b/ompi/mpiext/example/c/progress.c
@ -3,6 +3,8 @@
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
 * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -14,7 +16,7 @@

 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mpiext/mpiext.h"
-#include "ompi/mpiext/example/mpiext_example_c.h"
+#include "ompi/mpiext/example/c/example_c.h"

 static const char FUNC_NAME[] = "OMPI_Progress";

--- a/ompi/mpiext/example/mpif-h/mpiext_example_progress_f.c
+++ b/ompi/mpiext/example/mpif-h/mpiext_example_progress_f.c
@ -1,6 +1,8 @@
 /*
 * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
 * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -21,7 +23,7 @@
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"

-#include "ompi/mpiext/example/c/mpiext_example_c.h"
+#include "ompi/mpiext/example/c/example_c.h"

 /* Rather than doing a whole pile of messy things with weak symbols,
   just define one back-end function (the _f version), and then four
--- a/ompi/mpiext/pcollreq/c/Makefile.am
+++ b/ompi/mpiext/pcollreq/c/Makefile.am
@ -1,7 +1,7 @@
 #
 # Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
 # Copyright (c) 2018      Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@ -23,10 +23,10 @@ noinst_LTLIBRARIES = libmpiext_pcollreq_c.la

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

 # This is the header file that is installed.
-ompi_HEADERS = mpiext_pcollreq_c.h
+ompi_HEADERS = pcollreq_c.h

 # Sources for the convenience libtool library.  Other than the one
 # header file, all source files in the extension have no file naming
--- a/ompi/mpiext/pcollreq/c/allgather_init.c
+++ b/ompi/mpiext/pcollreq/c/allgather_init.c
@ -32,7 +32,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/allgatherv_init.c
+++ b/ompi/mpiext/pcollreq/c/allgatherv_init.c
@ -32,7 +32,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/allreduce_init.c
+++ b/ompi/mpiext/pcollreq/c/allreduce_init.c
@ -33,7 +33,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/op/op.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/alltoall_init.c
+++ b/ompi/mpiext/pcollreq/c/alltoall_init.c
@ -32,7 +32,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/alltoallv_init.c
+++ b/ompi/mpiext/pcollreq/c/alltoallv_init.c
@ -31,7 +31,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/alltoallw_init.c
+++ b/ompi/mpiext/pcollreq/c/alltoallw_init.c
@ -31,7 +31,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/barrier_init.c
+++ b/ompi/mpiext/pcollreq/c/barrier_init.c
@ -27,7 +27,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/bcast_init.c
+++ b/ompi/mpiext/pcollreq/c/bcast_init.c
@ -20,7 +20,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/exscan_init.c
+++ b/ompi/mpiext/pcollreq/c/exscan_init.c
@ -29,7 +29,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/op/op.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/memchecker.h"
 #include "ompi/runtime/ompi_spc.h"

--- a/ompi/mpiext/pcollreq/c/gather_init.c
+++ b/ompi/mpiext/pcollreq/c/gather_init.c
@ -32,7 +32,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/gatherv_init.c
+++ b/ompi/mpiext/pcollreq/c/gatherv_init.c
@ -29,7 +29,7 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/memchecker.h"
 #include "ompi/runtime/ompi_spc.h"

--- a/ompi/mpiext/pcollreq/c/neighbor_allgather_init.c
+++ b/ompi/mpiext/pcollreq/c/neighbor_allgather_init.c
@ -36,7 +36,7 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
 #include "ompi/runtime/ompi_spc.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"

 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
--- a/ompi/mpiext/pcollreq/c/neighbor_allgatherv_init.c
+++ b/ompi/mpiext/pcollreq/c/neighbor_allgatherv_init.c
@ -36,7 +36,7 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
 #include "ompi/runtime/ompi_spc.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"

 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
--- a/ompi/mpiext/pcollreq/c/neighbor_alltoall_init.c
+++ b/ompi/mpiext/pcollreq/c/neighbor_alltoall_init.c
@ -36,7 +36,7 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
 #include "ompi/runtime/ompi_spc.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"

 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
--- a/ompi/mpiext/pcollreq/c/neighbor_alltoallv_init.c
+++ b/ompi/mpiext/pcollreq/c/neighbor_alltoallv_init.c
@ -35,7 +35,7 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
 #include "ompi/runtime/ompi_spc.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"

 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
--- a/ompi/mpiext/pcollreq/c/neighbor_alltoallw_init.c
+++ b/ompi/mpiext/pcollreq/c/neighbor_alltoallw_init.c
@ -35,7 +35,7 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
 #include "ompi/runtime/ompi_spc.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"

 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
--- a/ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h
+++ b/ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h
--- a/ompi/mpiext/pcollreq/c/profile/Makefile.am
+++ b/ompi/mpiext/pcollreq/c/profile/Makefile.am
@ -22,10 +22,10 @@ noinst_LTLIBRARIES = libpmpiext_pcollreq_c.la

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

 # This is the header file that is installed.
-ompi_HEADERS = pmpiext_pcollreq_c.h
+ompi_HEADERS = ppcollreq_c.h

 # Sources for the convenience libtool library.  Other than the one
 # header file, all source files in the extension have no file naming
--- a/ompi/mpiext/pcollreq/c/reduce_init.c
+++ b/ompi/mpiext/pcollreq/c/reduce_init.c
@ -33,7 +33,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/op/op.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/reduce_scatter_block_init.c
+++ b/ompi/mpiext/pcollreq/c/reduce_scatter_block_init.c
@ -32,7 +32,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/op/op.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/reduce_scatter_init.c
+++ b/ompi/mpiext/pcollreq/c/reduce_scatter_init.c
@ -33,7 +33,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/op/op.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/scan_init.c
+++ b/ompi/mpiext/pcollreq/c/scan_init.c
@ -31,7 +31,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/op/op.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/scatter_init.c
+++ b/ompi/mpiext/pcollreq/c/scatter_init.c
@ -32,7 +32,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/c/scatterv_init.c
+++ b/ompi/mpiext/pcollreq/c/scatterv_init.c
@ -30,7 +30,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"
 #include "ompi/runtime/ompi_spc.h"

 #if OMPI_BUILD_MPI_PROFILING
--- a/ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h
+++ b/ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h
@ -53,7 +53,7 @@
 #include "ompi/request/grequest.h"
 #include "ompi/mpi/fortran/base/datarep.h"

-#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
+#include "ompi/mpiext/pcollreq/c/pcollreq_c.h"

 BEGIN_C_DECLS

--- a/ompi/mpiext/pcollreq/mpif-h/profile/Makefile.am
+++ b/ompi/mpiext/pcollreq/mpif-h/profile/Makefile.am
@ -28,7 +28,7 @@ noinst_LTLIBRARIES =

 # Directory where the header file to be included in mpif-ext.h must be
 # installed.
-ompidir = $(ompiincludedir)/ompi/mpiext/pcollreq/mpif-h
+ompidir = $(ompiincludedir)/ompi/mpiext

 # Just like noinst_LTLIBRARIES, set this macro to empty and
 # conditionally add to it later.