Next step in the project split, mainly source code re-arranging
- move files out of toplevel include/ and etc/, moving it into the sub-projects - rather than including config headers with <project>/include, have them as <project> - require all headers to be included with a project prefix, with the exception of the config headers ({opal,orte,ompi}_config.h mpi.h, and mpif.h) This commit was SVN r8985.
Этот коммит содержится в:
родитель
5c7059c955
Коммит
566a050c23
@ -16,7 +16,7 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
SUBDIRS = config include etc contrib $(MCA_PROJECT_SUBDIRS) test
|
||||
SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS) test
|
||||
EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE
|
||||
|
||||
dist-hook:
|
||||
|
10
acinclude.m4
10
acinclude.m4
@ -102,12 +102,4 @@ m4_include(config/mca_no_configure_components.m4)
|
||||
# mca_m4_config_include.m4 is generated by autogen.sh. It includes
|
||||
# the list of all component configure.m4 macros.
|
||||
#
|
||||
# Some explination... There doesn't seem to be a good way to have
|
||||
# this include file live in config/, because autoheader does it's
|
||||
# analysis without taking into account the directory in which the .m4
|
||||
# file calling m4_include is in, while autoconf does take the directory
|
||||
# into account. So you end up with a situation where you need two
|
||||
# directories listed in the single m4_include. If anyone knows a way
|
||||
# to move mca_m4_config_include.m4 into config/, I'd appreciate it.
|
||||
#
|
||||
m4_include(mca_m4_config_include.m4)
|
||||
m4_include(config/mca_m4_config_include.m4)
|
||||
|
@ -79,9 +79,10 @@ ompi_automake=""
|
||||
mca_no_configure_components_file="config/mca_no_configure_components.m4"
|
||||
mca_no_config_list_file="mca_no_config_list"
|
||||
mca_no_config_env_file="mca_no_config_env"
|
||||
mca_m4_include_file="mca_m4_config_include.m4"
|
||||
mca_m4_include_file="config/mca_m4_config_include.m4"
|
||||
mca_m4_config_env_file="mca_m4_config_env"
|
||||
autogen_subdir_file="autogen.subdirs"
|
||||
topdir_file="opal/include/opal_config_bottom.h"
|
||||
|
||||
############################################################################
|
||||
#
|
||||
@ -380,7 +381,7 @@ EOF
|
||||
|
||||
echo "*** Running GNU tools"
|
||||
|
||||
if test -f include/mpi.h.in; then
|
||||
if test -f $topdir_file ; then
|
||||
cd config
|
||||
run_and_check $ompi_autom4te --language=m4sh ompi_get_version.m4sh -o ompi_get_version.sh
|
||||
cd ..
|
||||
@ -396,7 +397,7 @@ EOF
|
||||
# We only need the libltdl stuff for the top-level
|
||||
# configure, not any of the MCA components.
|
||||
|
||||
if test -f include/mpi.h.in; then
|
||||
if test -f $topdir_file ; then
|
||||
rm -rf libltdl opal/libltdl opal/ltdl.h
|
||||
run_and_check $ompi_libtoolize --automake --copy --ltdl
|
||||
if test -d libltdl; then
|
||||
@ -1076,7 +1077,7 @@ fi
|
||||
|
||||
# figure out if we're at the top level of the OMPI tree, a component's
|
||||
# top-level directory, or somewhere else.
|
||||
if test -f VERSION -a -f configure.ac -a -f include/mpi.h.in ; then
|
||||
if test -f VERSION -a -f configure.ac -a -f $topdir_file ; then
|
||||
# locations to look for mca modules
|
||||
config_project_list="opal orte ompi"
|
||||
if test "$no_ompi" = "1" ; then
|
||||
|
@ -139,7 +139,7 @@ AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
|
||||
|
||||
AC_MSG_CHECKING([for OPAL extra include dirs])
|
||||
if test "$WANT_INSTALL_HEADERS" = "1" ; then
|
||||
OPAL_WRAPPER_EXTRA_INCLUDES="openmpi openmpi/opal"
|
||||
OPAL_WRAPPER_EXTRA_INCLUDES="openmpi"
|
||||
else
|
||||
OPAL_WRAPPER_EXTRA_INCLUDES=
|
||||
fi
|
||||
@ -179,11 +179,7 @@ AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
|
||||
AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_LIBS])
|
||||
|
||||
AC_MSG_CHECKING([for ORTE extra include dirs])
|
||||
if test "$WANT_INSTALL_HEADERS" = "1" ; then
|
||||
ORTE_WRAPPER_EXTRA_INCLUDES="$OPAL_WRAPPER_EXTRA_INCLUDES openmpi openmpi/opal openmpi/orte"
|
||||
else
|
||||
ORTE_WRAPPER_EXTRA_INCLUDES="$OPAL_WRAPPER_EXTRA_INCLUDES"
|
||||
fi
|
||||
ORTE_WRAPPER_EXTRA_INCLUDES="$OPAL_WRAPPER_EXTRA_INCLUDES"
|
||||
AC_SUBST([ORTE_WRAPPER_EXTRA_INCLUDES])
|
||||
AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_INCLUDES])
|
||||
|
||||
@ -231,9 +227,10 @@ AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
|
||||
|
||||
AC_MSG_CHECKING([for OMPI extra include dirs])
|
||||
if test "$WANT_INSTALL_HEADERS" = "1" ; then
|
||||
OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES openmpi openmpi/opal openmpi/orte openmpi/ompi"
|
||||
# Always include openmpi in case C++ bindings get installed
|
||||
OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES"
|
||||
else
|
||||
OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES openmpi/ompi"
|
||||
OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES openmpi"
|
||||
fi
|
||||
AC_SUBST([OMPI_WRAPPER_EXTRA_INCLUDES])
|
||||
AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_INCLUDES])
|
||||
|
41
configure.ac
41
configure.ac
@ -185,7 +185,7 @@ if test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"; then
|
||||
AC_MSG_NOTICE([Detected VPATH build])
|
||||
fi
|
||||
|
||||
# Setup the top of the include/ompi_config.h file
|
||||
# Setup the top of the opal/include/opal_config.h file
|
||||
|
||||
AH_TOP([/* -*- c -*-
|
||||
*
|
||||
@ -206,12 +206,12 @@ AH_TOP([/* -*- c -*-
|
||||
* Function: - OS, CPU and compiler dependent configuration
|
||||
*/
|
||||
|
||||
#ifndef OMPI_CONFIG_H
|
||||
#define OMPI_CONFIG_H
|
||||
#ifndef OPAL_CONFIG_H
|
||||
#define OPAL_CONFIG_H
|
||||
])
|
||||
AH_BOTTOM([
|
||||
#include "ompi_config_bottom.h"
|
||||
#endif /* OMPI_CONFIG_H */
|
||||
#include "opal_config_bottom.h"
|
||||
#endif /* OPAL_CONFIG_H */
|
||||
])
|
||||
|
||||
# Other basic setup stuff (shared with components)
|
||||
@ -1485,14 +1485,18 @@ ompi_show_subtitle "Compiler flags"
|
||||
# '-I$(top_srcdir)' doesn't show up in any of the configure output --
|
||||
# purely aesthetic.
|
||||
#
|
||||
# JMS: Someday to remove the -I's for the individual ompi, orte, opal
|
||||
# directories -- the top-level ones will suffice after all #include's
|
||||
# throughout the tree are converted to use the full path of our header
|
||||
# files.
|
||||
# Because opal_config.h, orte_config.h, and ompi_config.h are all
|
||||
# created by AC_CONFIG_HEADERS, we don't need to -I the builddir for
|
||||
# <project>/include. If we VPATH building, we do need to include the
|
||||
# source directories, however.
|
||||
#
|
||||
|
||||
CPPFLAGS='-I$(top_srcdir)/include -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/opal -I$(top_srcdir)/orte -I$(top_srcdir)/ompi'" $CPPFLAGS"
|
||||
CXXCPPFLAGS='-I$(top_srcdir)/include -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/opal -I$(top_srcdir)/orte -I$(top_srcdir)/ompi'" $CXXCPPFLAGS"
|
||||
if test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"; then
|
||||
CPPFLAGS='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_srcdir)/ompi/include'"$CPPFLAGS"
|
||||
CXXCPPFLAGS='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_srcdir)/ompi/include'"$CXXCPPFLAGS"
|
||||
else
|
||||
CPPFLAGS='-I$(top_srcdir)'"$CPPFLAGS"
|
||||
CXXCPPFLAGS='-I$(top_srcdir)'"$CXXCPPFLAGS"
|
||||
fi
|
||||
|
||||
#
|
||||
# Do a final process of the CFLAGS to make a WITHOUT_OPTFLAGS version.
|
||||
@ -1541,19 +1545,17 @@ OMPI_SETUP_WRAPPER_FINAL
|
||||
|
||||
ompi_show_subtitle "Final output"
|
||||
|
||||
AM_CONFIG_HEADER([include/ompi_config.h include/mpi.h])
|
||||
AM_CONFIG_HEADER([opal/include/opal_config.h orte/include/orte_config.h ompi/include/ompi_config.h ompi/include/mpi.h])
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
|
||||
config/Makefile
|
||||
|
||||
include/Makefile
|
||||
include/mpif.h
|
||||
|
||||
etc/Makefile
|
||||
contrib/Makefile
|
||||
|
||||
opal/Makefile
|
||||
opal/etc/Makefile
|
||||
opal/include/Makefile
|
||||
opal/asm/Makefile
|
||||
opal/event/Makefile
|
||||
opal/event/compat/Makefile
|
||||
@ -1566,6 +1568,8 @@ AC_CONFIG_FILES([
|
||||
opal/tools/wrappers/opalc++-wrapper-data.txt
|
||||
|
||||
orte/Makefile
|
||||
orte/include/Makefile
|
||||
orte/etc/Makefile
|
||||
|
||||
orte/tools/console/Makefile
|
||||
orte/tools/orted/Makefile
|
||||
@ -1577,6 +1581,9 @@ AC_CONFIG_FILES([
|
||||
orte/tools/wrappers/ortec++-wrapper-data.txt
|
||||
|
||||
ompi/Makefile
|
||||
ompi/etc/Makefile
|
||||
ompi/include/Makefile
|
||||
ompi/include/mpif.h
|
||||
|
||||
ompi/debuggers/Makefile
|
||||
|
||||
|
@ -1,41 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
# University Research and Technology
|
||||
# Corporation. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
# of Tennessee Research Foundation. All rights
|
||||
# reserved.
|
||||
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
|
||||
|
||||
dist_noinst_HEADERS = \
|
||||
orte_config.h \
|
||||
ompi_config_bottom.h \
|
||||
ompi_stdint.h
|
||||
|
||||
nodist_noinst_HEADERS = \
|
||||
ompi_config.h
|
||||
|
||||
nodist_include_HEADERS = \
|
||||
mpi.h \
|
||||
mpif.h
|
||||
|
||||
# Conditionally install the header files
|
||||
|
||||
if WANT_INSTALL_HEADERS
|
||||
ompidir = $(includedir)
|
||||
dist_ompi_HEADERS = $(dist_noinst_HEADERS)
|
||||
nodist_ompi_HEADERS = $(nodist_noinst_HEADERS)
|
||||
else
|
||||
ompidir = $(includedir)
|
||||
endif
|
@ -52,7 +52,9 @@ f77_pmpi_lib =
|
||||
endif
|
||||
|
||||
SUBDIRS = \
|
||||
include \
|
||||
debuggers \
|
||||
etc \
|
||||
mpi \
|
||||
$(MCA_ompi_FRAMEWORKS_SUBDIRS) \
|
||||
$(MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
|
||||
@ -97,7 +99,6 @@ else
|
||||
ompidir = $(includedir)
|
||||
endif
|
||||
|
||||
include include/Makefile.am
|
||||
include class/Makefile.am
|
||||
|
||||
include attribute/Makefile.am
|
||||
|
@ -191,14 +191,14 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "attribute/attribute.h"
|
||||
#include "ompi/attribute/attribute.h"
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "communicator/communicator.h"
|
||||
#include "win/win.h"
|
||||
#include "mpi/f77/fint_2_int.h"
|
||||
#include "class/ompi_bitmap.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "ompi/win/win.h"
|
||||
#include "ompi/mpi/f77/fint_2_int.h"
|
||||
#include "ompi/class/ompi_bitmap.h"
|
||||
|
||||
/*
|
||||
* Macros
|
||||
|
@ -29,10 +29,10 @@
|
||||
#include "mpi.h"
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "class/opal_hash_table.h"
|
||||
#include "mca/gpr/gpr_types.h"
|
||||
#include "opal/class/opal_hash_table.h"
|
||||
#include "orte/mca/gpr/gpr_types.h"
|
||||
|
||||
#define ATTR_HASH_SIZE 10
|
||||
|
||||
|
@ -80,7 +80,7 @@
|
||||
|
||||
#include "mpi.h"
|
||||
|
||||
#include "attribute/attribute.h"
|
||||
#include "ompi/attribute/attribute.h"
|
||||
|
||||
#include "ompi/errhandler/errclass.h"
|
||||
#include "ompi/communicator/communicator.h"
|
||||
|
@ -20,8 +20,8 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "ompi/include/constants.h"
|
||||
#include "class/ompi_bitmap.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/class/ompi_bitmap.h"
|
||||
|
||||
|
||||
#define SIZE_OF_CHAR (sizeof(char) * 8)
|
||||
|
@ -115,7 +115,7 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "include/types.h"
|
||||
#include "ompi/types.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
|
@ -19,9 +19,9 @@
|
||||
#ifndef _OMPI_CIRCULAR_BUFFER_FIFO
|
||||
#define _OMPI_CIRCULAR_BUFFER_FIFO
|
||||
|
||||
#include "ompi/include/constants.h"
|
||||
#include "opal/include/sys/cache.h"
|
||||
#include "opal/include/sys/atomic.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "opal/sys/cache.h"
|
||||
#include "opal/sys/atomic.h"
|
||||
#include "ompi/mca/mpool/mpool.h"
|
||||
#include "opal/util/pow2.h"
|
||||
|
||||
|
@ -19,11 +19,11 @@
|
||||
#ifndef _OMPI_FIFO
|
||||
#define _OMPI_FIFO
|
||||
|
||||
#include "ompi/include/constants.h"
|
||||
#include "include/sys/cache.h"
|
||||
#include "include/sys/atomic.h"
|
||||
#include "mca/mpool/mpool.h"
|
||||
#include "class/ompi_circular_buffer_fifo.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "opal/sys/cache.h"
|
||||
#include "opal/sys/atomic.h"
|
||||
#include "ompi/mca/mpool/mpool.h"
|
||||
#include "ompi/class/ompi_circular_buffer_fifo.h"
|
||||
|
||||
|
||||
/** @file
|
||||
|
@ -18,8 +18,8 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "class/ompi_free_list.h"
|
||||
#include "include/sys/cache.h"
|
||||
#include "ompi/class/ompi_free_list.h"
|
||||
#include "opal/sys/cache.h"
|
||||
|
||||
|
||||
static void ompi_free_list_construct(ompi_free_list_t* fl);
|
||||
|
@ -23,8 +23,8 @@
|
||||
#include "opal/class/opal_list.h"
|
||||
#include "opal/threads/threads.h"
|
||||
#include "opal/threads/condition.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "mca/mpool/mpool.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/mca/mpool/mpool.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
@ -22,8 +22,8 @@
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "ompi/include/constants.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
#include "opal/util/output.h"
|
||||
|
||||
enum { TABLE_INIT = 1, TABLE_GROW = 2 };
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "class/ompi_rb_tree.h"
|
||||
#include "ompi/class/ompi_rb_tree.h"
|
||||
|
||||
/* declare the instance of the classes */
|
||||
OBJ_CLASS_INSTANCE(ompi_rb_tree_node_t, opal_list_item_t, NULL, NULL);
|
||||
|
@ -26,9 +26,9 @@
|
||||
#define OMPI_RB_TREE_H
|
||||
|
||||
#include <stdlib.h>
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "class/ompi_free_list.h"
|
||||
#include "ompi/class/ompi_free_list.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
@ -20,22 +20,22 @@
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "orte/dss/dss.h"
|
||||
#include "proc/proc.h"
|
||||
#include "ompi/proc/proc.h"
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "opal/util/bit_ops.h"
|
||||
#include "opal/util/output.h"
|
||||
#include "opal/util/convert.h"
|
||||
#include "mca/topo/topo.h"
|
||||
#include "mca/topo/base/base.h"
|
||||
#include "mca/ns/ns.h"
|
||||
#include "ompi/mca/topo/topo.h"
|
||||
#include "ompi/mca/topo/base/base.h"
|
||||
#include "orte/mca/ns/ns.h"
|
||||
|
||||
#include "attribute/attribute.h"
|
||||
#include "communicator/communicator.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "mca/ptl/base/ptl_base_comm.h"
|
||||
#include "request/request.h"
|
||||
#include "ompi/attribute/attribute.h"
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
#include "ompi/mca/ptl/base/ptl_base_comm.h"
|
||||
#include "ompi/request/request.h"
|
||||
|
||||
/*
|
||||
** sort-function for MPI_Comm_split
|
||||
|
@ -20,15 +20,15 @@
|
||||
|
||||
#include "orte/dss/dss.h"
|
||||
#include "opal/util/convert.h"
|
||||
#include "mca/ns/ns_types.h"
|
||||
#include "communicator/communicator.h"
|
||||
#include "proc/proc.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "orte/mca/ns/ns_types.h"
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "ompi/proc/proc.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
#include "opal/class/opal_list.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "mca/coll/base/base.h"
|
||||
#include "mca/rml/rml.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
#include "ompi/mca/coll/base/base.h"
|
||||
#include "orte/mca/rml/rml.h"
|
||||
#include "ompi/request/request.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
|
@ -34,10 +34,10 @@
|
||||
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "ompi/request/request.h"
|
||||
#include "errhandler/errhandler.h"
|
||||
#include "proc/proc.h"
|
||||
#include "info/info.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/errhandler/errhandler.h"
|
||||
#include "ompi/proc/proc.h"
|
||||
#include "ompi/info/info.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
|
||||
#include "orte/util/proc_info.h"
|
||||
@ -49,7 +49,7 @@
|
||||
#include "orte/mca/soh/soh_types.h"
|
||||
#include "orte/mca/rml/rml.h"
|
||||
|
||||
#include "runtime/runtime.h"
|
||||
#include "orte/runtime/runtime.h"
|
||||
|
||||
extern char **environ;
|
||||
|
||||
|
@ -21,15 +21,15 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include "opal/util/bit_ops.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "mca/coll/base/base.h"
|
||||
#include "mca/topo/base/base.h"
|
||||
#include "mca/ns/base/base.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
#include "ompi/mca/coll/base/base.h"
|
||||
#include "ompi/mca/topo/base/base.h"
|
||||
#include "orte/mca/ns/base/base.h"
|
||||
#include "ompi/runtime/params.h"
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "attribute/attribute.h"
|
||||
#include "mca/topo/topo.h"
|
||||
#include "ompi/attribute/attribute.h"
|
||||
#include "ompi/mca/topo/topo.h"
|
||||
|
||||
/*
|
||||
** Table for Fortran <-> C communicator handle conversion
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "ompi/proc/proc.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
|
||||
#include "orte/dss/dss.h"
|
||||
|
@ -20,13 +20,13 @@
|
||||
#define OMPI_COMMUNICATOR_H
|
||||
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "errhandler/errhandler.h"
|
||||
#include "ompi/errhandler/errhandler.h"
|
||||
#include "opal/threads/mutex.h"
|
||||
|
||||
#include "mpi.h"
|
||||
#include "group/group.h"
|
||||
#include "mca/coll/coll.h"
|
||||
#include "mca/oob/oob_types.h"
|
||||
#include "ompi/group/group.h"
|
||||
#include "ompi/mca/coll/coll.h"
|
||||
#include "orte/mca/oob/oob_types.h"
|
||||
#include "ompi/proc/proc.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
|
@ -23,9 +23,9 @@
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
ompi_convertor_t* ompi_convertor_create( int32_t remote_arch, int32_t mode )
|
||||
{
|
||||
|
@ -21,7 +21,7 @@
|
||||
#define CONVERTOR_H_HAS_BEEN_INCLUDED
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
|
@ -36,10 +36,10 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "class/opal_hash_table.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "opal/class/opal_hash_table.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
#include "mpi.h"
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
@ -19,9 +19,9 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include <stdbool.h>
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include <time.h>
|
||||
#include <stdlib.h>
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
|
@ -18,8 +18,8 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
/* macros to play with the flags */
|
||||
#define SET_CONTIGUOUS_FLAG( INT_VALUE ) (INT_VALUE) = (INT_VALUE) | (DT_FLAG_CONTIGUOUS)
|
||||
|
@ -22,7 +22,7 @@
|
||||
#include "ompi_config.h"
|
||||
#include <float.h>
|
||||
#include <assert.h>
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/constants.h"
|
||||
|
||||
/***************************************************
|
||||
** This file tries to classify the most relevant
|
||||
|
@ -19,9 +19,9 @@
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "mpi.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "proc/proc.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
#include "ompi/proc/proc.h"
|
||||
|
||||
static inline int
|
||||
__ompi_ddt_pack_description( ompi_datatype_t* datatype,
|
||||
|
@ -18,9 +18,9 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
|
@ -18,10 +18,10 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
#include "limits.h"
|
||||
#include "attribute/attribute.h"
|
||||
#include "ompi/attribute/attribute.h"
|
||||
|
||||
static void __get_free_dt_struct( ompi_datatype_t* pData )
|
||||
{
|
||||
|
@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
|
||||
int32_t ompi_ddt_create_subarray( int ndims, const int* pSizes, const int* pSubSizes, const int* pStarts,
|
||||
int order, const ompi_datatype_t* oldType, ompi_datatype_t** newType )
|
||||
|
@ -18,8 +18,8 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
int32_t ompi_ddt_duplicate( const ompi_datatype_t* oldType, ompi_datatype_t** newType )
|
||||
{
|
||||
|
@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
|
||||
/* We try to merge together data that are contiguous */
|
||||
int32_t ompi_ddt_create_indexed( int count, const int* pBlockLength, const int* pDisp,
|
||||
|
@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
|
||||
int32_t ompi_ddt_create_struct( int count, const int* pBlockLength, const long* pDisp,
|
||||
ompi_datatype_t* const * pTypes, ompi_datatype_t** newType )
|
||||
|
@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
|
||||
/* Open questions ...
|
||||
* - how to improuve the handling of these vectors (creating a temporary datatype
|
||||
|
@ -18,8 +18,8 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
int32_t ompi_ddt_destroy( ompi_datatype_t** dt )
|
||||
{
|
||||
|
@ -19,10 +19,10 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "datatype/dt_arch.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/dt_arch.h"
|
||||
|
||||
/* From the MPI standard. external32 use the following types:
|
||||
* Type Length
|
||||
|
@ -18,8 +18,8 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
static inline
|
||||
const ompi_datatype_t* ompi_ddt_match_size_internal( int size, uint16_t datakind, uint16_t datalang )
|
||||
|
@ -18,11 +18,11 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
#if OMPI_ENABLE_DEBUG
|
||||
#include "mca/base/mca_base_param.h"
|
||||
#include "opal/mca/base/mca_base_param.h"
|
||||
extern int ompi_unpack_debug;
|
||||
extern int ompi_pack_debug;
|
||||
extern int ompi_copy_debug;
|
||||
|
@ -19,9 +19,9 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
|
@ -19,9 +19,9 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
|
@ -18,8 +18,8 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
|
||||
/*
|
||||
* ompi_dtsndrcv
|
||||
|
@ -18,9 +18,9 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
|
@ -19,9 +19,9 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
|
@ -61,9 +61,9 @@ MPITEST README for further details.
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include <stdbool.h>
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "mpitest_cfg.h"
|
||||
#include "mpitest.h"
|
||||
|
||||
|
@ -19,9 +19,9 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
|
@ -17,9 +17,9 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
|
@ -19,9 +19,9 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "datatype/datatype.h"
|
||||
#include "datatype/convertor.h"
|
||||
#include "datatype/datatype_internal.h"
|
||||
#include "ompi/datatype/datatype.h"
|
||||
#include "ompi/datatype/convertor.h"
|
||||
#include "ompi/datatype/datatype_internal.h"
|
||||
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
|
@ -21,8 +21,8 @@
|
||||
#include <stdio.h>
|
||||
#include "mpi.h"
|
||||
|
||||
#include "errhandler/errclass.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/errhandler/errclass.h"
|
||||
#include "ompi/constants.h"
|
||||
|
||||
/* Table holding all error codes */
|
||||
ompi_pointer_array_t ompi_errclasses;
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#include "mpi.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
@ -22,7 +22,7 @@
|
||||
#include <string.h>
|
||||
#include "mpi.h"
|
||||
|
||||
#include "errhandler/errcode-internal.h"
|
||||
#include "ompi/errhandler/errcode-internal.h"
|
||||
|
||||
/* Table holding all error codes */
|
||||
ompi_pointer_array_t ompi_errcodes_intern;
|
||||
|
@ -23,9 +23,9 @@
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "mpi.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
|
||||
#define OMPI_MAX_ERROR_STRING 64
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
|
@ -22,8 +22,8 @@
|
||||
#include <string.h>
|
||||
#include "mpi.h"
|
||||
|
||||
#include "errhandler/errcode.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/errhandler/errcode.h"
|
||||
#include "ompi/constants.h"
|
||||
|
||||
/* Table holding all error codes */
|
||||
ompi_pointer_array_t ompi_mpi_errcodes;
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#include "mpi.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
@ -18,12 +18,12 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "communicator/communicator.h"
|
||||
#include "win/win.h"
|
||||
#include "file/file.h"
|
||||
#include "errhandler/errhandler.h"
|
||||
#include "errhandler/errhandler_predefined.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "ompi/win/win.h"
|
||||
#include "ompi/file/file.h"
|
||||
#include "ompi/errhandler/errhandler.h"
|
||||
#include "ompi/errhandler/errhandler_predefined.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
|
||||
|
||||
/*
|
||||
|
@ -24,10 +24,10 @@
|
||||
|
||||
#include "mpi.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
#include "ompi/runtime/mpiruntime.h"
|
||||
#include "errhandler/errhandler_predefined.h"
|
||||
#include "errhandler/errcode-internal.h"
|
||||
#include "ompi/errhandler/errhandler_predefined.h"
|
||||
#include "ompi/errhandler/errcode-internal.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
@ -18,11 +18,11 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "communicator/communicator.h"
|
||||
#include "win/win.h"
|
||||
#include "file/file.h"
|
||||
#include "errhandler/errhandler.h"
|
||||
#include "mpi/f77/fint_2_int.h"
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "ompi/win/win.h"
|
||||
#include "ompi/file/file.h"
|
||||
#include "ompi/errhandler/errhandler.h"
|
||||
#include "ompi/mpi/f77/fint_2_int.h"
|
||||
|
||||
|
||||
int ompi_errhandler_invoke(ompi_errhandler_t *errhandler, void *mpi_object,
|
||||
|
@ -21,13 +21,13 @@
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "opal/util/output.h"
|
||||
#include "errhandler/errhandler.h"
|
||||
#include "errhandler/errhandler_predefined.h"
|
||||
#include "errhandler/errcode.h"
|
||||
#include "communicator/communicator.h"
|
||||
#include "file/file.h"
|
||||
#include "win/win.h"
|
||||
#include "runtime/runtime.h"
|
||||
#include "ompi/errhandler/errhandler.h"
|
||||
#include "ompi/errhandler/errhandler_predefined.h"
|
||||
#include "ompi/errhandler/errcode.h"
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "ompi/file/file.h"
|
||||
#include "ompi/win/win.h"
|
||||
#include "orte/runtime/runtime.h"
|
||||
#include "opal/util/printf.h"
|
||||
|
||||
/*
|
||||
|
@ -19,8 +19,6 @@
|
||||
|
||||
|
||||
ompi_config_files = \
|
||||
openmpi-default-hostfile \
|
||||
openmpi-mca-params.conf \
|
||||
openmpi-totalview.tcl
|
||||
|
||||
EXTRA_DIST = $(ompi_config_files)
|
@ -18,11 +18,11 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "file/file.h"
|
||||
#include "ompi/file/file.h"
|
||||
#include "opal/class/opal_list.h"
|
||||
#include "ompi/runtime/params.h"
|
||||
#include "mca/io/base/base.h"
|
||||
#include "info/info.h"
|
||||
#include "ompi/mca/io/base/base.h"
|
||||
#include "ompi/info/info.h"
|
||||
#include "opal/util/output.h"
|
||||
|
||||
/*
|
||||
|
@ -21,9 +21,9 @@
|
||||
|
||||
#include "mpi.h"
|
||||
#include "opal/class/opal_list.h"
|
||||
#include "errhandler/errhandler.h"
|
||||
#include "ompi/errhandler/errhandler.h"
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "mca/io/io.h"
|
||||
#include "ompi/mca/io/io.h"
|
||||
|
||||
/*
|
||||
* Flags
|
||||
|
@ -17,8 +17,8 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "group/group.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/group/group.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "mpi.h"
|
||||
|
||||
int ompi_group_free ( ompi_group_t **group )
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
#include "opal/util/output.h"
|
||||
#include "mpi.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@ -17,8 +17,8 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "group/group.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/group/group.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "mpi.h"
|
||||
|
||||
/* define class information */
|
||||
|
@ -17,8 +17,8 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "group/group.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/group/group.h"
|
||||
#include "ompi/constants.h"
|
||||
|
||||
/*
|
||||
* Set group rank in a group structure.
|
||||
|
@ -16,10 +16,20 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
# This makefile.am does not stand on its own - it is included from ompi/Makefile.am
|
||||
headers = ompi_config.h
|
||||
|
||||
headers += \
|
||||
include/constants.h \
|
||||
include/ompi_socket_errno.h \
|
||||
include/totalview.h \
|
||||
include/types.h
|
||||
# these two are always installed in $(includedir), but shouldn't be
|
||||
# shipped since they are generated by configure from their .in
|
||||
# counterparts, which AM automatically ships.
|
||||
nodist_include_HEADERS = \
|
||||
mpi.h \
|
||||
mpif.h
|
||||
|
||||
if WANT_INSTALL_HEADERS
|
||||
ompidir = $(includedir)/openmpi
|
||||
nobase_ompi_HEADERS = $(headers)
|
||||
else
|
||||
ompidir = $(includedir)
|
||||
endif
|
||||
|
||||
include ompi/Makefile.am
|
||||
|
@ -1744,7 +1744,7 @@ OMPI_DECLSPEC double PMPI_Wtime(void);
|
||||
|
||||
#if defined(OMPI_WANT_CXX_BINDINGS) && OMPI_WANT_CXX_BINDINGS && !OMPI_BUILDING
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
#include "mpi/cxx/mpicxx.h"
|
||||
#include "ompi/mpi/cxx/mpicxx.h"
|
||||
#endif
|
||||
#endif
|
||||
|
25
ompi/include/ompi/Makefile.am
Обычный файл
25
ompi/include/ompi/Makefile.am
Обычный файл
@ -0,0 +1,25 @@
|
||||
#
|
||||
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
# University Research and Technology
|
||||
# Corporation. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
# of Tennessee Research Foundation. All rights
|
||||
# reserved.
|
||||
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
# This makefile.am does not stand on its own - it is included from
|
||||
# ompi/include//Makefile.am
|
||||
|
||||
headers += \
|
||||
ompi/constants.h \
|
||||
ompi/types.h \
|
||||
ompi/totalview.h
|
@ -19,7 +19,7 @@
|
||||
#ifndef OMPI_CONSTANTS_H
|
||||
#define OMPI_CONSTANTS_H
|
||||
|
||||
#include "orte/include/orte_constants.h"
|
||||
#include "orte/orte_constants.h"
|
||||
|
||||
#define OMPI_ERR_BASE ORTE_ERR_MAX
|
||||
|
39
ompi/include/ompi/types.h
Обычный файл
39
ompi/include/ompi/types.h
Обычный файл
@ -0,0 +1,39 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
*
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
#ifndef OMPI_TYPES_H
|
||||
#define OMPI_TYPES_H
|
||||
|
||||
#include "opal/types.h"
|
||||
|
||||
/*
|
||||
* handle to describe a parallel job
|
||||
*/
|
||||
typedef char* ompi_job_handle_t;
|
||||
|
||||
/*
|
||||
* Predefine some internal types so we dont need all the include
|
||||
* dependencies.
|
||||
*/
|
||||
struct ompi_communicator_t;
|
||||
struct ompi_datatype_t;
|
||||
struct ompi_convertor_t;
|
||||
struct ompi_bitmap_t;
|
||||
struct ompi_op_t;
|
||||
|
||||
#endif
|
81
ompi/include/ompi_config.h.in
Обычный файл
81
ompi/include/ompi_config.h.in
Обычный файл
@ -0,0 +1,81 @@
|
||||
/* -*- c -*-
|
||||
*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
*
|
||||
* $HEADER$
|
||||
*
|
||||
* Function: - OS, CPU and compiler dependent configuration
|
||||
*/
|
||||
|
||||
#ifndef OMPI_CONFIG_H_
|
||||
#define OMPI_CONFIG_H_
|
||||
|
||||
#include "opal_config.h"
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
*
|
||||
* OMPI-specific Fortran code that should be in ompi_config.h, but not
|
||||
* in the other projects.
|
||||
*
|
||||
**********************************************************************/
|
||||
|
||||
/* MPI_Fint is the same as ompi_fortran_INTEGER_t */
|
||||
#define MPI_Fint ompi_fortran_integer_t
|
||||
|
||||
/* MPI_Flogical is the same as the ompi_fortran_logical_t */
|
||||
#define MPI_Flogical ompi_fortran_logical_t
|
||||
|
||||
#if OMPI_HAVE_FORTRAN_REAL && OMPI_HAVE_FORTRAN_COMPLEX
|
||||
/* * C type for Fortran COMPLEX */
|
||||
typedef struct {
|
||||
ompi_fortran_real_t real;
|
||||
ompi_fortran_real_t imag;
|
||||
} ompi_fortran_complex_t;
|
||||
#endif
|
||||
|
||||
#if OMPI_HAVE_FORTRAN_REAL4 && OMPI_HAVE_FORTRAN_COMPLEX8
|
||||
/* * C type for Fortran COMPLEX*8 */
|
||||
typedef struct {
|
||||
ompi_fortran_real4_t real;
|
||||
ompi_fortran_real4_t imag;
|
||||
} ompi_fortran_complex8_t;
|
||||
#endif
|
||||
|
||||
#if OMPI_HAVE_FORTRAN_REAL8 && OMPI_HAVE_FORTRAN_COMPLEX16
|
||||
/* * C type for Fortran COMPLEX*16 */
|
||||
typedef struct {
|
||||
ompi_fortran_real8_t real;
|
||||
ompi_fortran_real8_t imag;
|
||||
} ompi_fortran_complex16_t;
|
||||
#endif
|
||||
|
||||
#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_HAVE_FORTRAN_COMPLEX32
|
||||
/* * C type for Fortran COMPLEX*32 */
|
||||
typedef struct {
|
||||
ompi_fortran_real16_t real;
|
||||
ompi_fortran_real16_t imag;
|
||||
} ompi_fortran_complex32_t;
|
||||
#endif
|
||||
|
||||
#if OMPI_HAVE_FORTRAN_DOUBLE_PRECISION
|
||||
/* * C type for Fortran DOUBLE COMPLEX */
|
||||
typedef struct {
|
||||
ompi_fortran_double_precision_t real;
|
||||
ompi_fortran_double_precision_t imag;
|
||||
} ompi_fortran_double_complex_t;
|
||||
#endif
|
||||
|
||||
#endif
|
@ -27,8 +27,8 @@
|
||||
#endif
|
||||
#include <limits.h>
|
||||
|
||||
#include "ompi/include/constants.h"
|
||||
#include "info/info.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/info/info.h"
|
||||
#include "ompi/runtime/params.h"
|
||||
#include "opal/util/output.h"
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "mpi.h"
|
||||
#include "opal/util/strncpy.h"
|
||||
#include "opal/class/opal_list.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
#include "ompi/class/ompi_pointer_array.h"
|
||||
#include "opal/threads/mutex.h"
|
||||
|
||||
|
||||
|
@ -21,8 +21,8 @@
|
||||
*/
|
||||
#ifndef MCA_ALLOCATOR_H
|
||||
#define MCA_ALLOCATOR_H
|
||||
#include "mca/mca.h"
|
||||
#include "mca/mpool/mpool.h"
|
||||
#include "opal/mca/mca.h"
|
||||
#include "ompi/mca/mpool/mpool.h"
|
||||
|
||||
struct mca_mpool_base_resources_t;
|
||||
|
||||
|
@ -20,11 +20,11 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "ompi/include/constants.h"
|
||||
#include "mca/mca.h"
|
||||
#include "mca/base/base.h"
|
||||
#include "mca/allocator/allocator.h"
|
||||
#include "mca/allocator/base/base.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "opal/mca/mca.h"
|
||||
#include "opal/mca/base/base.h"
|
||||
#include "ompi/mca/allocator/allocator.h"
|
||||
#include "ompi/mca/allocator/base/base.h"
|
||||
|
||||
/**
|
||||
* Closes all the remaining modules.
|
||||
|
@ -23,10 +23,10 @@
|
||||
#include <string.h>
|
||||
#endif /* HAVE_STRING_H */
|
||||
|
||||
#include "mca/mca.h"
|
||||
#include "mca/base/base.h"
|
||||
#include "mca/allocator/allocator.h"
|
||||
#include "mca/allocator/base/base.h"
|
||||
#include "opal/mca/mca.h"
|
||||
#include "opal/mca/base/base.h"
|
||||
#include "ompi/mca/allocator/allocator.h"
|
||||
#include "ompi/mca/allocator/base/base.h"
|
||||
|
||||
/*
|
||||
* The following file was created by configure. It contains extern
|
||||
|
@ -24,8 +24,8 @@
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "opal/class/opal_list.h"
|
||||
#include "mca/mca.h"
|
||||
#include "mca/allocator/allocator.h"
|
||||
#include "opal/mca/mca.h"
|
||||
#include "ompi/mca/allocator/allocator.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include "ompi_config.h"
|
||||
#include "opal/util/output.h"
|
||||
#include "allocator_basic.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "ompi/constants.h"
|
||||
|
||||
|
||||
|
||||
|
@ -27,8 +27,8 @@
|
||||
#include <string.h>
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "class/ompi_free_list.h"
|
||||
#include "mca/allocator/allocator.h"
|
||||
#include "ompi/class/ompi_free_list.h"
|
||||
#include "ompi/mca/allocator/allocator.h"
|
||||
|
||||
|
||||
/*
|
||||
|
@ -17,11 +17,11 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "mca/allocator/allocator.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "mca/base/mca_base_param.h"
|
||||
#include "mca/allocator/bucket/allocator_bucket_alloc.h"
|
||||
#include "mca/mpool/mpool.h"
|
||||
#include "ompi/mca/allocator/allocator.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "opal/mca/base/mca_base_param.h"
|
||||
#include "ompi/mca/allocator/bucket/allocator_bucket_alloc.h"
|
||||
#include "ompi/mca/mpool/mpool.h"
|
||||
|
||||
struct mca_allocator_base_module_t* mca_allocator_bucket_module_init(
|
||||
bool enable_mpi_threads,
|
||||
|
@ -17,8 +17,8 @@
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "ompi/include/constants.h"
|
||||
#include "mca/allocator/bucket/allocator_bucket_alloc.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/mca/allocator/bucket/allocator_bucket_alloc.h"
|
||||
/**
|
||||
* The define controls the size in bytes of the 1st bucket and hence every one
|
||||
* afterwards.
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include <string.h>
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "mca/allocator/allocator.h"
|
||||
#include "ompi/mca/allocator/allocator.h"
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@ -21,8 +21,8 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "mca/mca.h"
|
||||
#include "mca/bml/bml.h"
|
||||
#include "opal/mca/mca.h"
|
||||
#include "ompi/mca/bml/bml.h"
|
||||
|
||||
|
||||
/*
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "mca/bml/bml.h"
|
||||
#include "ompi/mca/bml/bml.h"
|
||||
#include "bml_base_btl.h"
|
||||
|
||||
|
||||
|
@ -21,9 +21,9 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "mca/mca.h"
|
||||
#include "opal/mca/mca.h"
|
||||
|
||||
#include "mca/bml/bml.h"
|
||||
#include "ompi/mca/bml/bml.h"
|
||||
#include "opal/util/output.h"
|
||||
|
||||
/*
|
||||
|
@ -16,8 +16,8 @@
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
#include "mca/btl/base/base.h"
|
||||
#include "mca/bml/base/base.h"
|
||||
#include "ompi/mca/btl/base/base.h"
|
||||
#include "ompi/mca/bml/base/base.h"
|
||||
|
||||
int mca_bml_base_close( void ) {
|
||||
int rc;
|
||||
|
@ -18,10 +18,10 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "include/sys/atomic.h"
|
||||
#include "mca/bml/bml.h"
|
||||
#include "opal/sys/atomic.h"
|
||||
#include "ompi/mca/bml/bml.h"
|
||||
#include "bml_base_endpoint.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
|
||||
|
||||
|
||||
|
@ -21,12 +21,12 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "mca/mca.h"
|
||||
#include "opal/mca/mca.h"
|
||||
|
||||
#include "mca/bml/bml.h"
|
||||
#include "ompi/mca/bml/bml.h"
|
||||
#include "opal/util/output.h"
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
#include "bml_base_btl.h"
|
||||
/*
|
||||
* Global functions for the BML
|
||||
|
@ -16,10 +16,10 @@
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
#include "mca/bml/base/base.h"
|
||||
#include "mca/base/base.h"
|
||||
#include "ompi/mca/bml/base/base.h"
|
||||
#include "opal/mca/base/base.h"
|
||||
|
||||
#include "mca/mca.h"
|
||||
#include "opal/mca/mca.h"
|
||||
int mca_bml_base_output = -1;
|
||||
|
||||
OMPI_DECLSPEC mca_bml_base_module_t mca_bml = {
|
||||
|
@ -19,9 +19,9 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include <stdio.h>
|
||||
#include "mca/bml/bml.h"
|
||||
#include "mca/bml/base/base.h"
|
||||
#include "mca/btl/base/base.h"
|
||||
#include "ompi/mca/bml/bml.h"
|
||||
#include "ompi/mca/bml/base/base.h"
|
||||
#include "ompi/mca/btl/base/base.h"
|
||||
#include "ompi/mca/bml/base/static-components.h"
|
||||
#include "opal/mca/base/base.h"
|
||||
|
||||
|
@ -25,15 +25,15 @@
|
||||
#ifndef MCA_BML_H
|
||||
#define MCA_BML_H
|
||||
|
||||
#include "mca/mca.h"
|
||||
#include "mca/btl/btl.h"
|
||||
#include "opal/mca/mca.h"
|
||||
#include "ompi/mca/btl/btl.h"
|
||||
|
||||
#include "mca/bml/base/bml_base_btl.h"
|
||||
#include "mca/bml/base/bml_base_endpoint.h"
|
||||
#include "ompi/mca/bml/base/bml_base_btl.h"
|
||||
#include "ompi/mca/bml/base/bml_base_endpoint.h"
|
||||
|
||||
#include "include/types.h"
|
||||
#include "class/ompi_free_list.h"
|
||||
#include "mca/pml/pml.h"
|
||||
#include "ompi/types.h"
|
||||
#include "ompi/class/ompi_free_list.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
|
||||
/*
|
||||
* BML types
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "class/ompi_bitmap.h"
|
||||
#include "ompi/class/ompi_bitmap.h"
|
||||
#include "ompi/mca/bml/bml.h"
|
||||
#include "ompi/mca/btl/btl.h"
|
||||
#include "ompi/mca/btl/base/base.h"
|
||||
|
@ -22,15 +22,15 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "mca/mca.h"
|
||||
#include "mca/btl/btl.h"
|
||||
#include "opal/mca/mca.h"
|
||||
#include "ompi/mca/btl/btl.h"
|
||||
|
||||
#ifndef MCA_BML_R2_H
|
||||
#define MCA_BML_R2_H
|
||||
|
||||
#include "include/types.h"
|
||||
#include "class/ompi_free_list.h"
|
||||
#include "mca/bml/bml.h"
|
||||
#include "ompi/types.h"
|
||||
#include "ompi/class/ompi_free_list.h"
|
||||
#include "ompi/mca/bml/bml.h"
|
||||
|
||||
|
||||
|
||||
|
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
x
Ссылка в новой задаче
Block a user