From ccbdc8fd58648181a5380cdacaba44bfc7ef7233 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Thu, 6 Dec 2018 14:52:50 +0900 Subject: [PATCH 1/4] Revert "c: keep include path for extension short" This reverts commit open-mpi/ompi@27c25fa721b18ff110e531d7ff3fdb63354bb7ac. Signed-off-by: Gilles Gouaillardet --- config/ompi_ext.m4 | 8 ++++---- ompi/mpiext/affinity/c/Makefile.am | 6 ++---- .../affinity/c/{affinity_c.h => mpiext_affinity_c.h} | 0 ompi/mpiext/affinity/c/mpiext_affinity_str.c | 6 +++--- ompi/mpiext/cr/c/Makefile.am | 6 ++---- ompi/mpiext/cr/c/checkpoint.c | 4 +--- ompi/mpiext/cr/c/inc_register_callback.c | 4 +--- ompi/mpiext/cr/c/migrate.c | 4 +--- ompi/mpiext/cr/c/{cr_c.h => mpiext_cr_c.h} | 0 ompi/mpiext/cr/c/quiesce_checkpoint.c | 4 +--- ompi/mpiext/cr/c/quiesce_end.c | 4 +--- ompi/mpiext/cr/c/quiesce_start.c | 4 +--- ompi/mpiext/cr/c/restart.c | 4 +--- ompi/mpiext/cr/c/self_register_checkpoint.c | 4 +--- ompi/mpiext/cr/c/self_register_continue.c | 4 +--- ompi/mpiext/cr/c/self_register_restart.c | 4 +--- ompi/mpiext/cuda/c/Makefile.am | 4 ++-- ompi/mpiext/cuda/c/mpiext_cuda.c | 4 +--- .../cuda/c/{cuda_c.h.in => mpiext_cuda_c.h.in} | 0 ompi/mpiext/cuda/configure.m4 | 4 +--- ompi/mpiext/example/README.txt | 12 ++++++------ ompi/mpiext/example/c/Makefile.am | 6 ++---- .../example/c/{example_c.h => mpiext_example_c.h} | 0 ompi/mpiext/example/c/mpiext_example_module.c | 4 +--- ompi/mpiext/example/c/mpiext_example_progress.c | 6 +++--- ompi/mpiext/example/c/progress.c | 4 +--- .../example/mpif-h/mpiext_example_progress_f.c | 4 +--- ompi/mpiext/pcollreq/c/Makefile.am | 6 +++--- ompi/mpiext/pcollreq/c/allgather_init.c | 2 +- ompi/mpiext/pcollreq/c/allgatherv_init.c | 2 +- ompi/mpiext/pcollreq/c/allreduce_init.c | 2 +- ompi/mpiext/pcollreq/c/alltoall_init.c | 2 +- ompi/mpiext/pcollreq/c/alltoallv_init.c | 2 +- ompi/mpiext/pcollreq/c/alltoallw_init.c | 2 +- ompi/mpiext/pcollreq/c/barrier_init.c | 2 +- ompi/mpiext/pcollreq/c/bcast_init.c | 2 +- ompi/mpiext/pcollreq/c/exscan_init.c | 2 +- ompi/mpiext/pcollreq/c/gather_init.c | 2 +- ompi/mpiext/pcollreq/c/gatherv_init.c | 2 +- .../pcollreq/c/{pcollreq_c.h => mpiext_pcollreq_c.h} | 0 ompi/mpiext/pcollreq/c/neighbor_allgather_init.c | 2 +- ompi/mpiext/pcollreq/c/neighbor_allgatherv_init.c | 2 +- ompi/mpiext/pcollreq/c/neighbor_alltoall_init.c | 2 +- ompi/mpiext/pcollreq/c/neighbor_alltoallv_init.c | 2 +- ompi/mpiext/pcollreq/c/neighbor_alltoallw_init.c | 2 +- ompi/mpiext/pcollreq/c/profile/Makefile.am | 4 ++-- ompi/mpiext/pcollreq/c/reduce_init.c | 2 +- ompi/mpiext/pcollreq/c/reduce_scatter_block_init.c | 2 +- ompi/mpiext/pcollreq/c/reduce_scatter_init.c | 2 +- ompi/mpiext/pcollreq/c/scan_init.c | 2 +- ompi/mpiext/pcollreq/c/scatter_init.c | 2 +- ompi/mpiext/pcollreq/c/scatterv_init.c | 2 +- .../pcollreq/mpif-h/mpiext_pcollreq_prototypes.h | 2 +- ompi/mpiext/pcollreq/mpif-h/profile/Makefile.am | 2 +- 54 files changed, 68 insertions(+), 104 deletions(-) rename ompi/mpiext/affinity/c/{affinity_c.h => mpiext_affinity_c.h} (100%) rename ompi/mpiext/cr/c/{cr_c.h => mpiext_cr_c.h} (100%) rename ompi/mpiext/cuda/c/{cuda_c.h.in => mpiext_cuda_c.h.in} (100%) rename ompi/mpiext/example/c/{example_c.h => mpiext_example_c.h} (100%) rename ompi/mpiext/pcollreq/c/{pcollreq_c.h => mpiext_pcollreq_c.h} (100%) diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4 index 459dc6f129..2821048ed2 100644 --- 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/${component}_c.h" + test_header="${srcdir}/ompi/mpiext/$component/c/mpiext_${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/c/${component}_c.h" + EXT_C_HEADERS="$EXT_C_HEADERS mpiext/$component/c/mpiext_${component}_c.h" - component_header="${component}_c.h" + component_header="mpiext_${component}_c.h" cat >> $mpi_ext_h <) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext +ompidir = $(ompiincludedir)/ompi/mpiext/affinity/c # This is the header file that is installed. -ompi_HEADERS = affinity_c.h +ompi_HEADERS = mpiext_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 diff --git a/ompi/mpiext/affinity/c/affinity_c.h b/ompi/mpiext/affinity/c/mpiext_affinity_c.h similarity index 100% rename from ompi/mpiext/affinity/c/affinity_c.h rename to ompi/mpiext/affinity/c/mpiext_affinity_c.h diff --git a/ompi/mpiext/affinity/c/mpiext_affinity_str.c b/ompi/mpiext/affinity/c/mpiext_affinity_str.c index 4f947a34d3..e6e20419b4 100644 --- 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-2018 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2015-2017 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/affinity_c.h" +#include "ompi/mpiext/affinity/c/mpiext_affinity_c.h" static const char FUNC_NAME[] = "OMPI_Affinity"; static const char ompi_nobind_str[] = "Open MPI did not bind this process"; diff --git a/ompi/mpiext/cr/c/Makefile.am b/ompi/mpiext/cr/c/Makefile.am index 367b4c3c40..fe54fe557b 100644 --- a/ompi/mpiext/cr/c/Makefile.am +++ b/ompi/mpiext/cr/c/Makefile.am @@ -3,8 +3,6 @@ # 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 @@ -24,10 +22,10 @@ noinst_LTLIBRARIES = libmpiext_cr_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext +ompidir = $(ompiincludedir)/ompi/mpiext/cr/c # This is the header file that is installed. -ompi_HEADERS = cr_c.h +ompi_HEADERS = mpiext_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 diff --git a/ompi/mpiext/cr/c/checkpoint.c b/ompi/mpiext/cr/c/checkpoint.c index 0d901f2971..fbd956eb35 100644 --- a/ompi/mpiext/cr/c/checkpoint.c +++ b/ompi/mpiext/cr/c/checkpoint.c @@ -3,8 +3,6 @@ * 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 @@ -20,7 +18,7 @@ #include "ompi/communicator/communicator.h" #include "orte/mca/snapc/snapc.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" static const char FUNC_NAME[] = "OMPI_CR_Checkpoint"; #define HANDLE_SIZE_MAX 256 diff --git a/ompi/mpiext/cr/c/inc_register_callback.c b/ompi/mpiext/cr/c/inc_register_callback.c index 868c42b122..37ee760553 100644 --- a/ompi/mpiext/cr/c/inc_register_callback.c +++ b/ompi/mpiext/cr/c/inc_register_callback.c @@ -3,8 +3,6 @@ * 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 @@ -16,7 +14,7 @@ #include "ompi/mpi/c/bindings.h" #include "opal/runtime/opal_cr.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" #include "ompi/runtime/params.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpiext/cr/c/migrate.c b/ompi/mpiext/cr/c/migrate.c index a694b1b28a..2ac1c28cf6 100644 --- a/ompi/mpiext/cr/c/migrate.c +++ b/ompi/mpiext/cr/c/migrate.c @@ -3,8 +3,6 @@ * 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 @@ -22,7 +20,7 @@ #include "ompi/communicator/communicator.h" #include "orte/mca/snapc/snapc.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" static const char FUNC_NAME[] = "OMPI_CR_Migrate"; diff --git a/ompi/mpiext/cr/c/cr_c.h b/ompi/mpiext/cr/c/mpiext_cr_c.h similarity index 100% rename from ompi/mpiext/cr/c/cr_c.h rename to ompi/mpiext/cr/c/mpiext_cr_c.h diff --git a/ompi/mpiext/cr/c/quiesce_checkpoint.c b/ompi/mpiext/cr/c/quiesce_checkpoint.c index d9900f059d..85ff1f48e8 100644 --- a/ompi/mpiext/cr/c/quiesce_checkpoint.c +++ b/ompi/mpiext/cr/c/quiesce_checkpoint.c @@ -3,8 +3,6 @@ * 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 @@ -20,7 +18,7 @@ #include "ompi/communicator/communicator.h" #include "orte/mca/snapc/snapc.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" static const char FUNC_NAME[] = "OMPI_CR_Quiesce_checkpoint"; diff --git a/ompi/mpiext/cr/c/quiesce_end.c b/ompi/mpiext/cr/c/quiesce_end.c index 18b159c027..7d716f2f7a 100644 --- a/ompi/mpiext/cr/c/quiesce_end.c +++ b/ompi/mpiext/cr/c/quiesce_end.c @@ -3,8 +3,6 @@ * 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 @@ -20,7 +18,7 @@ #include "ompi/communicator/communicator.h" #include "orte/mca/snapc/snapc.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" static const char FUNC_NAME[] = "OMPI_CR_Quiesce_end"; diff --git a/ompi/mpiext/cr/c/quiesce_start.c b/ompi/mpiext/cr/c/quiesce_start.c index c5fa00708a..3c15ab2964 100644 --- a/ompi/mpiext/cr/c/quiesce_start.c +++ b/ompi/mpiext/cr/c/quiesce_start.c @@ -7,8 +7,6 @@ * 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 @@ -24,7 +22,7 @@ #include "ompi/communicator/communicator.h" #include "orte/mca/snapc/snapc.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" static const char FUNC_NAME[] = "OMPI_CR_Quiesce_start"; diff --git a/ompi/mpiext/cr/c/restart.c b/ompi/mpiext/cr/c/restart.c index 9b7f3cf2ba..38814b08de 100644 --- a/ompi/mpiext/cr/c/restart.c +++ b/ompi/mpiext/cr/c/restart.c @@ -3,8 +3,6 @@ * 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 @@ -20,7 +18,7 @@ #include "ompi/communicator/communicator.h" #include "orte/mca/snapc/snapc.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" static const char FUNC_NAME[] = "OMPI_CR_Restart"; diff --git a/ompi/mpiext/cr/c/self_register_checkpoint.c b/ompi/mpiext/cr/c/self_register_checkpoint.c index d51455f1ee..a7bdc6330e 100644 --- a/ompi/mpiext/cr/c/self_register_checkpoint.c +++ b/ompi/mpiext/cr/c/self_register_checkpoint.c @@ -3,8 +3,6 @@ * 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 @@ -16,7 +14,7 @@ #include "ompi/mpi/c/bindings.h" #include "opal/runtime/opal_cr.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" #include "ompi/runtime/params.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpiext/cr/c/self_register_continue.c b/ompi/mpiext/cr/c/self_register_continue.c index 6ec443f2f5..166063699d 100644 --- a/ompi/mpiext/cr/c/self_register_continue.c +++ b/ompi/mpiext/cr/c/self_register_continue.c @@ -3,8 +3,6 @@ * 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 @@ -16,7 +14,7 @@ #include "ompi/mpi/c/bindings.h" #include "opal/runtime/opal_cr.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" #include "ompi/runtime/params.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpiext/cr/c/self_register_restart.c b/ompi/mpiext/cr/c/self_register_restart.c index 860809dd1e..6e7675c3f6 100644 --- a/ompi/mpiext/cr/c/self_register_restart.c +++ b/ompi/mpiext/cr/c/self_register_restart.c @@ -3,8 +3,6 @@ * 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 @@ -16,7 +14,7 @@ #include "ompi/mpi/c/bindings.h" #include "opal/runtime/opal_cr.h" -#include "ompi/mpiext/cr/c/cr_c.h" +#include "ompi/mpiext/cr/c/mpiext_cr_c.h" #include "ompi/runtime/params.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpiext/cuda/c/Makefile.am b/ompi/mpiext/cuda/c/Makefile.am index f1044b9148..719fa10989 100644 --- 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 # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext +ompidir = $(ompiincludedir)/ompi/mpiext/cuda/c # This is the header file that is installed. -nodist_ompi_HEADERS = cuda_c.h +nodist_ompi_HEADERS = mpiext_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 diff --git a/ompi/mpiext/cuda/c/mpiext_cuda.c b/ompi/mpiext/cuda/c/mpiext_cuda.c index 1bb62e3128..499d1441c3 100644 --- a/ompi/mpiext/cuda/c/mpiext_cuda.c +++ b/ompi/mpiext/cuda/c/mpiext_cuda.c @@ -7,8 +7,6 @@ * 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 @@ -23,7 +21,7 @@ #include #include "opal/constants.h" -#include "ompi/mpiext/cuda/c/cuda_c.h" +#include "ompi/mpiext/cuda/c/mpiext_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. */ diff --git a/ompi/mpiext/cuda/c/cuda_c.h.in b/ompi/mpiext/cuda/c/mpiext_cuda_c.h.in similarity index 100% rename from ompi/mpiext/cuda/c/cuda_c.h.in rename to ompi/mpiext/cuda/c/mpiext_cuda_c.h.in diff --git a/ompi/mpiext/cuda/configure.m4 b/ompi/mpiext/cuda/configure.m4 index f5f539a8be..cba2953a3f 100644 --- a/ompi/mpiext/cuda/configure.m4 +++ b/ompi/mpiext/cuda/configure.m4 @@ -5,8 +5,6 @@ # 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 @@ -19,7 +17,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/cuda_c.h]) + AC_CONFIG_HEADER([ompi/mpiext/cuda/c/mpiext_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]) diff --git a/ompi/mpiext/example/README.txt b/ompi/mpiext/example/README.txt index c519b050d8..13e237df3c 100644 --- a/ompi/mpiext/example/README.txt +++ b/ompi/mpiext/example/README.txt @@ -73,17 +73,17 @@ directory name: ompi/mpiext/ Under this top-level directory, the extension *must* have a directory named "c" (for the C bindings) that: -- contains a file named _c.h -- installs _c.h to - $includedir/openmpi/mpiext/c +- contains a file named mpiext__c.h +- installs mpiext__c.h to + $includedir/openmpi/mpiext//c - builds a Libtool convenience library named libmpiext__c.la Optionally, the extension may have a director named "mpif-h" (for the Fortran mpif.h bindings) that: -- contains a file named _mpifh.h -- installs _mpih.h to - $includedir/openmpi/mpiext +- contains a file named mpiext__mpifh.h +- installs mpiext__mpih.h to + $includedir/openmpi/mpiext//mpif-h - builds a Libtool convenience library named libmpiext__mpifh.la Optionally, the extension may have a director named "use-mpi" (for the diff --git a/ompi/mpiext/example/c/Makefile.am b/ompi/mpiext/example/c/Makefile.am index 155728aa05..7f9e74df6c 100644 --- a/ompi/mpiext/example/c/Makefile.am +++ b/ompi/mpiext/example/c/Makefile.am @@ -4,8 +4,6 @@ # 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 @@ -25,10 +23,10 @@ noinst_LTLIBRARIES = libmpiext_example_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext +ompidir = $(ompiincludedir)/ompi/mpiext/example/c # This is the header file that is installed. -ompi_HEADERS = example_c.h +ompi_HEADERS = mpiext_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 diff --git a/ompi/mpiext/example/c/example_c.h b/ompi/mpiext/example/c/mpiext_example_c.h similarity index 100% rename from ompi/mpiext/example/c/example_c.h rename to ompi/mpiext/example/c/mpiext_example_c.h diff --git a/ompi/mpiext/example/c/mpiext_example_module.c b/ompi/mpiext/example/c/mpiext_example_module.c index a8e0e6419c..4ef52a36d7 100644 --- a/ompi/mpiext/example/c/mpiext_example_module.c +++ b/ompi/mpiext/example/c/mpiext_example_module.c @@ -4,8 +4,6 @@ * 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 @@ -25,7 +23,7 @@ #include "ompi/mpi/c/bindings.h" #include "ompi/mpiext/mpiext.h" -#include "ompi/mpiext/example/c/example_c.h" +#include "ompi/mpiext/example/c/mpiext_example_c.h" /* * The init/fini functions and the component struct are not required, diff --git a/ompi/mpiext/example/c/mpiext_example_progress.c b/ompi/mpiext/example/c/mpiext_example_progress.c index c5971b5dd6..23680472db 100644 --- 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-2018 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 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/example_c.h" +#include "ompi/mpiext/example/c/mpiext_example_c.h" static const char FUNC_NAME[] = "OMPI_Progress"; diff --git a/ompi/mpiext/example/c/progress.c b/ompi/mpiext/example/c/progress.c index b9f4dc6ad3..60c47028cb 100644 --- a/ompi/mpiext/example/c/progress.c +++ b/ompi/mpiext/example/c/progress.c @@ -3,8 +3,6 @@ * 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 @@ -16,7 +14,7 @@ #include "ompi/mpi/c/bindings.h" #include "ompi/mpiext/mpiext.h" -#include "ompi/mpiext/example/c/example_c.h" +#include "ompi/mpiext/example/mpiext_example_c.h" static const char FUNC_NAME[] = "OMPI_Progress"; diff --git a/ompi/mpiext/example/mpif-h/mpiext_example_progress_f.c b/ompi/mpiext/example/mpif-h/mpiext_example_progress_f.c index caf727074e..395e9932b9 100644 --- a/ompi/mpiext/example/mpif-h/mpiext_example_progress_f.c +++ b/ompi/mpiext/example/mpif-h/mpiext_example_progress_f.c @@ -1,8 +1,6 @@ /* * 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 +21,7 @@ #include "ompi/mpi/fortran/mpif-h/bindings.h" #include "ompi/mpi/fortran/base/constants.h" -#include "ompi/mpiext/example/c/example_c.h" +#include "ompi/mpiext/example/c/mpiext_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 diff --git a/ompi/mpiext/pcollreq/c/Makefile.am b/ompi/mpiext/pcollreq/c/Makefile.am index 0d8fb773b6..7b5f2eba83 100644 --- 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 # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext +ompidir = $(ompiincludedir)/ompi/mpiext/pcollreq/c # This is the header file that is installed. -ompi_HEADERS = pcollreq_c.h +ompi_HEADERS = mpiext_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 diff --git a/ompi/mpiext/pcollreq/c/allgather_init.c b/ompi/mpiext/pcollreq/c/allgather_init.c index 91eb7f77cf..46a568bc65 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/allgatherv_init.c b/ompi/mpiext/pcollreq/c/allgatherv_init.c index 79cc165fc6..d4b3c7368a 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/allreduce_init.c b/ompi/mpiext/pcollreq/c/allreduce_init.c index 0ebc9b0049..dd224f1115 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/alltoall_init.c b/ompi/mpiext/pcollreq/c/alltoall_init.c index 1cd5e4b49b..b176f63c75 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/alltoallv_init.c b/ompi/mpiext/pcollreq/c/alltoallv_init.c index ad8136b835..06d5922b2a 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/alltoallw_init.c b/ompi/mpiext/pcollreq/c/alltoallw_init.c index 19042d1194..405cc4c4f8 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/barrier_init.c b/ompi/mpiext/pcollreq/c/barrier_init.c index b0cae182d0..7df1e92f49 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/bcast_init.c b/ompi/mpiext/pcollreq/c/bcast_init.c index 4eab5587a1..6a2798a970 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/exscan_init.c b/ompi/mpiext/pcollreq/c/exscan_init.c index a56e488320..23f155429c 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/memchecker.h" #include "ompi/runtime/ompi_spc.h" diff --git a/ompi/mpiext/pcollreq/c/gather_init.c b/ompi/mpiext/pcollreq/c/gather_init.c index 05d5449c7f..f62dd9b54d 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/gatherv_init.c b/ompi/mpiext/pcollreq/c/gatherv_init.c index 2cc42700a2..fbbd346008 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/memchecker.h" #include "ompi/runtime/ompi_spc.h" diff --git a/ompi/mpiext/pcollreq/c/pcollreq_c.h b/ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h similarity index 100% rename from ompi/mpiext/pcollreq/c/pcollreq_c.h rename to ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h diff --git a/ompi/mpiext/pcollreq/c/neighbor_allgather_init.c b/ompi/mpiext/pcollreq/c/neighbor_allgather_init.c index c341c95101..4494b507b7 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #if OMPI_BUILD_MPI_PROFILING #if OPAL_HAVE_WEAK_SYMBOLS diff --git a/ompi/mpiext/pcollreq/c/neighbor_allgatherv_init.c b/ompi/mpiext/pcollreq/c/neighbor_allgatherv_init.c index 4c96be683f..66fa0487c5 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #if OMPI_BUILD_MPI_PROFILING #if OPAL_HAVE_WEAK_SYMBOLS diff --git a/ompi/mpiext/pcollreq/c/neighbor_alltoall_init.c b/ompi/mpiext/pcollreq/c/neighbor_alltoall_init.c index a5fd9cc05a..c564ee7e9e 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #if OMPI_BUILD_MPI_PROFILING #if OPAL_HAVE_WEAK_SYMBOLS diff --git a/ompi/mpiext/pcollreq/c/neighbor_alltoallv_init.c b/ompi/mpiext/pcollreq/c/neighbor_alltoallv_init.c index 0e4f80bec8..8d3503bf57 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #if OMPI_BUILD_MPI_PROFILING #if OPAL_HAVE_WEAK_SYMBOLS diff --git a/ompi/mpiext/pcollreq/c/neighbor_alltoallw_init.c b/ompi/mpiext/pcollreq/c/neighbor_alltoallw_init.c index 5656c85265..68e2b2cad2 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #if OMPI_BUILD_MPI_PROFILING #if OPAL_HAVE_WEAK_SYMBOLS diff --git a/ompi/mpiext/pcollreq/c/profile/Makefile.am b/ompi/mpiext/pcollreq/c/profile/Makefile.am index af9b978d31..9fee858081 100644 --- 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 # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext +ompidir = $(ompiincludedir)/ompi/mpiext/pcollreq/c # This is the header file that is installed. -ompi_HEADERS = ppcollreq_c.h +ompi_HEADERS = pmpiext_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 diff --git a/ompi/mpiext/pcollreq/c/reduce_init.c b/ompi/mpiext/pcollreq/c/reduce_init.c index ddfaec9372..1e72877d50 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/reduce_scatter_block_init.c b/ompi/mpiext/pcollreq/c/reduce_scatter_block_init.c index e87ae3867d..ef000ae6e1 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/reduce_scatter_init.c b/ompi/mpiext/pcollreq/c/reduce_scatter_init.c index 3e8545270e..b8c470f064 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/scan_init.c b/ompi/mpiext/pcollreq/c/scan_init.c index 8b57710d17..8ff34dd5f5 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/scatter_init.c b/ompi/mpiext/pcollreq/c/scatter_init.c index 7161551c38..30ee31f88d 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/c/scatterv_init.c b/ompi/mpiext/pcollreq/c/scatterv_init.c index 4fee554353..fef368caf7 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" #include "ompi/runtime/ompi_spc.h" #if OMPI_BUILD_MPI_PROFILING diff --git a/ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h b/ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h index 00ee58e8ca..811a94b82e 100644 --- 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/pcollreq_c.h" +#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h" BEGIN_C_DECLS diff --git a/ompi/mpiext/pcollreq/mpif-h/profile/Makefile.am b/ompi/mpiext/pcollreq/mpif-h/profile/Makefile.am index b37445cc47..235dd1ed5e 100644 --- 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 +ompidir = $(ompiincludedir)/ompi/mpiext/pcollreq/mpif-h # Just like noinst_LTLIBRARIES, set this macro to empty and # conditionally add to it later. From 4918fc4455b9f62492a6f00a6730adc3b05597ee Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Thu, 6 Dec 2018 14:52:59 +0900 Subject: [PATCH 2/4] Revert "fortran/mpif-h: keep include path for extension short" This reverts commit open-mpi/ompi@848a868f7b456b59018d7e021f749450fdb8b43d. Signed-off-by: Gilles Gouaillardet --- config/ompi_ext.m4 | 14 +++++++------- ompi/mpiext/example/mpif-h/Makefile.am | 6 ++---- .../{example_mpifh.h => mpiext_example_mpifh.h} | 0 ompi/mpiext/pcollreq/mpif-h/Makefile.am | 4 ++-- .../{pcollreq_mpifh.h => mpiext_pcollreq_mpifh.h} | 0 5 files changed, 11 insertions(+), 13 deletions(-) rename ompi/mpiext/example/mpif-h/{example_mpifh.h => mpiext_example_mpifh.h} (100%) rename ompi/mpiext/pcollreq/mpif-h/{pcollreq_mpifh.h => mpiext_pcollreq_mpifh.h} (100%) diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4 index 2821048ed2..72f47d390d 100644 --- a/config/ompi_ext.m4 +++ b/config/ompi_ext.m4 @@ -409,7 +409,7 @@ AC_DEFUN([EXT_CONFIGURE_M4_CONFIG_COMPONENT],[ # - c/libmpiext_.la: convneience library slurped into libmpi.la # # mpi.f.h: -# - mpif-h/_mpifh.h: is included mpi mpif_ext.h +# - mpif-h/mpiext__mpifh.h: is included mpi mpif_ext.h # - mpif-h/libmpiext__mpifh.la: convenience library slurped # into libmpi_mpifh.la # @@ -497,7 +497,7 @@ EOF # Test if this extension has mpif.h bindings # If not, skip this step. # - test_header="${srcdir}/ompi/mpiext/$component/mpif-h/${component}_mpifh.h" + test_header="${srcdir}/ompi/mpiext/$component/mpif-h/mpiext_${component}_mpifh.h" enabled_mpifh=0 AC_MSG_CHECKING([if MPI Extension $component has mpif.h bindings]) @@ -507,10 +507,10 @@ EOF enabled_mpifh=1 # JMS Where is this needed? - EXT_MPIFH_HEADERS="$EXT_MPIFH_HEADERS mpiext/${component}_mpifh.h" + EXT_MPIFH_HEADERS="$EXT_MPIFH_HEADERS mpiext/$component/mpif-h/mpiext_${component}_mpifh.h" $4="$$4 $component" - component_header="${component}_mpifh.h" + component_header="mpiext_${component}_mpifh.h" cat >> $mpif_ext_h <> $mpiusempi_ext_h <> $mpiusempif08_ext_h < Date: Thu, 6 Dec 2018 15:05:10 +0900 Subject: [PATCH 3/4] mpiext: updates for header file locations Per discussion on https://github.com/open-mpi/ompi/pull/6030 and https://github.com/open-mpi/ompi/pull/6145, move around where MPI extension header files are installed (specifically: the installation tree path does not need to match the source tree path). For reference, header files were installed like this : - /include/openmpi/ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_mpifh.h - /include/openmpi/ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h and they are now installed like this : - /include/openmpi/mpiext/mpiext_pcollreq_mpifh.h - /include/openmpi/mpiext/mpiext_pcollreq_c.h Signed-off-by: Jeff Squyres Signed-off-by: Gilles Gouaillardet --- config/ompi_ext.m4 | 21 +++++++++++---------- ompi/mpiext/affinity/c/Makefile.am | 4 +++- ompi/mpiext/cr/c/Makefile.am | 4 +++- ompi/mpiext/cuda/c/Makefile.am | 2 +- ompi/mpiext/example/c/Makefile.am | 4 +++- ompi/mpiext/example/mpif-h/Makefile.am | 4 +++- ompi/mpiext/pcollreq/c/Makefile.am | 2 +- ompi/mpiext/pcollreq/c/profile/Makefile.am | 2 +- ompi/mpiext/pcollreq/mpif-h/Makefile.am | 2 +- 9 files changed, 27 insertions(+), 18 deletions(-) diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4 index 72f47d390d..1ba7ac1679 100644 --- a/config/ompi_ext.m4 +++ b/config/ompi_ext.m4 @@ -405,11 +405,15 @@ AC_DEFUN([EXT_CONFIGURE_M4_CONFIG_COMPONENT],[ #-------------------- # # C: -# - c/mpiext__c.h: is included in mpi_ext.h +# - c/mpiext__c.h: is installed to +# /openmpi/mpiext/mpiext__c.h and is included in +# mpi_ext.h # - c/libmpiext_.la: convneience library slurped into libmpi.la # # mpi.f.h: -# - mpif-h/mpiext__mpifh.h: is included mpi mpif_ext.h +# - mpif-h/mpiext__mpifh.h: is installed to +# openmpi/mpiext/mpiext__mpifh.h and is included mpi +# mpif_ext.h # - mpif-h/libmpiext__mpifh.la: convenience library slurped # into libmpi_mpifh.la # @@ -461,7 +465,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/mpiext_${component}_c.h" AC_MSG_CHECKING([if MPI Extension $component has C bindings]) @@ -479,14 +483,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/mpiext_${component}_c.h" component_header="mpiext_${component}_c.h" cat >> $mpi_ext_h <) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext/affinity/c +ompidir = $(ompiincludedir)/mpiext/ # This is the header file that is installed. ompi_HEADERS = mpiext_affinity_c.h diff --git a/ompi/mpiext/cr/c/Makefile.am b/ompi/mpiext/cr/c/Makefile.am index fe54fe557b..9a35c55381 100644 --- 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,7 +24,7 @@ noinst_LTLIBRARIES = libmpiext_cr_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext/cr/c +ompidir = $(ompiincludedir)/mpiext # This is the header file that is installed. ompi_HEADERS = mpiext_cr_c.h diff --git a/ompi/mpiext/cuda/c/Makefile.am b/ompi/mpiext/cuda/c/Makefile.am index 719fa10989..f303cc7082 100644 --- a/ompi/mpiext/cuda/c/Makefile.am +++ b/ompi/mpiext/cuda/c/Makefile.am @@ -27,7 +27,7 @@ noinst_LTLIBRARIES = libmpiext_cuda_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext/cuda/c +ompidir = $(ompiincludedir)/mpiext # This is the header file that is installed. nodist_ompi_HEADERS = mpiext_cuda_c.h diff --git a/ompi/mpiext/example/c/Makefile.am b/ompi/mpiext/example/c/Makefile.am index 7f9e74df6c..ac8996b986 100644 --- 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,7 +25,7 @@ noinst_LTLIBRARIES = libmpiext_example_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext/example/c +ompidir = $(ompiincludedir)/mpiext # This is the header file that is installed. ompi_HEADERS = mpiext_example_c.h diff --git a/ompi/mpiext/example/mpif-h/Makefile.am b/ompi/mpiext/example/mpif-h/Makefile.am index fdd1c2a257..e73e4d7710 100644 --- a/ompi/mpiext/example/mpif-h/Makefile.am +++ b/ompi/mpiext/example/mpif-h/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 @@ -26,7 +28,7 @@ noinst_LTLIBRARIES = # Directory where the header file to be included in mpif-ext.h must be # installed. -ompidir = $(ompiincludedir)/ompi/mpiext/example/mpif-h +ompidir = $(ompiincludedir)/mpiext # Just like noinst_LTLIBRARIES, set this macro to empty and # conditionally add to it later. diff --git a/ompi/mpiext/pcollreq/c/Makefile.am b/ompi/mpiext/pcollreq/c/Makefile.am index 7b5f2eba83..d4aeb8ef36 100644 --- a/ompi/mpiext/pcollreq/c/Makefile.am +++ b/ompi/mpiext/pcollreq/c/Makefile.am @@ -23,7 +23,7 @@ noinst_LTLIBRARIES = libmpiext_pcollreq_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext/pcollreq/c +ompidir = $(ompiincludedir)/mpiext # This is the header file that is installed. ompi_HEADERS = mpiext_pcollreq_c.h diff --git a/ompi/mpiext/pcollreq/c/profile/Makefile.am b/ompi/mpiext/pcollreq/c/profile/Makefile.am index 9fee858081..9559574322 100644 --- a/ompi/mpiext/pcollreq/c/profile/Makefile.am +++ b/ompi/mpiext/pcollreq/c/profile/Makefile.am @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libpmpiext_pcollreq_c.la # This is where the top-level header file (that is included in # ) must be installed. -ompidir = $(ompiincludedir)/ompi/mpiext/pcollreq/c +ompidir = $(ompiincludedir)/mpiext # This is the header file that is installed. ompi_HEADERS = pmpiext_pcollreq_c.h diff --git a/ompi/mpiext/pcollreq/mpif-h/Makefile.am b/ompi/mpiext/pcollreq/mpif-h/Makefile.am index e08b846df1..7282ac086d 100644 --- a/ompi/mpiext/pcollreq/mpif-h/Makefile.am +++ b/ompi/mpiext/pcollreq/mpif-h/Makefile.am @@ -31,7 +31,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)/mpiext # Just like noinst_LTLIBRARIES, set this macro to empty and # conditionally add to it later. From c0faf34855d0e8c7a263872a115d8ec64e9147e8 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Sat, 1 Dec 2018 11:58:35 -0800 Subject: [PATCH 4/4] ompi_ext.m4: ensure ext name <= 26 characters Ensure that MPI extensions with mpif.h bindings have names that are <=26 characters long. 26 is the magic number that still allows us to have an "include ..." line in the user-facing mpif-ext.h header file that includes this extension's header file without going over 72 characters. Signed-off-by: Jeff Squyres Signed-off-by: Gilles Gouaillardet --- config/ompi_ext.m4 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4 index 1ba7ac1679..827658e6db 100644 --- a/config/ompi_ext.m4 +++ b/config/ompi_ext.m4 @@ -513,6 +513,33 @@ EOF EXT_MPIFH_HEADERS="$EXT_MPIFH_HEADERS mpiext/mpiext_${component}_mpifh.h" $4="$$4 $component" + # Per https://github.com/open-mpi/ompi/pull/6030, we will end + # up putting a user-visible Fortran "include" statement in the + # installed mpif-ext.h file, and we therefore have to ensure + # that the total length of the line is <=72 characters. Doing + # a little math here: + # + # leading indent spaces: 6 chars + # "include '": 9 chars + # "openmpi/mpiext/mpiext_NAME_mpifh.h": without NAME, 30 chars + # trailing "'": 1 char + # + # 6+9+30+1 = 46 chars overhead. + # 72-46 = 26 characters left for NAME. + # + # It would be exceedingly unusual to have an MPI extension + # name > 26 characters. But just in case, put a check here + # to make sure: error out if the MPI extension name is > 26 + # characters (because otherwise it'll just be a really weird / + # hard to diagnose compile error when a user tries to compile + # a Fortran MPI application that includes `mpif-ext.h`). + len=`echo $component | wc -c` + result=`expr $len \> 26` + AS_IF([test $result -eq 1], + [AC_MSG_WARN([MPI extension name too long: $component]) + AC_MSG_WARN([For esoteric reasons, MPI Extensions with mpif.h bindings must have a name that is <= 26 characters]) + AC_MSG_ERROR([Cannot continue])]) + component_header="mpiext_${component}_mpifh.h" cat >> $mpif_ext_h <