ROMIO 3.1.4 refresh: patch romio for Open MPI
Этот коммит содержится в:
Gilles Gouaillardet
родитель
eacd434a02
Коммит
6400bc75ab
971
ompi/mca/io/romio314/ompi.patch
Обычный файл
971
ompi/mca/io/romio314/ompi.patch
Обычный файл
@ -0,0 +1,971 @@
|
|||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/.config_params b/ompi/mca/io/romio32b1/romio/.config_params
|
||||||
|
index 96f735f..fcc2f91 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/.config_params
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/.config_params
|
||||||
|
@@ -36,3 +36,4 @@ __sgi_mpi
|
||||||
|
__hp_mpi
|
||||||
|
__cray_mpi
|
||||||
|
__lam_mpi
|
||||||
|
+__open_mpi
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/.gitignore b/ompi/mca/io/romio32b1/romio/.gitignore
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..28f1e98
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/.gitignore
|
||||||
|
@@ -0,0 +1,13 @@
|
||||||
|
+/Makefile
|
||||||
|
+/.deps
|
||||||
|
+/*.bb
|
||||||
|
+/*.bbg
|
||||||
|
+/*.gcda
|
||||||
|
+/*.gcno
|
||||||
|
+/.libs
|
||||||
|
+/.libstamp*
|
||||||
|
+/*.lo
|
||||||
|
+/.*-cache
|
||||||
|
+.state-cache
|
||||||
|
+version.m4
|
||||||
|
+confdb/config.rpath
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/Makefile.am b/ompi/mca/io/romio32b1/romio/Makefile.am
|
||||||
|
index b9d4e25..69d7014 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/Makefile.am
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/Makefile.am
|
||||||
|
@@ -1,9 +1,28 @@
|
||||||
|
# -*- Mode: Makefile; -*-
|
||||||
|
+# Copyright (c) 2004-2006 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 (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||||
|
+# $COPYRIGHT$
|
||||||
|
+#
|
||||||
|
+# Additional copyrights may follow
|
||||||
|
+#
|
||||||
|
+# $HEADER$
|
||||||
|
#
|
||||||
|
# (C) 2011 by Argonne National Laboratory.
|
||||||
|
# See COPYRIGHT in top-level directory.
|
||||||
|
#
|
||||||
|
|
||||||
|
+# OMPI: include a top level makefile with some options
|
||||||
|
+include $(top_srcdir)/Makefile.options
|
||||||
|
+
|
||||||
|
## TODO: need to write an automakefile that handles two primary cases:
|
||||||
|
## 1) that ROMIO is being embedded within the MPI library, as in MPICH or Open
|
||||||
|
## MPI
|
||||||
|
@@ -17,7 +36,6 @@ ACLOCAL_AMFLAGS = -I confdb
|
||||||
|
include_HEADERS =
|
||||||
|
nodist_include_HEADERS =
|
||||||
|
noinst_HEADERS =
|
||||||
|
-AM_CPPFLAGS =
|
||||||
|
EXTRA_DIST =
|
||||||
|
SUFFIXES =
|
||||||
|
doc1_src_txt =
|
||||||
|
@@ -46,7 +64,9 @@ AM_CPPFLAGS += $(MPI_H_INCLUDE)
|
||||||
|
# handle the "include" directory here
|
||||||
|
AM_CPPFLAGS += -I$(top_builddir)/include -I$(top_srcdir)/include
|
||||||
|
# nodist_ b/c these are created by config.status and should not be distributed
|
||||||
|
-nodist_include_HEADERS += include/mpio.h include/mpiof.h
|
||||||
|
+# Open MPI: do not install mpio.h
|
||||||
|
+noinst_HEADERS += include/mpio.h
|
||||||
|
+noinst_HEADERS += include/io_romio_conv.h
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@@ -63,8 +83,8 @@ EXTRA_DIST += autogen.sh
|
||||||
|
if BUILD_ROMIO_EMBEDDED
|
||||||
|
# Build a libtool convenience library that the enclosing MPI implementation can
|
||||||
|
# use by adding it to the right _LIBADD variable.
|
||||||
|
-noinst_LTLIBRARIES = libromio.la
|
||||||
|
-libromio_la_SOURCES = $(romio_mpi_sources) $(romio_other_sources) $(glue_sources)
|
||||||
|
+noinst_LTLIBRARIES = libromio_dist.la
|
||||||
|
+libromio_dist_la_SOURCES = $(romio_mpi_sources) $(romio_other_sources) $(glue_sources)
|
||||||
|
|
||||||
|
## NOTE: ROMIO's old build system builds a bunch of _foo.o objects that contain
|
||||||
|
## PMPI_ implementations as well as calls to only other PMPI routines. In
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/Makefile.options b/ompi/mca/io/romio32b1/romio/Makefile.options
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..0b72829
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/Makefile.options
|
||||||
|
@@ -0,0 +1,36 @@
|
||||||
|
+# -*- makefile -*-
|
||||||
|
+#
|
||||||
|
+# 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$
|
||||||
|
+#
|
||||||
|
+
|
||||||
|
+AUTOMAKE_OPTIONS = foreign dist-bzip2
|
||||||
|
+
|
||||||
|
+# $(OMPI_TOP_SRCDIR) - mca_base_param.h
|
||||||
|
+# $(OMPI_TOP_SRCDIR)/opal/include - opal_config_bottom.h
|
||||||
|
+# $(OMPI_TOP_BUILDDIR)/opal/include - opal_config.h
|
||||||
|
+# $(OMPI_TOP_BUILDDIR)/ompi/include - mpi.h
|
||||||
|
+# $(top_srcdir)/include - vpath support
|
||||||
|
+# $(top_srcdir)/adio/include - vpath support
|
||||||
|
+
|
||||||
|
+AM_CPPFLAGS = \
|
||||||
|
+ -DOMPI_BUILDING=1 \
|
||||||
|
+ -I$(OMPI_TOP_SRCDIR) \
|
||||||
|
+ -I$(OMPI_TOP_SRCDIR)/opal/include \
|
||||||
|
+ -I$(OMPI_TOP_BUILDDIR)/opal/include \
|
||||||
|
+ -I$(OMPI_TOP_BUILDDIR)/ompi/include \
|
||||||
|
+ -I$(top_srcdir)/include \
|
||||||
|
+ -I$(top_srcdir)/adio/include
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/README_OMPI b/ompi/mca/io/romio32b1/romio/README_OMPI
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..6dba412
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/README_OMPI
|
||||||
|
@@ -0,0 +1,11 @@
|
||||||
|
+Please note that this is *NOT* a vanilla MPICH v3.2b1
|
||||||
|
+distribution of the ROMIO package from Argonne National Labs.
|
||||||
|
+Various customizations had to be applied to the configuration process.
|
||||||
|
+More to the point -- if replace this copy of ROMIO with a newer version,
|
||||||
|
+it will likely not work. :-(
|
||||||
|
+
|
||||||
|
+- The Open MPI Team
|
||||||
|
+
|
||||||
|
+-----------------------------------------------------------------------------
|
||||||
|
+
|
||||||
|
+Local modifications are in ompi.patch
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/adio/Makefile.mk b/ompi/mca/io/romio32b1/romio/adio/Makefile.mk
|
||||||
|
index 505d518..ffc05cb 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/adio/Makefile.mk
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/adio/Makefile.mk
|
||||||
|
@@ -20,6 +20,7 @@ noinst_HEADERS += \
|
||||||
|
adio/include/mpipr.h \
|
||||||
|
adio/include/mpiu_greq.h \
|
||||||
|
adio/include/nopackage.h \
|
||||||
|
+ adio/include/romioconf-undefs.h \
|
||||||
|
adio/include/mpiu_external32.h \
|
||||||
|
adio/include/hint_fns.h
|
||||||
|
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/adio/common/ad_end.c b/ompi/mca/io/romio32b1/romio/adio/common/ad_end.c
|
||||||
|
index ea4dfeb..066c65c 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/adio/common/ad_end.c
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/adio/common/ad_end.c
|
||||||
|
@@ -16,7 +16,12 @@ void ADIO_End(int *error_code)
|
||||||
|
|
||||||
|
/* if a default errhandler was set on MPI_FILE_NULL then we need to ensure
|
||||||
|
* that our reference to that errhandler is released */
|
||||||
|
+/* Open MPI: The call to PMPI_File_set_errhandler has to be done in romio/src/io_romio_file_open.c
|
||||||
|
+ in routine mca_io_romio_file_close()
|
||||||
|
+*/
|
||||||
|
+#if 0
|
||||||
|
PMPI_File_set_errhandler(MPI_FILE_NULL, MPI_ERRORS_RETURN);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* delete the flattened datatype list */
|
||||||
|
curr = ADIOI_Flatlist;
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/adio/common/ad_iread_coll.c b/ompi/mca/io/romio32b1/romio/adio/common/ad_iread_coll.c
|
||||||
|
index b1311e6..6ae4359 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/adio/common/ad_iread_coll.c
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/adio/common/ad_iread_coll.c
|
||||||
|
@@ -16,6 +16,8 @@
|
||||||
|
#include "mpe.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifdef HAVE_MPI_GREQUEST_EXTENSIONS
|
||||||
|
+
|
||||||
|
/* ADIOI_GEN_IreadStridedColl */
|
||||||
|
struct ADIOI_GEN_IreadStridedColl_vars {
|
||||||
|
/* requests */
|
||||||
|
@@ -1315,3 +1317,4 @@ static int ADIOI_GEN_irc_wait_fn(int count, void **array_of_states,
|
||||||
|
return errcode;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#endif /* HAVE_MPI_GREQUEST_EXTENSIONS */
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/adio/common/ad_iwrite_coll.c b/ompi/mca/io/romio32b1/romio/adio/common/ad_iwrite_coll.c
|
||||||
|
index b456ec4..9178a8d 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/adio/common/ad_iwrite_coll.c
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/adio/common/ad_iwrite_coll.c
|
||||||
|
@@ -13,6 +13,8 @@
|
||||||
|
#include "mpe.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifdef HAVE_MPI_GREQUEST_EXTENSIONS
|
||||||
|
+
|
||||||
|
/* ADIOI_GEN_IwriteStridedColl */
|
||||||
|
struct ADIOI_GEN_IwriteStridedColl_vars {
|
||||||
|
/* requests */
|
||||||
|
@@ -1539,3 +1541,4 @@ static int ADIOI_GEN_iwc_wait_fn(int count, void **array_of_states,
|
||||||
|
return errcode;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#endif /* HAVE_MPI_GREQUEST_EXTENSIONS */
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/adio/include/adioi.h b/ompi/mca/io/romio32b1/romio/adio/include/adioi.h
|
||||||
|
index b20ca82..73dad0d 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/adio/include/adioi.h
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/adio/include/adioi.h
|
||||||
|
@@ -429,18 +429,26 @@ void ADIOI_GEN_ReadStridedColl(ADIO_File fd, void *buf, int count,
|
||||||
|
MPI_Datatype datatype, int file_ptr_type,
|
||||||
|
ADIO_Offset offset, ADIO_Status *status, int
|
||||||
|
*error_code);
|
||||||
|
+#ifdef HAVE_MPI_GREQUEST_EXTENSIONS
|
||||||
|
void ADIOI_GEN_IreadStridedColl(ADIO_File fd, void *buf, int count,
|
||||||
|
MPI_Datatype datatype, int file_ptr_type,
|
||||||
|
ADIO_Offset offset, MPI_Request *request,
|
||||||
|
int *error_code);
|
||||||
|
+#else
|
||||||
|
+#define ADIOI_GEN_IreadStridedColl NULL
|
||||||
|
+#endif
|
||||||
|
void ADIOI_GEN_WriteStridedColl(ADIO_File fd, const void *buf, int count,
|
||||||
|
MPI_Datatype datatype, int file_ptr_type,
|
||||||
|
ADIO_Offset offset, ADIO_Status *status, int
|
||||||
|
*error_code);
|
||||||
|
+#ifdef HAVE_MPI_GREQUEST_EXTENSIONS
|
||||||
|
void ADIOI_GEN_IwriteStridedColl(ADIO_File fd, const void *buf, int count,
|
||||||
|
MPI_Datatype datatype, int file_ptr_type,
|
||||||
|
ADIO_Offset offset, MPI_Request *request,
|
||||||
|
int *error_code);
|
||||||
|
+#else
|
||||||
|
+#define ADIOI_GEN_IwriteStridedColl NULL
|
||||||
|
+#endif
|
||||||
|
void ADIOI_Calc_my_off_len(ADIO_File fd, int bufcount, MPI_Datatype
|
||||||
|
datatype, int file_ptr_type, ADIO_Offset
|
||||||
|
offset, ADIO_Offset **offset_list_ptr, ADIO_Offset
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/adio/include/romioconf-undefs.h b/ompi/mca/io/romio32b1/romio/adio/include/romioconf-undefs.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..5c21607
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/adio/include/romioconf-undefs.h
|
||||||
|
@@ -0,0 +1,45 @@
|
||||||
|
+/*
|
||||||
|
+ * 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 ROMIO_CONF_UNDEFS_H
|
||||||
|
+#define ROMIO_CONF_UNDEFS_H
|
||||||
|
+
|
||||||
|
+/* Need to add some undefs here so that we don't conflict with the
|
||||||
|
+ * main ompi_config.h. Arrgh. Stupid autoconf not giving us the option
|
||||||
|
+ * to not define these macros... grumble...
|
||||||
|
+ */
|
||||||
|
+#if defined(PACKAGE_BUGREPORT)
|
||||||
|
+#undef PACKAGE_BUGREPORT
|
||||||
|
+#endif
|
||||||
|
+#if defined(PACKAGE_NAME)
|
||||||
|
+#undef PACKAGE_NAME
|
||||||
|
+#endif
|
||||||
|
+#if defined(PACKAGE_STRING)
|
||||||
|
+#undef PACKAGE_STRING
|
||||||
|
+#endif
|
||||||
|
+#if defined(PACKAGE_TARNAME)
|
||||||
|
+#undef PACKAGE_TARNAME
|
||||||
|
+#endif
|
||||||
|
+#if defined(PACKAGE_VERSION)
|
||||||
|
+#undef PACKAGE_VERSION
|
||||||
|
+#endif
|
||||||
|
+#if defined(PACKAGE_URL)
|
||||||
|
+#undef PACKAGE_URL
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#endif /* ROMIOCONF_UNDEFS_H */
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/configure.ac b/ompi/mca/io/romio32b1/romio/configure.ac
|
||||||
|
index f975e1c..4d51a3e 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/configure.ac
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/configure.ac
|
||||||
|
@@ -3,12 +3,21 @@
|
||||||
|
# autoconf --localdir=../confdb configure.ac
|
||||||
|
# (or wherever the confdb is)
|
||||||
|
#
|
||||||
|
+# irrelevant / unnecessary in an Open MPI environment, but are
|
||||||
|
+# harmless and are left here solely for the sake of ease of future
|
||||||
|
+# patching/importing.
|
||||||
|
AC_PREREQ([2.63])
|
||||||
|
|
||||||
|
-m4_include([version.m4])
|
||||||
|
-dnl 2nd arg is intentionally underquoted
|
||||||
|
+# Open MPI: Modifications to this file were done on an "let's do the
|
||||||
|
+# minimum possible" basis, not so that we can skip on the work or
|
||||||
|
+# provide any less functionality, but more from a perspective that we
|
||||||
|
+# want to be able to import new versions of ROMIO in as easy a fashion
|
||||||
|
+# as possible. Hence, there are some things in this file that are
|
||||||
|
+# irrelevant / unnecessary in an Open MPI environment, but are
|
||||||
|
+# harmless and are left here solely for the sake of ease of future
|
||||||
|
+# patching/importing.
|
||||||
|
AC_INIT([ROMIO],
|
||||||
|
- MPICH_VERSION_m4,
|
||||||
|
+ [Open MPI],
|
||||||
|
[discuss@mpich.org],
|
||||||
|
[romio],
|
||||||
|
[http://www.mpich.org/])
|
||||||
|
@@ -22,7 +31,7 @@ dnl scripts.
|
||||||
|
AC_CONFIG_AUX_DIR([confdb])
|
||||||
|
AC_CONFIG_MACRO_DIR([confdb])
|
||||||
|
|
||||||
|
-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability-recursive foreign 1.12.3 silent-rules subdir-objects])
|
||||||
|
+AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability-recursive foreign 1.12 silent-rules subdir-objects])
|
||||||
|
AM_MAINTAINER_MODE([enable])
|
||||||
|
|
||||||
|
dnl must come before LT_INIT, which AC_REQUIREs AC_PROG_CC
|
||||||
|
@@ -43,12 +52,15 @@ if test -n "$CONFIGURE_ARGS" ; then
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CONFIG_HEADER(adio/include/romioconf.h)
|
||||||
|
+# Open MPI: modified AH_TOP
|
||||||
|
AH_TOP([/*
|
||||||
|
* (C) 2011 by Argonne National Laboratory.
|
||||||
|
* See COPYRIGHT in top-level directory.
|
||||||
|
*/
|
||||||
|
#ifndef ROMIOCONF_H_INCLUDED
|
||||||
|
#define ROMIOCONF_H_INCLUDED
|
||||||
|
+
|
||||||
|
+#include "romioconf-undefs.h"
|
||||||
|
])
|
||||||
|
AH_BOTTOM([
|
||||||
|
/* quash PACKAGE and PACKAGE_* vars, see MPICH top-level configure.ac for
|
||||||
|
@@ -58,9 +70,37 @@ AH_BOTTOM([
|
||||||
|
#endif /* !defined(ROMIOCONF_H_INCLUDED) */
|
||||||
|
])
|
||||||
|
|
||||||
|
+# Open MPI: this configure script doesn't seem to define these
|
||||||
|
+# anywhere, so just do them manually here because "we know better"
|
||||||
|
+# (i.e., Open MPI can be hard-wired to these values).
|
||||||
|
+AC_DEFINE([HAVE_MPI_OFFSET], [1], [Will always be 1 - OMPI has MPI_OFFSET])
|
||||||
|
+
|
||||||
|
+# Open MPI: look for top Open MPI directory
|
||||||
|
+AC_MSG_CHECKING([for Open MPI support files])
|
||||||
|
+if test -f "$srcdir/../../../../../config/opal_mca.m4"; then
|
||||||
|
+
|
||||||
|
+ # This is needed for VPATH builds, so that it will -I the
|
||||||
|
+ # appropriate include directory (don't know why automake
|
||||||
|
+ # doesn't do this # automatically).
|
||||||
|
+
|
||||||
|
+ OMPI_TOP_SRCDIR='$(top_srcdir)/../../../../..'
|
||||||
|
+ OMPI_TOP_BUILDDIR='$(top_builddir)/../../../../..'
|
||||||
|
+ with_mpi="$OMPI_TOP_SRCDIR"
|
||||||
|
+ AC_MSG_RESULT([in Open MPI source tree -- good])
|
||||||
|
+ AC_SUBST(OMPI_TOP_SRCDIR)
|
||||||
|
+ AC_SUBST(OMPI_TOP_BUILDDIR)
|
||||||
|
+else
|
||||||
|
+ AC_MSG_RESULT([not found])
|
||||||
|
+ AC_MSG_WARN([*** Could not find Open MPI support files])
|
||||||
|
+ AC_MSG_WARN([*** Can only build this version of ROMIO in an Open MPI source tree])
|
||||||
|
+ AC_MSG_ERROR([*** Cannot continue])
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
dnl
|
||||||
|
-NOF77=0
|
||||||
|
-NOF90=0
|
||||||
|
+# Open MPI: disable the f77 and f90 tests, as we provide our own
|
||||||
|
+# MPI interface and use only the C parts of ROMIO
|
||||||
|
+NOF77=1
|
||||||
|
+NOF90=1
|
||||||
|
ARCH=""
|
||||||
|
arch_IRIX=""
|
||||||
|
MPI_IMPL=""
|
||||||
|
@@ -95,6 +135,10 @@ AC_ARG_VAR([FROM_OMPI],[set to "yes" if building ROMIO inside of Open MPI])
|
||||||
|
FROM_OMPI=${FROM_OMPI:-no}
|
||||||
|
if test "$FROM_OMPI" = 1 ; then FROM_OMPI=yes ; fi
|
||||||
|
|
||||||
|
+AC_ARG_VAR([FROM_OMPI],[set to "yes" if building ROMIO inside of Open MPI])
|
||||||
|
+FROM_OMPI=${FROM_OMPI:-no}
|
||||||
|
+if test "$FROM_OMPI" = 1 ; then FROM_OMPI=yes ; fi
|
||||||
|
+
|
||||||
|
CFLAGS=${CFLAGS:-""}
|
||||||
|
LL="lld"
|
||||||
|
AR_LOCAL=""
|
||||||
|
@@ -120,7 +164,8 @@ ROMIO_TFFLAGS=""
|
||||||
|
NOPROFILE=0
|
||||||
|
MPIRUN=""
|
||||||
|
FORTRAN_TEST=""
|
||||||
|
-MAKE=${MAKE:-"make"}
|
||||||
|
+# Open MPI: This (setting make) is a Bad Thing to do in Automake-based build systems
|
||||||
|
+# MAKE=${MAKE:-"make"}
|
||||||
|
# foll. needed for f77 test programs
|
||||||
|
F77GETARG="call getarg(i,str)"
|
||||||
|
F77IARGC="iargc()"
|
||||||
|
@@ -133,6 +178,17 @@ MPI_OFFSET_KIND2="!"
|
||||||
|
TEST_CC=""
|
||||||
|
TEST_F77=""
|
||||||
|
#
|
||||||
|
+# Error handlers (not used with MPICH2, which provides its own routines)
|
||||||
|
+MPIO_EXTRA_OBJECTS="get_errh.o set_errh.o"
|
||||||
|
+MPIO_EXTRA_TMP_POBJECTS="get_errh.p set_errh.p"
|
||||||
|
+MPIO_EXTRA_REAL_POBJECTS="_get_errh.o _set_errh.o"
|
||||||
|
+#
|
||||||
|
+# Completion routines for MPIO_Requests. MPI Implementations with
|
||||||
|
+# generalized requests do not need these
|
||||||
|
+# ioreq_c2f and ioreq_f2c are not MPIO_Requests; rather, they
|
||||||
|
+MPIO_REQOBJECTS="iotest.o iotestall.o iotestany.o iotestsome.o iowait.o iowaitall.o iowaitany.o iowaitsome.o ioreq_c2f.o ioreq_f2c.o"
|
||||||
|
+MPIO_REQ_TMP_POBJECTS="iotest.p iowait.p iowaitall.p iowaitany.p iotestall.p iotestany.p iowaitsome.p iotestsome.p"
|
||||||
|
+MPIO_REQ_REAL_POBJECTS="_iotest.o _iowait.o _iowaitall.o _iowaitany.o _iotestall.o _iotestany.o _iowaitsome.o _iotestsome.o"
|
||||||
|
have_aio=no
|
||||||
|
#
|
||||||
|
known_mpi_impls="mpich_mpi mpich_mpi sgi_mpi hp_mpi cray_mpi lam_mpi open_mpi_mpi"
|
||||||
|
@@ -171,7 +227,7 @@ AC_ARG_ENABLE(f77,
|
||||||
|
AC_ARG_ENABLE(f90,
|
||||||
|
[--enable-f90 - Turn on support for Fortran 90 (default)],,enable_f90=yes)
|
||||||
|
AC_ARG_ENABLE(weak-symbols,
|
||||||
|
-[--enable-weak-symbols - Turn on support for weak symbols],,enable_weak_symbols=yes)
|
||||||
|
+[--enable-weak-symbols - Turn on support for weak symbols],,enable_weak_symbols=no)
|
||||||
|
AC_ARG_ENABLE(debug,
|
||||||
|
[--enable-debug - Build a debugging version],,)
|
||||||
|
AC_ARG_WITH(file-system,[
|
||||||
|
@@ -194,9 +250,10 @@ if test "$enable_debug" = "yes" ; then
|
||||||
|
DEBUG=yes
|
||||||
|
fi
|
||||||
|
MPI=$with_mpi
|
||||||
|
-if test -n "$with_mpi"; then
|
||||||
|
- CC=$MPI/bin/mpicc
|
||||||
|
-fi
|
||||||
|
+# Open MPI: No!
|
||||||
|
+#if test -n "$with_mpi"; then
|
||||||
|
+# CC=$MPI/bin/mpicc
|
||||||
|
+#fi
|
||||||
|
|
||||||
|
# start with the set of file systems that the user asked for
|
||||||
|
# FILE_SYSTEM=$with_file_system
|
||||||
|
@@ -259,6 +316,7 @@ top_build_dir=`pwd`
|
||||||
|
# used in romioinstall
|
||||||
|
AC_SUBST(top_build_dir)
|
||||||
|
|
||||||
|
+# Open MPI: these shouldn't be needed with AM
|
||||||
|
#
|
||||||
|
# Create the "autoconf" style directory names...
|
||||||
|
# Most of these are done for us; add the documentation directories
|
||||||
|
@@ -380,8 +438,9 @@ if test "$CC" = "gcc" -a -z "$C_DEBUG_FLAG" ; then
|
||||||
|
fi
|
||||||
|
if test $DEBUG = "yes" ; then
|
||||||
|
CFLAGS="$CFLAGS $C_DEBUG_FLAG"
|
||||||
|
-else
|
||||||
|
- CFLAGS="$CFLAGS $C_OPT_FLAG"
|
||||||
|
+# Open MPI: don't add optflags - they'll come from the top-level configure
|
||||||
|
+#else
|
||||||
|
+# CFLAGS="$CFLAGS $C_OPT_FLAG"
|
||||||
|
fi
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Here go the rest of the tests
|
||||||
|
@@ -428,7 +487,8 @@ else
|
||||||
|
F77=":"
|
||||||
|
fi
|
||||||
|
#
|
||||||
|
-AC_C_INLINE
|
||||||
|
+# Open MPI: We already do this test top-level
|
||||||
|
+dnl AC_C_INLINE
|
||||||
|
|
||||||
|
AC_TYPE_SIZE_T
|
||||||
|
AC_TYPE_SSIZE_T
|
||||||
|
@@ -651,7 +711,9 @@ AM_CONDITIONAL([BUILD_MPIO_ERRHAN],[false])
|
||||||
|
|
||||||
|
# if we don't have weak symbol support, we must build a separate convenience
|
||||||
|
# library in order to provide the "PMPI_" symbols
|
||||||
|
-AM_CONDITIONAL([BUILD_PROFILING_LIB],[test "x$HAVE_WEAK_SYMBOLS" = "x0"])
|
||||||
|
+# Open MPI: Disable the profile library
|
||||||
|
+#AM_CONDITIONAL([BUILD_PROFILING_LIB],[test "x$HAVE_WEAK_SYMBOLS" = "x0"])
|
||||||
|
+AM_CONDITIONAL([BUILD_PROFILING_LIB],[false])
|
||||||
|
|
||||||
|
# weird: we have conflated "buid ROMIO's versions of the fortran bindings" and
|
||||||
|
# "build ROMIO"s fortran I/O tests". Of course the common situaiton is that we
|
||||||
|
@@ -1565,8 +1627,10 @@ if test $FROM_OMPI = yes ; then
|
||||||
|
HAVE_MPI_DARRAY_SUBARRAY="#define HAVE_MPI_DARRAY_SUBARRAY"
|
||||||
|
# Open MPI: see comments in mpi-io/mpioprof.h
|
||||||
|
AC_DEFINE(MPIO_BUILD_PROFILING, 1, [hack to make ROMIO build without profiling])
|
||||||
|
- DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST"
|
||||||
|
+ DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST 1"
|
||||||
|
+ DEFINE_HAVE_MPI_GREQUEST_EXTENSIONS="#undef HAVE_MPI_GREQUEST_EXTENSIONS"
|
||||||
|
AC_DEFINE(HAVE_DECL_MPI_COMBINER_HINDEXED_BLOCK, 1, [Define if MPI library provides HINDEXED_BLOCK datatype])
|
||||||
|
+ AC_DEFINE(HAVE_MPIIO_CONST, 1, Set if MPI-IO prototypes use const qualifier)
|
||||||
|
elif test $FROM_LAM = yes ; then
|
||||||
|
# LAM does have the status set bytes functionality
|
||||||
|
AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if have MPIR_Status_set_bytes])
|
||||||
|
@@ -1615,7 +1679,7 @@ elif test $FROM_MPICH = yes ; then
|
||||||
|
DEFINE_HAVE_MPI_GREQUEST_EXTENSIONS="#define HAVE_MPI_GREQUEST_EXTENSIONS 1"
|
||||||
|
AC_DEFINE(HAVE_MPIU_FUNCS,1,[Define if MPICH memory tracing macros defined])
|
||||||
|
AC_DEFINE(HAVE_MPIX_H, 1, [])
|
||||||
|
- AC_DEFINE(HAVE_MPIIO_CONST, const, Set if MPI-IO prototypes use const qualifier)
|
||||||
|
+ AC_DEFINE(HAVE_MPIIO_CONST, 1, Set if MPI-IO prototypes use const qualifier)
|
||||||
|
AC_DEFINE(HAVE_MPI_TYPE_SIZE_X, 1, [Define if MPI library provides MPI_TYPE_SIZE_X])
|
||||||
|
AC_DEFINE(HAVE_MPI_STATUS_SET_ELEMENTS_X, 1, [Define if MPI library provides MPI_STATUS_SET_ELEMENTS_X])
|
||||||
|
AC_DEFINE(HAVE_DECL_MPI_COMBINER_HINDEXED_BLOCK, 1, [Define if MPI library provides HINDEXED_BLOCK datatype])
|
||||||
|
@@ -1751,9 +1815,22 @@ AC_CHECK_HEADERS(unistd.h,
|
||||||
|
echo "setting SYSDEP_INC to $SYSDEP_INC"
|
||||||
|
AC_SUBST(SYSDEP_INC)
|
||||||
|
|
||||||
|
+# Open MPI: use the exact same restrict test that we use in the
|
||||||
|
+# upper-level Open MPI configure script so that we always get the same
|
||||||
|
+# #define for "restrict" (there are a small number of files that will
|
||||||
|
+# end up including both ROMIO's romioconf.h and opal_config.h, so we
|
||||||
|
+# need to #defines to agree).
|
||||||
|
AC_C_RESTRICT
|
||||||
|
PAC_C_GNU_ATTRIBUTE
|
||||||
|
|
||||||
|
+# Open MPI: we need libtool
|
||||||
|
+AM_PROG_LIBTOOL
|
||||||
|
+
|
||||||
|
+# Open MPI: setup the AM_CONDITIONALs to build the different adio devices
|
||||||
|
+ m4_foreach([my_fs],
|
||||||
|
+ [gpfs, gridftp, hfs, lustre, nfs, ntfs, panfs, pfs, pvfs, piofs, pvfs, pvfs2, sfs, testfs, ufs, xfs, zoidfs],
|
||||||
|
+ [AM_CONDITIONAL(BUILD_[]AS_TR_CPP(my_fs), [test -n "$file_system_]my_fs["])])
|
||||||
|
+
|
||||||
|
# support gcov test coverage information
|
||||||
|
PAC_ENABLE_COVERAGE
|
||||||
|
|
||||||
|
@@ -1765,23 +1842,29 @@ echo "setting CFLAGS to $CFLAGS"
|
||||||
|
echo "setting USER_CFLAGS to $USER_CFLAGS"
|
||||||
|
echo "setting USER_FFLAGS to $USER_FFLAGS"
|
||||||
|
|
||||||
|
+# Open MPI: Add on CFLAGS that we figured out up top. They have
|
||||||
|
+# makefile macros in them, so we couldn't substitute them until now.
|
||||||
|
+CFLAGS="$CFLAGS $OMPI_CFLAGS "'-I$(top_builddir)/include'
|
||||||
|
+#
|
||||||
|
+# Open MPI - AM doesn't want the following:
|
||||||
|
+# VPATH, CC, CPPFLAGS, CFLAGS, AR, RANLIB, F77, MAKE
|
||||||
|
AC_SUBST(ARCH)
|
||||||
|
AC_SUBST(FILE_SYSTEM)
|
||||||
|
-AC_SUBST(CC)
|
||||||
|
-AC_SUBST(CPPFLAGS)
|
||||||
|
-AC_SUBST(CFLAGS)
|
||||||
|
+#AC_SUBST(CC)
|
||||||
|
+#AC_SUBST(CPPFLAGS)
|
||||||
|
+#AC_SUBST(CFLAGS)
|
||||||
|
AC_SUBST(USER_CFLAGS)
|
||||||
|
AC_SUBST(USER_FFLAGS)
|
||||||
|
AC_SUBST(MIPS)
|
||||||
|
AC_SUBST(BITS)
|
||||||
|
-AC_SUBST(AR)
|
||||||
|
+#AC_SUBST(AR)
|
||||||
|
AC_SUBST(AR_FLAGS)
|
||||||
|
AC_SUBST(MPI_INCLUDE_DIR)
|
||||||
|
AC_SUBST(MPI_LIB)
|
||||||
|
-AC_SUBST(F77)
|
||||||
|
+#AC_SUBST(F77)
|
||||||
|
AC_SUBST(NOF77)
|
||||||
|
AC_SUBST(NOPROFILE)
|
||||||
|
-AC_SUBST(MAKE)
|
||||||
|
+#AC_SUBST(MAKE)
|
||||||
|
AC_SUBST(arch_IRIX)
|
||||||
|
AC_SUBST(ROMIO_HOME)
|
||||||
|
AC_SUBST(LIBNAME)
|
||||||
|
@@ -1825,24 +1908,25 @@ AC_SUBST(ROMIO_TCPPFLAGS)
|
||||||
|
AC_SUBST(ROMIO_TFFLAGS)
|
||||||
|
AC_SUBST(MPIRUN)
|
||||||
|
AC_SUBST(FORTRAN_TEST)
|
||||||
|
-dnl
|
||||||
|
-dnl Support shared libraries
|
||||||
|
-if test -z "$ENABLE_SHLIB" ; then
|
||||||
|
- ENABLE_SHLIB=none
|
||||||
|
-fi
|
||||||
|
-AC_SUBST(ENABLE_SHLIB)
|
||||||
|
-AC_SUBST(CC_SHL)
|
||||||
|
-AC_SUBST(LIBTOOL)
|
||||||
|
+#dnl
|
||||||
|
+#dnl Support shared libraries
|
||||||
|
+#if test -z "$ENABLE_SHLIB" ; then
|
||||||
|
+# ENABLE_SHLIB=none
|
||||||
|
+#fi
|
||||||
|
+#AC_SUBST(ENABLE_SHLIB)
|
||||||
|
+#AC_SUBST(CC_SHL)
|
||||||
|
+#AC_SUBST(LIBTOOL)
|
||||||
|
+# Open MPI: This is no longer necessary with modern versions of autotools
|
||||||
|
# Remove the .a from the library file name (so that we can use .so or
|
||||||
|
# other appropriate suffix)
|
||||||
|
-SHLIBNAME=`echo $LIBNAME | sed 's/\.a$//'`
|
||||||
|
-AC_SUBST(SHLIBNAME)
|
||||||
|
-dnl
|
||||||
|
-if test ! -d adio ; then mkdir adio ; fi
|
||||||
|
-if test ! -d adio/include ; then mkdir adio/include ; fi
|
||||||
|
-if test ! -d mpi2-other ; then mkdir mpi2-other ; fi
|
||||||
|
-if test ! -d mpi-io ; then mkdir mpi-io ; fi
|
||||||
|
-if test ! -d mpi-io/glue ; then mkdir mpi-io/glue ; fi
|
||||||
|
+#SHLIBNAME=`echo $LIBNAME | sed 's/\.a$//'`
|
||||||
|
+#AC_SUBST(SHLIBNAME)
|
||||||
|
+#dnl
|
||||||
|
+#if test ! -d adio ; then mkdir adio ; fi
|
||||||
|
+#if test ! -d adio/include ; then mkdir adio/include ; fi
|
||||||
|
+#if test ! -d mpi2-other ; then mkdir mpi2-other ; fi
|
||||||
|
+#if test ! -d mpi-io ; then mkdir mpi-io ; fi
|
||||||
|
+#if test ! -d mpi-io/glue ; then mkdir mpi-io/glue ; fi
|
||||||
|
|
||||||
|
# Create makefiles for all of the adio devices. Only the ones that
|
||||||
|
# are active will be called by the top level ROMIO make
|
||||||
|
@@ -1850,8 +1934,6 @@ AC_OUTPUT_COMMANDS([chmod 755 util/romioinstall test/runtests])
|
||||||
|
AC_CONFIG_FILES([
|
||||||
|
Makefile
|
||||||
|
localdefs
|
||||||
|
- mpi2-other/info/Makefile
|
||||||
|
- mpi2-other/array/Makefile
|
||||||
|
test/Makefile
|
||||||
|
test/misc.c
|
||||||
|
test/large_file.c
|
||||||
|
@@ -1859,14 +1941,17 @@ AC_CONFIG_FILES([
|
||||||
|
test-internal/Makefile
|
||||||
|
util/romioinstall
|
||||||
|
include/mpio.h
|
||||||
|
- include/mpiof.h
|
||||||
|
- mpi2-other/info/fortran/Makefile
|
||||||
|
- mpi2-other/array/fortran/Makefile
|
||||||
|
test/fmisc.f
|
||||||
|
test/fcoll_test.f
|
||||||
|
test/pfcoll_test.f
|
||||||
|
test/fperf.f
|
||||||
|
])
|
||||||
|
+# Open MPI: intentionally skip the following:
|
||||||
|
+# mpi2-other/info/Makefile
|
||||||
|
+# mpi2-other/array/Makefile
|
||||||
|
+# mpi2-other/info/fortran/Makefile
|
||||||
|
+# mpi2-other/array/fortran/Makefile
|
||||||
|
+# include/mpiof.h
|
||||||
|
AC_OUTPUT
|
||||||
|
|
||||||
|
dnl PAC_SUBDIR_CACHE_CLEANUP
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/doc/users-guide.tex b/ompi/mca/io/romio32b1/romio/doc/users-guide.tex
|
||||||
|
index b33d483..3715431 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/doc/users-guide.tex
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/doc/users-guide.tex
|
||||||
|
@@ -807,13 +807,19 @@ to include the file {\tt mpio.h} for C or {\tt mpiof.h} for Fortran in
|
||||||
|
your MPI-IO program.
|
||||||
|
|
||||||
|
Note that on HP machines running HPUX and on NEC SX-4, you need to
|
||||||
|
-compile Fortran programs with {\tt mpifort}.
|
||||||
|
+compile Fortran programs with {\tt mpifort}, because {\tt mpif77} does
|
||||||
|
+not support 8-byte integers.
|
||||||
|
|
||||||
|
With MPICH, HP MPI, or NEC MPI, you can compile MPI-IO programs as \\
|
||||||
|
\hspace*{.4in} {\tt mpicc foo.c}\\
|
||||||
|
or \\
|
||||||
|
+\hspace*{.4in} {\tt mpif77 foo.f }\\
|
||||||
|
+or\\
|
||||||
|
\hspace*{.4in} {\tt mpifort foo.f}\\
|
||||||
|
|
||||||
|
+As mentioned above, mpifort is preferred over mpif77 on HPUX and NEC
|
||||||
|
+because the f77 compilers on those machines do not support 8-byte integers.
|
||||||
|
+
|
||||||
|
With SGI MPI, you can compile MPI-IO programs as \\
|
||||||
|
\hspace*{.4in} {\tt cc foo.c -lmpi}\\
|
||||||
|
or \\
|
||||||
|
@@ -863,7 +869,8 @@ file systems because they don't support {\tt fcntl} file locks,
|
||||||
|
and ROMIO uses that feature to implement shared file pointers.
|
||||||
|
|
||||||
|
\item On HP machines running HPUX and on NEC SX-4, you need to compile
|
||||||
|
-Fortran programs with {\tt mpifort}.
|
||||||
|
+Fortran programs with {\tt mpifort} instead of {\tt mpif77}, because
|
||||||
|
+the {\tt f77} compilers on these machines don't support 8-byte integers.
|
||||||
|
|
||||||
|
\item The file-open mode {\tt MPI\_MODE\_EXCL} does not work on Intel
|
||||||
|
PFS file system, due to a bug in PFS.
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/include/io_romio_conv.h b/ompi/mca/io/romio32b1/romio/include/io_romio_conv.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..c03873d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/include/io_romio_conv.h
|
||||||
|
@@ -0,0 +1,124 @@
|
||||||
|
+/*
|
||||||
|
+ * 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 MCA_IO_ROMIO_CONV_H
|
||||||
|
+#define MCA_IO_ROMIO_CONV_H
|
||||||
|
+
|
||||||
|
+/* Prefix that we add to all ROMIO symbols */
|
||||||
|
+#ifdef ROMIO_PREFIX
|
||||||
|
+#undef ROMIO_PREFIX
|
||||||
|
+#endif
|
||||||
|
+#define ROMIO_PREFIX(foo) mca_io_romio_dist_##foo
|
||||||
|
+
|
||||||
|
+/* Section 9.2 */
|
||||||
|
+/* Begin Prototypes */
|
||||||
|
+#define MPI_File_open ROMIO_PREFIX(MPI_File_open)
|
||||||
|
+#define MPI_File_close ROMIO_PREFIX(MPI_File_close)
|
||||||
|
+#define MPI_File_delete ROMIO_PREFIX(MPI_File_delete)
|
||||||
|
+#define MPI_File_set_size ROMIO_PREFIX(MPI_File_set_size)
|
||||||
|
+#define MPI_File_preallocate ROMIO_PREFIX(MPI_File_preallocate)
|
||||||
|
+#define MPI_File_get_size ROMIO_PREFIX(MPI_File_get_size)
|
||||||
|
+#define MPI_File_get_group ROMIO_PREFIX(MPI_File_get_group)
|
||||||
|
+#define MPI_File_get_amode ROMIO_PREFIX(MPI_File_get_amode)
|
||||||
|
+#define MPI_File_set_info ROMIO_PREFIX(MPI_File_set_info)
|
||||||
|
+#define MPI_File_get_info ROMIO_PREFIX(MPI_File_get_info)
|
||||||
|
+
|
||||||
|
+/* Section 9.3 */
|
||||||
|
+#define MPI_File_set_view ROMIO_PREFIX(MPI_File_set_view)
|
||||||
|
+#define MPI_File_get_view ROMIO_PREFIX(MPI_File_get_view)
|
||||||
|
+
|
||||||
|
+/* Section 9.4.2 */
|
||||||
|
+#define MPI_File_read_at ROMIO_PREFIX(MPI_File_read_at)
|
||||||
|
+#define MPI_File_read_at_all ROMIO_PREFIX(MPI_File_read_at_all)
|
||||||
|
+#define MPI_File_write_at ROMIO_PREFIX(MPI_File_write_at)
|
||||||
|
+#define MPI_File_write_at_all ROMIO_PREFIX(MPI_File_write_at_all)
|
||||||
|
+#define MPI_File_iread_at ROMIO_PREFIX(MPI_File_iread_at)
|
||||||
|
+#define MPI_File_iwrite_at ROMIO_PREFIX(MPI_File_iwrite_at)
|
||||||
|
+
|
||||||
|
+/* Section 9.4.3 */
|
||||||
|
+#define MPI_File_read ROMIO_PREFIX(MPI_File_read)
|
||||||
|
+#define MPI_File_read_all ROMIO_PREFIX(MPI_File_read_all)
|
||||||
|
+#define MPI_File_write ROMIO_PREFIX(MPI_File_write)
|
||||||
|
+#define MPI_File_write_all ROMIO_PREFIX(MPI_File_write_all)
|
||||||
|
+
|
||||||
|
+#define MPI_File_iread ROMIO_PREFIX(MPI_File_iread)
|
||||||
|
+#define MPI_File_iwrite ROMIO_PREFIX(MPI_File_iwrite)
|
||||||
|
+
|
||||||
|
+#define MPI_File_seek ROMIO_PREFIX(MPI_File_seek)
|
||||||
|
+#define MPI_File_get_position ROMIO_PREFIX(MPI_File_get_position)
|
||||||
|
+#define MPI_File_get_byte_offset ROMIO_PREFIX(MPI_File_get_byte_offset)
|
||||||
|
+
|
||||||
|
+/* Section 9.4.4 */
|
||||||
|
+#define MPI_File_read_shared ROMIO_PREFIX(MPI_File_read_shared)
|
||||||
|
+#define MPI_File_write_shared ROMIO_PREFIX(MPI_File_write_shared)
|
||||||
|
+#define MPI_File_iread_shared ROMIO_PREFIX(MPI_File_iread_shared)
|
||||||
|
+#define MPI_File_iwrite_shared ROMIO_PREFIX(MPI_File_iwrite_shared)
|
||||||
|
+#define MPI_File_read_ordered ROMIO_PREFIX(MPI_File_read_ordered)
|
||||||
|
+#define MPI_File_write_ordered ROMIO_PREFIX(MPI_File_write_ordered)
|
||||||
|
+#define MPI_File_seek_shared ROMIO_PREFIX(MPI_File_seek_shared)
|
||||||
|
+#define MPI_File_get_position_shared ROMIO_PREFIX(MPI_File_get_position_shared)
|
||||||
|
+
|
||||||
|
+/* Section 9.4.5 */
|
||||||
|
+#define MPI_File_read_at_all_begin ROMIO_PREFIX(MPI_File_read_at_all_begin)
|
||||||
|
+#define MPI_File_read_at_all_end ROMIO_PREFIX(MPI_File_read_at_all_end)
|
||||||
|
+#define MPI_File_write_at_all_begin ROMIO_PREFIX(MPI_File_write_at_all_begin)
|
||||||
|
+#define MPI_File_write_at_all_end ROMIO_PREFIX(MPI_File_write_at_all_end)
|
||||||
|
+#define MPI_File_read_all_begin ROMIO_PREFIX(MPI_File_read_all_begin)
|
||||||
|
+#define MPI_File_read_all_end ROMIO_PREFIX(MPI_File_read_all_end)
|
||||||
|
+#define MPI_File_write_all_begin ROMIO_PREFIX(MPI_File_write_all_begin)
|
||||||
|
+#define MPI_File_write_all_end ROMIO_PREFIX(MPI_File_write_all_end)
|
||||||
|
+#define MPI_File_read_ordered_begin ROMIO_PREFIX(MPI_File_read_ordered_begin)
|
||||||
|
+#define MPI_File_read_ordered_end ROMIO_PREFIX(MPI_File_read_ordered_end)
|
||||||
|
+#define MPI_File_write_ordered_begin ROMIO_PREFIX(MPI_File_write_ordered_begin)
|
||||||
|
+#define MPI_File_write_ordered_end ROMIO_PREFIX(MPI_File_write_ordered_end)
|
||||||
|
+
|
||||||
|
+/* Section 9.5.1 */
|
||||||
|
+#define MPI_File_get_type_extent ROMIO_PREFIX(MPI_File_get_type_extent)
|
||||||
|
+
|
||||||
|
+/* Section 9.6.1 */
|
||||||
|
+#define MPI_File_set_atomicity ROMIO_PREFIX(MPI_File_set_atomicity)
|
||||||
|
+#define MPI_File_get_atomicity ROMIO_PREFIX(MPI_File_get_atomicity)
|
||||||
|
+#define MPI_File_sync ROMIO_PREFIX(MPI_File_sync)
|
||||||
|
+
|
||||||
|
+/* Section 4.13.3 */
|
||||||
|
+#define MPI_File_set_errhandler ROMIO_PREFIX(MPI_File_set_errhandler)
|
||||||
|
+#define MPI_File_get_errhandler ROMIO_PREFIX(MPI_File_get_errhandler)
|
||||||
|
+/* End Prototypes */
|
||||||
|
+
|
||||||
|
+#define MPI_Register_datarep ROMIO_PREFIX(MPI_Register_datarep)
|
||||||
|
+
|
||||||
|
+/* JMS these don't seem to work... */
|
||||||
|
+#define MPI_File_f2c ROMIO_PREFIX(MPI_File_f2c)
|
||||||
|
+#define MPI_File_c2f ROMIO_PREFIX(MPI_File_c2f)
|
||||||
|
+
|
||||||
|
+#define MPIO_Request_c2f ROMIO_PREFIX(MPIO_Request_c2f)
|
||||||
|
+#define MPIO_Request_f2c ROMIO_PREFIX(MPIO_Request_f2c)
|
||||||
|
+
|
||||||
|
+/* Conversion of MPI_File and MPIO_Request */
|
||||||
|
+#define MPI_File ROMIO_PREFIX(MPI_File)
|
||||||
|
+
|
||||||
|
+/* Open MPI's mpi.h #define's MPI_FILE_NULL, so we need to undef it
|
||||||
|
+ here and allow it to be re-assigned to whatever ROMIO wants */
|
||||||
|
+#undef MPI_FILE_NULL
|
||||||
|
+
|
||||||
|
+/* Let's not use MPIR_Status_set_bytes */
|
||||||
|
+#ifndef MPIR_Status_set_bytes
|
||||||
|
+#define MPIR_Status_set_bytes ROMIO_PREFIX(MPIR_Status_set_bytes)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#endif /* MCA_IO_ROMIO_CONV_H */
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/include/mpio.h.in b/ompi/mca/io/romio32b1/romio/include/mpio.h.in
|
||||||
|
index 2238f4b..8d1314c 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/include/mpio.h.in
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/include/mpio.h.in
|
||||||
|
@@ -11,6 +11,16 @@
|
||||||
|
#define MPIO_INCLUDE
|
||||||
|
|
||||||
|
#include "mpi.h"
|
||||||
|
+/* Open MPI: We need to rename almost all of these functions, as well
|
||||||
|
+ a the types to be names that conform to the prefix rule */
|
||||||
|
+#include "io_romio_conv.h"
|
||||||
|
+
|
||||||
|
+#define MPIIMPL_HAVE_MPI_COMBINER_DARRAY 1
|
||||||
|
+#define MPIIMPL_HAVE_MPI_TYPE_CREATE_DARRAY 1
|
||||||
|
+#define MPIIMPL_HAVE_MPI_COMBINER_SUBARRAY 1
|
||||||
|
+#define MPIIMPL_HAVE_MPI_TYPE_CREATE_DARRAY 1
|
||||||
|
+#define MPIIMPL_HAVE_MPI_COMBINER_DUP 1
|
||||||
|
+#define MPICH_ATTR_POINTER_WITH_TYPE_TAG(x,y)
|
||||||
|
|
||||||
|
#if defined(__cplusplus)
|
||||||
|
extern "C" {
|
||||||
|
@@ -279,9 +289,12 @@ int MPI_Type_create_darray(int size, int rank, int ndims, const int array_of_gsi
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
/* above needed for some versions of mpi.h in MPICH!! */
|
||||||
|
+/* Open MPI: I can't seem to make these #define properly. Oh well --
|
||||||
|
+ we don't need them anyway :-( */
|
||||||
|
+#if 0
|
||||||
|
MPI_File MPI_File_f2c(MPI_Fint file);
|
||||||
|
MPI_Fint MPI_File_c2f(MPI_File file);
|
||||||
|
-
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#ifndef HAVE_MPI_GREQUEST
|
||||||
|
/* The following functions are required if generalized requests are not
|
||||||
|
@@ -329,15 +342,21 @@ int MPI_Info_free(MPI_Info *info);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
/* above needed for some versions of mpi.h in MPICH!! */
|
||||||
|
+/* Open MPI: we don't need these in ROMIO */
|
||||||
|
+#if 0
|
||||||
|
MPI_Fint MPI_Info_c2f(MPI_Info info);
|
||||||
|
MPI_Info MPI_Info_f2c(MPI_Fint info);
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#endif /* HAVE_PRAGMA_HP_SEC_DEF */
|
||||||
|
|
||||||
|
|
||||||
|
/**************** BINDINGS FOR THE PROFILING INTERFACE ***************/
|
||||||
|
|
||||||
|
+/* Open MPI: We don't want any of the profiling layer */
|
||||||
|
+#if 0
|
||||||
|
+
|
||||||
|
|
||||||
|
/* Section 9.2 */
|
||||||
|
int PMPI_File_open(MPI_Comm, const char *, int, MPI_Info, MPI_File *);
|
||||||
|
@@ -528,6 +547,8 @@ MPI_Fint PMPI_Info_c2f(MPI_Info);
|
||||||
|
MPI_Info PMPI_Info_f2c(MPI_Fint);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#endif /* Open MPI: We don't want any of the profiling layer */
|
||||||
|
+
|
||||||
|
#if defined(__cplusplus)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/localdefs.in b/ompi/mca/io/romio32b1/romio/localdefs.in
|
||||||
|
index bf057d1..5b3d670 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/localdefs.in
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/localdefs.in
|
||||||
|
@@ -1,7 +1,4 @@
|
||||||
|
#! /bin/sh
|
||||||
|
-
|
||||||
|
-# Append ROMIO library dependencies to the global list
|
||||||
|
-EXTERNAL_LIBS="$EXTERNAL_LIBS @LIBS@"
|
||||||
|
-
|
||||||
|
+LIBS="@LIBS@"
|
||||||
|
MPI_OFFSET_TYPE="@MPI_OFFSET_TYPE@"
|
||||||
|
FORTRAN_MPI_OFFSET="@FORTRAN_MPI_OFFSET@"
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/mpi-io/Makefile.mk b/ompi/mca/io/romio32b1/romio/mpi-io/Makefile.mk
|
||||||
|
index d4d5a29..264976e 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/mpi-io/Makefile.mk
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/mpi-io/Makefile.mk
|
||||||
|
@@ -14,8 +14,6 @@ noinst_HEADERS += mpi-io/mpioimpl.h mpi-io/mpioprof.h
|
||||||
|
romio_mpi_sources += \
|
||||||
|
mpi-io/close.c \
|
||||||
|
mpi-io/delete.c \
|
||||||
|
- mpi-io/file_c2f.c \
|
||||||
|
- mpi-io/file_f2c.c \
|
||||||
|
mpi-io/fsync.c \
|
||||||
|
mpi-io/get_amode.c \
|
||||||
|
mpi-io/get_atom.c \
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/mpi-io/close.c b/ompi/mca/io/romio32b1/romio/mpi-io/close.c
|
||||||
|
index 520f206..160b661 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/mpi-io/close.c
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/mpi-io/close.c
|
||||||
|
@@ -76,8 +76,13 @@ int MPI_File_close(MPI_File *fh)
|
||||||
|
* somehow inform the MPI library that we no longer hold a reference to any
|
||||||
|
* user defined error handler. We do this by setting the errhandler at this
|
||||||
|
* point to MPI_ERRORS_RETURN. */
|
||||||
|
+/* Open MPI: The call to PMPI_File_set_errhandler has to be done in romio/src/io_romio_file_open.c
|
||||||
|
+ in routine mca_io_romio_file_close()
|
||||||
|
+*/
|
||||||
|
+#if 0
|
||||||
|
error_code = PMPI_File_set_errhandler(*fh, MPI_ERRORS_RETURN);
|
||||||
|
if (error_code != MPI_SUCCESS) goto fn_fail;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
ADIO_Close(adio_fh, &error_code);
|
||||||
|
MPIO_File_free(fh);
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/mpi-io/glue/Makefile.mk b/ompi/mca/io/romio32b1/romio/mpi-io/glue/Makefile.mk
|
||||||
|
index 05954a1..66f7f9e 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/mpi-io/glue/Makefile.mk
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/mpi-io/glue/Makefile.mk
|
||||||
|
@@ -7,6 +7,7 @@
|
||||||
|
|
||||||
|
include $(top_srcdir)/mpi-io/glue/default/Makefile.mk
|
||||||
|
include $(top_srcdir)/mpi-io/glue/mpich/Makefile.mk
|
||||||
|
+include $(top_srcdir)/mpi-io/glue/openmpi/Makefile.mk
|
||||||
|
|
||||||
|
if !BUILD_ROMIO_EMBEDDED
|
||||||
|
romio_other_sources += \
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/mpi-io/iread_all.c b/ompi/mca/io/romio32b1/romio/mpi-io/iread_all.c
|
||||||
|
index ba36161..32a48b8 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/mpi-io/iread_all.c
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/mpi-io/iread_all.c
|
||||||
|
@@ -26,7 +26,7 @@ int MPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype
|
||||||
|
#include "mpioprof.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#ifdef HAVE_MPI_GREQUEST
|
||||||
|
+#if HAVE_MPI_GREQUEST
|
||||||
|
#include "mpiu_greq.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
diff --git a/ompi/mca/io/romio32b1/romio/mpi-io/mpioprof.h b/ompi/mca/io/romio32b1/romio/mpi-io/mpioprof.h
|
||||||
|
index 15654ac..63dffd8 100644
|
||||||
|
--- a/ompi/mca/io/romio32b1/romio/mpi-io/mpioprof.h
|
||||||
|
+++ b/ompi/mca/io/romio32b1/romio/mpi-io/mpioprof.h
|
||||||
|
@@ -10,6 +10,15 @@
|
||||||
|
building the profiling interface
|
||||||
|
*/
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ * Open MPI: Unfortunately, ROMIO doesn't seem to be able to build
|
||||||
|
+ * without a profiling interface, but we don't want a profiling
|
||||||
|
+ * interface, since we are just using ROMIO "behind the scenes".
|
||||||
|
+ * So enable all the profiling defines, only compile once, and don't
|
||||||
|
+ * do all the name mangling. The effect is about the same, but without
|
||||||
|
+ * modification to all the files in the mpi-io directory.
|
||||||
|
+ */
|
||||||
|
+#if 0
|
||||||
|
#ifdef MPIO_BUILD_PROFILING
|
||||||
|
|
||||||
|
#undef MPI_File_open
|
||||||
|
@@ -212,3 +221,4 @@
|
||||||
|
#define MPIX_Grequest_class_create PMPIX_Grequest_class_create
|
||||||
|
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
@ -36,3 +36,4 @@ __sgi_mpi
|
|||||||
__hp_mpi
|
__hp_mpi
|
||||||
__cray_mpi
|
__cray_mpi
|
||||||
__lam_mpi
|
__lam_mpi
|
||||||
|
__open_mpi
|
||||||
|
|||||||
@ -1,9 +1,28 @@
|
|||||||
# -*- Mode: Makefile; -*-
|
# -*- Mode: Makefile; -*-
|
||||||
|
# Copyright (c) 2004-2006 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 (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||||
|
# $COPYRIGHT$
|
||||||
|
#
|
||||||
|
# Additional copyrights may follow
|
||||||
|
#
|
||||||
|
# $HEADER$
|
||||||
#
|
#
|
||||||
# (C) 2011 by Argonne National Laboratory.
|
# (C) 2011 by Argonne National Laboratory.
|
||||||
# See COPYRIGHT in top-level directory.
|
# See COPYRIGHT in top-level directory.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# OMPI: include a top level makefile with some options
|
||||||
|
include $(top_srcdir)/Makefile.options
|
||||||
|
|
||||||
## TODO: need to write an automakefile that handles two primary cases:
|
## TODO: need to write an automakefile that handles two primary cases:
|
||||||
## 1) that ROMIO is being embedded within the MPI library, as in MPICH or Open
|
## 1) that ROMIO is being embedded within the MPI library, as in MPICH or Open
|
||||||
## MPI
|
## MPI
|
||||||
@ -17,7 +36,6 @@ ACLOCAL_AMFLAGS = -I confdb
|
|||||||
include_HEADERS =
|
include_HEADERS =
|
||||||
nodist_include_HEADERS =
|
nodist_include_HEADERS =
|
||||||
noinst_HEADERS =
|
noinst_HEADERS =
|
||||||
AM_CPPFLAGS =
|
|
||||||
EXTRA_DIST =
|
EXTRA_DIST =
|
||||||
SUFFIXES =
|
SUFFIXES =
|
||||||
doc1_src_txt =
|
doc1_src_txt =
|
||||||
@ -46,7 +64,9 @@ AM_CPPFLAGS += $(MPI_H_INCLUDE)
|
|||||||
# handle the "include" directory here
|
# handle the "include" directory here
|
||||||
AM_CPPFLAGS += -I$(top_builddir)/include -I$(top_srcdir)/include
|
AM_CPPFLAGS += -I$(top_builddir)/include -I$(top_srcdir)/include
|
||||||
# nodist_ b/c these are created by config.status and should not be distributed
|
# nodist_ b/c these are created by config.status and should not be distributed
|
||||||
nodist_include_HEADERS += include/mpio.h include/mpiof.h
|
# Open MPI: do not install mpio.h
|
||||||
|
noinst_HEADERS += include/mpio.h
|
||||||
|
noinst_HEADERS += include/io_romio_conv.h
|
||||||
|
|
||||||
# ------------------------------------------------------------------------
|
# ------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -63,8 +83,8 @@ EXTRA_DIST += autogen.sh
|
|||||||
if BUILD_ROMIO_EMBEDDED
|
if BUILD_ROMIO_EMBEDDED
|
||||||
# Build a libtool convenience library that the enclosing MPI implementation can
|
# Build a libtool convenience library that the enclosing MPI implementation can
|
||||||
# use by adding it to the right _LIBADD variable.
|
# use by adding it to the right _LIBADD variable.
|
||||||
noinst_LTLIBRARIES = libromio.la
|
noinst_LTLIBRARIES = libromio_dist.la
|
||||||
libromio_la_SOURCES = $(romio_mpi_sources) $(romio_other_sources) $(glue_sources)
|
libromio_dist_la_SOURCES = $(romio_mpi_sources) $(romio_other_sources) $(glue_sources)
|
||||||
|
|
||||||
## NOTE: ROMIO's old build system builds a bunch of _foo.o objects that contain
|
## NOTE: ROMIO's old build system builds a bunch of _foo.o objects that contain
|
||||||
## PMPI_ implementations as well as calls to only other PMPI routines. In
|
## PMPI_ implementations as well as calls to only other PMPI routines. In
|
||||||
|
|||||||
36
ompi/mca/io/romio314/romio/Makefile.options
Обычный файл
36
ompi/mca/io/romio314/romio/Makefile.options
Обычный файл
@ -0,0 +1,36 @@
|
|||||||
|
# -*- makefile -*-
|
||||||
|
#
|
||||||
|
# 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$
|
||||||
|
#
|
||||||
|
|
||||||
|
AUTOMAKE_OPTIONS = foreign dist-bzip2
|
||||||
|
|
||||||
|
# $(OMPI_TOP_SRCDIR) - mca_base_param.h
|
||||||
|
# $(OMPI_TOP_SRCDIR)/opal/include - opal_config_bottom.h
|
||||||
|
# $(OMPI_TOP_BUILDDIR)/opal/include - opal_config.h
|
||||||
|
# $(OMPI_TOP_BUILDDIR)/ompi/include - mpi.h
|
||||||
|
# $(top_srcdir)/include - vpath support
|
||||||
|
# $(top_srcdir)/adio/include - vpath support
|
||||||
|
|
||||||
|
AM_CPPFLAGS = \
|
||||||
|
-DOMPI_BUILDING=1 \
|
||||||
|
-I$(OMPI_TOP_SRCDIR) \
|
||||||
|
-I$(OMPI_TOP_SRCDIR)/opal/include \
|
||||||
|
-I$(OMPI_TOP_BUILDDIR)/opal/include \
|
||||||
|
-I$(OMPI_TOP_BUILDDIR)/ompi/include \
|
||||||
|
-I$(top_srcdir)/include \
|
||||||
|
-I$(top_srcdir)/adio/include
|
||||||
11
ompi/mca/io/romio314/romio/README_OMPI
Обычный файл
11
ompi/mca/io/romio314/romio/README_OMPI
Обычный файл
@ -0,0 +1,11 @@
|
|||||||
|
Please note that this is *NOT* a vanilla MPICH v3.2b1
|
||||||
|
distribution of the ROMIO package from Argonne National Labs.
|
||||||
|
Various customizations had to be applied to the configuration process.
|
||||||
|
More to the point -- if replace this copy of ROMIO with a newer version,
|
||||||
|
it will likely not work. :-(
|
||||||
|
|
||||||
|
- The Open MPI Team
|
||||||
|
|
||||||
|
-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Local modifications are in ompi.patch
|
||||||
@ -20,6 +20,7 @@ noinst_HEADERS += \
|
|||||||
adio/include/mpipr.h \
|
adio/include/mpipr.h \
|
||||||
adio/include/mpiu_greq.h \
|
adio/include/mpiu_greq.h \
|
||||||
adio/include/nopackage.h \
|
adio/include/nopackage.h \
|
||||||
|
adio/include/romioconf-undefs.h \
|
||||||
adio/include/mpiu_external32.h \
|
adio/include/mpiu_external32.h \
|
||||||
adio/include/hint_fns.h
|
adio/include/hint_fns.h
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,12 @@ void ADIO_End(int *error_code)
|
|||||||
|
|
||||||
/* if a default errhandler was set on MPI_FILE_NULL then we need to ensure
|
/* if a default errhandler was set on MPI_FILE_NULL then we need to ensure
|
||||||
* that our reference to that errhandler is released */
|
* that our reference to that errhandler is released */
|
||||||
|
/* Open MPI: The call to PMPI_File_set_errhandler has to be done in romio/src/io_romio_file_open.c
|
||||||
|
in routine mca_io_romio_file_close()
|
||||||
|
*/
|
||||||
|
#if 0
|
||||||
PMPI_File_set_errhandler(MPI_FILE_NULL, MPI_ERRORS_RETURN);
|
PMPI_File_set_errhandler(MPI_FILE_NULL, MPI_ERRORS_RETURN);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* delete the flattened datatype list */
|
/* delete the flattened datatype list */
|
||||||
curr = ADIOI_Flatlist;
|
curr = ADIOI_Flatlist;
|
||||||
|
|||||||
45
ompi/mca/io/romio314/romio/adio/include/romioconf-undefs.h
Обычный файл
45
ompi/mca/io/romio314/romio/adio/include/romioconf-undefs.h
Обычный файл
@ -0,0 +1,45 @@
|
|||||||
|
/*
|
||||||
|
* 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 ROMIO_CONF_UNDEFS_H
|
||||||
|
#define ROMIO_CONF_UNDEFS_H
|
||||||
|
|
||||||
|
/* Need to add some undefs here so that we don't conflict with the
|
||||||
|
* main ompi_config.h. Arrgh. Stupid autoconf not giving us the option
|
||||||
|
* to not define these macros... grumble...
|
||||||
|
*/
|
||||||
|
#if defined(PACKAGE_BUGREPORT)
|
||||||
|
#undef PACKAGE_BUGREPORT
|
||||||
|
#endif
|
||||||
|
#if defined(PACKAGE_NAME)
|
||||||
|
#undef PACKAGE_NAME
|
||||||
|
#endif
|
||||||
|
#if defined(PACKAGE_STRING)
|
||||||
|
#undef PACKAGE_STRING
|
||||||
|
#endif
|
||||||
|
#if defined(PACKAGE_TARNAME)
|
||||||
|
#undef PACKAGE_TARNAME
|
||||||
|
#endif
|
||||||
|
#if defined(PACKAGE_VERSION)
|
||||||
|
#undef PACKAGE_VERSION
|
||||||
|
#endif
|
||||||
|
#if defined(PACKAGE_URL)
|
||||||
|
#undef PACKAGE_URL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* ROMIOCONF_UNDEFS_H */
|
||||||
@ -3,12 +3,21 @@
|
|||||||
# autoconf --localdir=../confdb configure.ac
|
# autoconf --localdir=../confdb configure.ac
|
||||||
# (or wherever the confdb is)
|
# (or wherever the confdb is)
|
||||||
#
|
#
|
||||||
|
# irrelevant / unnecessary in an Open MPI environment, but are
|
||||||
|
# harmless and are left here solely for the sake of ease of future
|
||||||
|
# patching/importing.
|
||||||
AC_PREREQ([2.63])
|
AC_PREREQ([2.63])
|
||||||
|
|
||||||
m4_include([version.m4])
|
# Open MPI: Modifications to this file were done on an "let's do the
|
||||||
dnl 2nd arg is intentionally underquoted
|
# minimum possible" basis, not so that we can skip on the work or
|
||||||
|
# provide any less functionality, but more from a perspective that we
|
||||||
|
# want to be able to import new versions of ROMIO in as easy a fashion
|
||||||
|
# as possible. Hence, there are some things in this file that are
|
||||||
|
# irrelevant / unnecessary in an Open MPI environment, but are
|
||||||
|
# harmless and are left here solely for the sake of ease of future
|
||||||
|
# patching/importing.
|
||||||
AC_INIT([ROMIO],
|
AC_INIT([ROMIO],
|
||||||
MPICH_VERSION_m4,
|
[Open MPI],
|
||||||
[discuss@mpich.org],
|
[discuss@mpich.org],
|
||||||
[romio],
|
[romio],
|
||||||
[http://www.mpich.org/])
|
[http://www.mpich.org/])
|
||||||
@ -22,7 +31,7 @@ dnl scripts.
|
|||||||
AC_CONFIG_AUX_DIR([confdb])
|
AC_CONFIG_AUX_DIR([confdb])
|
||||||
AC_CONFIG_MACRO_DIR([confdb])
|
AC_CONFIG_MACRO_DIR([confdb])
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability-recursive foreign 1.12.3 silent-rules subdir-objects])
|
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability-recursive foreign 1.12 silent-rules subdir-objects])
|
||||||
AM_MAINTAINER_MODE([enable])
|
AM_MAINTAINER_MODE([enable])
|
||||||
|
|
||||||
dnl must come before LT_INIT, which AC_REQUIREs AC_PROG_CC
|
dnl must come before LT_INIT, which AC_REQUIREs AC_PROG_CC
|
||||||
@ -43,12 +52,15 @@ if test -n "$CONFIGURE_ARGS" ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CONFIG_HEADER(adio/include/romioconf.h)
|
AC_CONFIG_HEADER(adio/include/romioconf.h)
|
||||||
|
# Open MPI: modified AH_TOP
|
||||||
AH_TOP([/*
|
AH_TOP([/*
|
||||||
* (C) 2011 by Argonne National Laboratory.
|
* (C) 2011 by Argonne National Laboratory.
|
||||||
* See COPYRIGHT in top-level directory.
|
* See COPYRIGHT in top-level directory.
|
||||||
*/
|
*/
|
||||||
#ifndef ROMIOCONF_H_INCLUDED
|
#ifndef ROMIOCONF_H_INCLUDED
|
||||||
#define ROMIOCONF_H_INCLUDED
|
#define ROMIOCONF_H_INCLUDED
|
||||||
|
|
||||||
|
#include "romioconf-undefs.h"
|
||||||
])
|
])
|
||||||
AH_BOTTOM([
|
AH_BOTTOM([
|
||||||
/* quash PACKAGE and PACKAGE_* vars, see MPICH top-level configure.ac for
|
/* quash PACKAGE and PACKAGE_* vars, see MPICH top-level configure.ac for
|
||||||
@ -58,9 +70,37 @@ AH_BOTTOM([
|
|||||||
#endif /* !defined(ROMIOCONF_H_INCLUDED) */
|
#endif /* !defined(ROMIOCONF_H_INCLUDED) */
|
||||||
])
|
])
|
||||||
|
|
||||||
|
# Open MPI: this configure script doesn't seem to define these
|
||||||
|
# anywhere, so just do them manually here because "we know better"
|
||||||
|
# (i.e., Open MPI can be hard-wired to these values).
|
||||||
|
AC_DEFINE([HAVE_MPI_OFFSET], [1], [Will always be 1 - OMPI has MPI_OFFSET])
|
||||||
|
|
||||||
|
# Open MPI: look for top Open MPI directory
|
||||||
|
AC_MSG_CHECKING([for Open MPI support files])
|
||||||
|
if test -f "$srcdir/../../../../../config/opal_mca.m4"; then
|
||||||
|
|
||||||
|
# This is needed for VPATH builds, so that it will -I the
|
||||||
|
# appropriate include directory (don't know why automake
|
||||||
|
# doesn't do this # automatically).
|
||||||
|
|
||||||
|
OMPI_TOP_SRCDIR='$(top_srcdir)/../../../../..'
|
||||||
|
OMPI_TOP_BUILDDIR='$(top_builddir)/../../../../..'
|
||||||
|
with_mpi="$OMPI_TOP_SRCDIR"
|
||||||
|
AC_MSG_RESULT([in Open MPI source tree -- good])
|
||||||
|
AC_SUBST(OMPI_TOP_SRCDIR)
|
||||||
|
AC_SUBST(OMPI_TOP_BUILDDIR)
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([not found])
|
||||||
|
AC_MSG_WARN([*** Could not find Open MPI support files])
|
||||||
|
AC_MSG_WARN([*** Can only build this version of ROMIO in an Open MPI source tree])
|
||||||
|
AC_MSG_ERROR([*** Cannot continue])
|
||||||
|
fi
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
NOF77=0
|
# Open MPI: disable the f77 and f90 tests, as we provide our own
|
||||||
NOF90=0
|
# MPI interface and use only the C parts of ROMIO
|
||||||
|
NOF77=1
|
||||||
|
NOF90=1
|
||||||
ARCH=""
|
ARCH=""
|
||||||
arch_IRIX=""
|
arch_IRIX=""
|
||||||
MPI_IMPL=""
|
MPI_IMPL=""
|
||||||
@ -95,6 +135,10 @@ AC_ARG_VAR([FROM_OMPI],[set to "yes" if building ROMIO inside of Open MPI])
|
|||||||
FROM_OMPI=${FROM_OMPI:-no}
|
FROM_OMPI=${FROM_OMPI:-no}
|
||||||
if test "$FROM_OMPI" = 1 ; then FROM_OMPI=yes ; fi
|
if test "$FROM_OMPI" = 1 ; then FROM_OMPI=yes ; fi
|
||||||
|
|
||||||
|
AC_ARG_VAR([FROM_OMPI],[set to "yes" if building ROMIO inside of Open MPI])
|
||||||
|
FROM_OMPI=${FROM_OMPI:-no}
|
||||||
|
if test "$FROM_OMPI" = 1 ; then FROM_OMPI=yes ; fi
|
||||||
|
|
||||||
CFLAGS=${CFLAGS:-""}
|
CFLAGS=${CFLAGS:-""}
|
||||||
LL="lld"
|
LL="lld"
|
||||||
AR_LOCAL=""
|
AR_LOCAL=""
|
||||||
@ -120,7 +164,8 @@ ROMIO_TFFLAGS=""
|
|||||||
NOPROFILE=0
|
NOPROFILE=0
|
||||||
MPIRUN=""
|
MPIRUN=""
|
||||||
FORTRAN_TEST=""
|
FORTRAN_TEST=""
|
||||||
MAKE=${MAKE:-"make"}
|
# Open MPI: This (setting make) is a Bad Thing to do in Automake-based build systems
|
||||||
|
# MAKE=${MAKE:-"make"}
|
||||||
# foll. needed for f77 test programs
|
# foll. needed for f77 test programs
|
||||||
F77GETARG="call getarg(i,str)"
|
F77GETARG="call getarg(i,str)"
|
||||||
F77IARGC="iargc()"
|
F77IARGC="iargc()"
|
||||||
@ -133,6 +178,17 @@ MPI_OFFSET_KIND2="!"
|
|||||||
TEST_CC=""
|
TEST_CC=""
|
||||||
TEST_F77=""
|
TEST_F77=""
|
||||||
#
|
#
|
||||||
|
# Error handlers (not used with MPICH2, which provides its own routines)
|
||||||
|
MPIO_EXTRA_OBJECTS="get_errh.o set_errh.o"
|
||||||
|
MPIO_EXTRA_TMP_POBJECTS="get_errh.p set_errh.p"
|
||||||
|
MPIO_EXTRA_REAL_POBJECTS="_get_errh.o _set_errh.o"
|
||||||
|
#
|
||||||
|
# Completion routines for MPIO_Requests. MPI Implementations with
|
||||||
|
# generalized requests do not need these
|
||||||
|
# ioreq_c2f and ioreq_f2c are not MPIO_Requests; rather, they
|
||||||
|
MPIO_REQOBJECTS="iotest.o iotestall.o iotestany.o iotestsome.o iowait.o iowaitall.o iowaitany.o iowaitsome.o ioreq_c2f.o ioreq_f2c.o"
|
||||||
|
MPIO_REQ_TMP_POBJECTS="iotest.p iowait.p iowaitall.p iowaitany.p iotestall.p iotestany.p iowaitsome.p iotestsome.p"
|
||||||
|
MPIO_REQ_REAL_POBJECTS="_iotest.o _iowait.o _iowaitall.o _iowaitany.o _iotestall.o _iotestany.o _iowaitsome.o _iotestsome.o"
|
||||||
have_aio=no
|
have_aio=no
|
||||||
#
|
#
|
||||||
known_mpi_impls="mpich_mpi mpich_mpi sgi_mpi hp_mpi cray_mpi lam_mpi open_mpi_mpi"
|
known_mpi_impls="mpich_mpi mpich_mpi sgi_mpi hp_mpi cray_mpi lam_mpi open_mpi_mpi"
|
||||||
@ -171,7 +227,7 @@ AC_ARG_ENABLE(f77,
|
|||||||
AC_ARG_ENABLE(f90,
|
AC_ARG_ENABLE(f90,
|
||||||
[--enable-f90 - Turn on support for Fortran 90 (default)],,enable_f90=yes)
|
[--enable-f90 - Turn on support for Fortran 90 (default)],,enable_f90=yes)
|
||||||
AC_ARG_ENABLE(weak-symbols,
|
AC_ARG_ENABLE(weak-symbols,
|
||||||
[--enable-weak-symbols - Turn on support for weak symbols],,enable_weak_symbols=yes)
|
[--enable-weak-symbols - Turn on support for weak symbols],,enable_weak_symbols=no)
|
||||||
AC_ARG_ENABLE(debug,
|
AC_ARG_ENABLE(debug,
|
||||||
[--enable-debug - Build a debugging version],,)
|
[--enable-debug - Build a debugging version],,)
|
||||||
AC_ARG_WITH(file-system,[
|
AC_ARG_WITH(file-system,[
|
||||||
@ -194,9 +250,10 @@ if test "$enable_debug" = "yes" ; then
|
|||||||
DEBUG=yes
|
DEBUG=yes
|
||||||
fi
|
fi
|
||||||
MPI=$with_mpi
|
MPI=$with_mpi
|
||||||
if test -n "$with_mpi"; then
|
# Open MPI: No!
|
||||||
CC=$MPI/bin/mpicc
|
#if test -n "$with_mpi"; then
|
||||||
fi
|
# CC=$MPI/bin/mpicc
|
||||||
|
#fi
|
||||||
|
|
||||||
# start with the set of file systems that the user asked for
|
# start with the set of file systems that the user asked for
|
||||||
# FILE_SYSTEM=$with_file_system
|
# FILE_SYSTEM=$with_file_system
|
||||||
@ -259,6 +316,7 @@ top_build_dir=`pwd`
|
|||||||
# used in romioinstall
|
# used in romioinstall
|
||||||
AC_SUBST(top_build_dir)
|
AC_SUBST(top_build_dir)
|
||||||
|
|
||||||
|
# Open MPI: these shouldn't be needed with AM
|
||||||
#
|
#
|
||||||
# Create the "autoconf" style directory names...
|
# Create the "autoconf" style directory names...
|
||||||
# Most of these are done for us; add the documentation directories
|
# Most of these are done for us; add the documentation directories
|
||||||
@ -380,8 +438,9 @@ if test "$CC" = "gcc" -a -z "$C_DEBUG_FLAG" ; then
|
|||||||
fi
|
fi
|
||||||
if test $DEBUG = "yes" ; then
|
if test $DEBUG = "yes" ; then
|
||||||
CFLAGS="$CFLAGS $C_DEBUG_FLAG"
|
CFLAGS="$CFLAGS $C_DEBUG_FLAG"
|
||||||
else
|
# Open MPI: don't add optflags - they'll come from the top-level configure
|
||||||
CFLAGS="$CFLAGS $C_OPT_FLAG"
|
#else
|
||||||
|
# CFLAGS="$CFLAGS $C_OPT_FLAG"
|
||||||
fi
|
fi
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Here go the rest of the tests
|
# Here go the rest of the tests
|
||||||
@ -428,7 +487,8 @@ else
|
|||||||
F77=":"
|
F77=":"
|
||||||
fi
|
fi
|
||||||
#
|
#
|
||||||
AC_C_INLINE
|
# Open MPI: We already do this test top-level
|
||||||
|
dnl AC_C_INLINE
|
||||||
|
|
||||||
AC_TYPE_SIZE_T
|
AC_TYPE_SIZE_T
|
||||||
AC_TYPE_SSIZE_T
|
AC_TYPE_SSIZE_T
|
||||||
@ -651,7 +711,9 @@ AM_CONDITIONAL([BUILD_MPIO_ERRHAN],[false])
|
|||||||
|
|
||||||
# if we don't have weak symbol support, we must build a separate convenience
|
# if we don't have weak symbol support, we must build a separate convenience
|
||||||
# library in order to provide the "PMPI_" symbols
|
# library in order to provide the "PMPI_" symbols
|
||||||
AM_CONDITIONAL([BUILD_PROFILING_LIB],[test "x$HAVE_WEAK_SYMBOLS" = "x0"])
|
# Open MPI: Disable the profile library
|
||||||
|
#AM_CONDITIONAL([BUILD_PROFILING_LIB],[test "x$HAVE_WEAK_SYMBOLS" = "x0"])
|
||||||
|
AM_CONDITIONAL([BUILD_PROFILING_LIB],[false])
|
||||||
|
|
||||||
# weird: we have conflated "buid ROMIO's versions of the fortran bindings" and
|
# weird: we have conflated "buid ROMIO's versions of the fortran bindings" and
|
||||||
# "build ROMIO"s fortran I/O tests". Of course the common situaiton is that we
|
# "build ROMIO"s fortran I/O tests". Of course the common situaiton is that we
|
||||||
@ -1557,8 +1619,10 @@ if test $FROM_OMPI = yes ; then
|
|||||||
HAVE_MPI_DARRAY_SUBARRAY="#define HAVE_MPI_DARRAY_SUBARRAY"
|
HAVE_MPI_DARRAY_SUBARRAY="#define HAVE_MPI_DARRAY_SUBARRAY"
|
||||||
# Open MPI: see comments in mpi-io/mpioprof.h
|
# Open MPI: see comments in mpi-io/mpioprof.h
|
||||||
AC_DEFINE(MPIO_BUILD_PROFILING, 1, [hack to make ROMIO build without profiling])
|
AC_DEFINE(MPIO_BUILD_PROFILING, 1, [hack to make ROMIO build without profiling])
|
||||||
DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST"
|
DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST 1"
|
||||||
|
DEFINE_HAVE_MPI_GREQUEST_EXTENSIONS="#undef HAVE_MPI_GREQUEST_EXTENSIONS"
|
||||||
AC_DEFINE(HAVE_DECL_MPI_COMBINER_HINDEXED_BLOCK, 1, [Define if MPI library provides HINDEXED_BLOCK datatype])
|
AC_DEFINE(HAVE_DECL_MPI_COMBINER_HINDEXED_BLOCK, 1, [Define if MPI library provides HINDEXED_BLOCK datatype])
|
||||||
|
AC_DEFINE(HAVE_MPIIO_CONST, 1, Set if MPI-IO prototypes use const qualifier)
|
||||||
elif test $FROM_LAM = yes ; then
|
elif test $FROM_LAM = yes ; then
|
||||||
# LAM does have the status set bytes functionality
|
# LAM does have the status set bytes functionality
|
||||||
AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if have MPIR_Status_set_bytes])
|
AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if have MPIR_Status_set_bytes])
|
||||||
@ -1607,7 +1671,7 @@ elif test $FROM_MPICH = yes ; then
|
|||||||
DEFINE_HAVE_MPI_GREQUEST_EXTENSIONS="#define HAVE_MPI_GREQUEST_EXTENSIONS 1"
|
DEFINE_HAVE_MPI_GREQUEST_EXTENSIONS="#define HAVE_MPI_GREQUEST_EXTENSIONS 1"
|
||||||
AC_DEFINE(HAVE_MPIU_FUNCS,1,[Define if MPICH memory tracing macros defined])
|
AC_DEFINE(HAVE_MPIU_FUNCS,1,[Define if MPICH memory tracing macros defined])
|
||||||
AC_DEFINE(HAVE_MPIX_H, 1, [])
|
AC_DEFINE(HAVE_MPIX_H, 1, [])
|
||||||
AC_DEFINE(HAVE_MPIIO_CONST, const, Set if MPI-IO prototypes use const qualifier)
|
AC_DEFINE(HAVE_MPIIO_CONST, 1, Set if MPI-IO prototypes use const qualifier)
|
||||||
AC_DEFINE(HAVE_MPI_TYPE_SIZE_X, 1, [Define if MPI library provides MPI_TYPE_SIZE_X])
|
AC_DEFINE(HAVE_MPI_TYPE_SIZE_X, 1, [Define if MPI library provides MPI_TYPE_SIZE_X])
|
||||||
AC_DEFINE(HAVE_MPI_STATUS_SET_ELEMENTS_X, 1, [Define if MPI library provides MPI_STATUS_SET_ELEMENTS_X])
|
AC_DEFINE(HAVE_MPI_STATUS_SET_ELEMENTS_X, 1, [Define if MPI library provides MPI_STATUS_SET_ELEMENTS_X])
|
||||||
AC_DEFINE(HAVE_DECL_MPI_COMBINER_HINDEXED_BLOCK, 1, [Define if MPI library provides HINDEXED_BLOCK datatype])
|
AC_DEFINE(HAVE_DECL_MPI_COMBINER_HINDEXED_BLOCK, 1, [Define if MPI library provides HINDEXED_BLOCK datatype])
|
||||||
@ -1743,9 +1807,22 @@ AC_CHECK_HEADERS(unistd.h,
|
|||||||
echo "setting SYSDEP_INC to $SYSDEP_INC"
|
echo "setting SYSDEP_INC to $SYSDEP_INC"
|
||||||
AC_SUBST(SYSDEP_INC)
|
AC_SUBST(SYSDEP_INC)
|
||||||
|
|
||||||
|
# Open MPI: use the exact same restrict test that we use in the
|
||||||
|
# upper-level Open MPI configure script so that we always get the same
|
||||||
|
# #define for "restrict" (there are a small number of files that will
|
||||||
|
# end up including both ROMIO's romioconf.h and opal_config.h, so we
|
||||||
|
# need to #defines to agree).
|
||||||
AC_C_RESTRICT
|
AC_C_RESTRICT
|
||||||
PAC_C_GNU_ATTRIBUTE
|
PAC_C_GNU_ATTRIBUTE
|
||||||
|
|
||||||
|
# Open MPI: we need libtool
|
||||||
|
AM_PROG_LIBTOOL
|
||||||
|
|
||||||
|
# Open MPI: setup the AM_CONDITIONALs to build the different adio devices
|
||||||
|
m4_foreach([my_fs],
|
||||||
|
[gpfs, gridftp, hfs, lustre, nfs, ntfs, panfs, pfs, pvfs, piofs, pvfs, pvfs2, sfs, testfs, ufs, xfs, zoidfs],
|
||||||
|
[AM_CONDITIONAL(BUILD_[]AS_TR_CPP(my_fs), [test -n "$file_system_]my_fs["])])
|
||||||
|
|
||||||
# support gcov test coverage information
|
# support gcov test coverage information
|
||||||
PAC_ENABLE_COVERAGE
|
PAC_ENABLE_COVERAGE
|
||||||
|
|
||||||
@ -1757,23 +1834,29 @@ echo "setting CFLAGS to $CFLAGS"
|
|||||||
echo "setting USER_CFLAGS to $USER_CFLAGS"
|
echo "setting USER_CFLAGS to $USER_CFLAGS"
|
||||||
echo "setting USER_FFLAGS to $USER_FFLAGS"
|
echo "setting USER_FFLAGS to $USER_FFLAGS"
|
||||||
|
|
||||||
|
# Open MPI: Add on CFLAGS that we figured out up top. They have
|
||||||
|
# makefile macros in them, so we couldn't substitute them until now.
|
||||||
|
CFLAGS="$CFLAGS $OMPI_CFLAGS "'-I$(top_builddir)/include'
|
||||||
|
#
|
||||||
|
# Open MPI - AM doesn't want the following:
|
||||||
|
# VPATH, CC, CPPFLAGS, CFLAGS, AR, RANLIB, F77, MAKE
|
||||||
AC_SUBST(ARCH)
|
AC_SUBST(ARCH)
|
||||||
AC_SUBST(FILE_SYSTEM)
|
AC_SUBST(FILE_SYSTEM)
|
||||||
AC_SUBST(CC)
|
#AC_SUBST(CC)
|
||||||
AC_SUBST(CPPFLAGS)
|
#AC_SUBST(CPPFLAGS)
|
||||||
AC_SUBST(CFLAGS)
|
#AC_SUBST(CFLAGS)
|
||||||
AC_SUBST(USER_CFLAGS)
|
AC_SUBST(USER_CFLAGS)
|
||||||
AC_SUBST(USER_FFLAGS)
|
AC_SUBST(USER_FFLAGS)
|
||||||
AC_SUBST(MIPS)
|
AC_SUBST(MIPS)
|
||||||
AC_SUBST(BITS)
|
AC_SUBST(BITS)
|
||||||
AC_SUBST(AR)
|
#AC_SUBST(AR)
|
||||||
AC_SUBST(AR_FLAGS)
|
AC_SUBST(AR_FLAGS)
|
||||||
AC_SUBST(MPI_INCLUDE_DIR)
|
AC_SUBST(MPI_INCLUDE_DIR)
|
||||||
AC_SUBST(MPI_LIB)
|
AC_SUBST(MPI_LIB)
|
||||||
AC_SUBST(F77)
|
#AC_SUBST(F77)
|
||||||
AC_SUBST(NOF77)
|
AC_SUBST(NOF77)
|
||||||
AC_SUBST(NOPROFILE)
|
AC_SUBST(NOPROFILE)
|
||||||
AC_SUBST(MAKE)
|
#AC_SUBST(MAKE)
|
||||||
AC_SUBST(arch_IRIX)
|
AC_SUBST(arch_IRIX)
|
||||||
AC_SUBST(ROMIO_HOME)
|
AC_SUBST(ROMIO_HOME)
|
||||||
AC_SUBST(LIBNAME)
|
AC_SUBST(LIBNAME)
|
||||||
@ -1817,24 +1900,25 @@ AC_SUBST(ROMIO_TCPPFLAGS)
|
|||||||
AC_SUBST(ROMIO_TFFLAGS)
|
AC_SUBST(ROMIO_TFFLAGS)
|
||||||
AC_SUBST(MPIRUN)
|
AC_SUBST(MPIRUN)
|
||||||
AC_SUBST(FORTRAN_TEST)
|
AC_SUBST(FORTRAN_TEST)
|
||||||
dnl
|
#dnl
|
||||||
dnl Support shared libraries
|
#dnl Support shared libraries
|
||||||
if test -z "$ENABLE_SHLIB" ; then
|
#if test -z "$ENABLE_SHLIB" ; then
|
||||||
ENABLE_SHLIB=none
|
# ENABLE_SHLIB=none
|
||||||
fi
|
#fi
|
||||||
AC_SUBST(ENABLE_SHLIB)
|
#AC_SUBST(ENABLE_SHLIB)
|
||||||
AC_SUBST(CC_SHL)
|
#AC_SUBST(CC_SHL)
|
||||||
AC_SUBST(LIBTOOL)
|
#AC_SUBST(LIBTOOL)
|
||||||
|
# Open MPI: This is no longer necessary with modern versions of autotools
|
||||||
# Remove the .a from the library file name (so that we can use .so or
|
# Remove the .a from the library file name (so that we can use .so or
|
||||||
# other appropriate suffix)
|
# other appropriate suffix)
|
||||||
SHLIBNAME=`echo $LIBNAME | sed 's/\.a$//'`
|
#SHLIBNAME=`echo $LIBNAME | sed 's/\.a$//'`
|
||||||
AC_SUBST(SHLIBNAME)
|
#AC_SUBST(SHLIBNAME)
|
||||||
dnl
|
#dnl
|
||||||
if test ! -d adio ; then mkdir adio ; fi
|
#if test ! -d adio ; then mkdir adio ; fi
|
||||||
if test ! -d adio/include ; then mkdir adio/include ; fi
|
#if test ! -d adio/include ; then mkdir adio/include ; fi
|
||||||
if test ! -d mpi2-other ; then mkdir mpi2-other ; fi
|
#if test ! -d mpi2-other ; then mkdir mpi2-other ; fi
|
||||||
if test ! -d mpi-io ; then mkdir mpi-io ; fi
|
#if test ! -d mpi-io ; then mkdir mpi-io ; fi
|
||||||
if test ! -d mpi-io/glue ; then mkdir mpi-io/glue ; fi
|
#if test ! -d mpi-io/glue ; then mkdir mpi-io/glue ; fi
|
||||||
|
|
||||||
# Create makefiles for all of the adio devices. Only the ones that
|
# Create makefiles for all of the adio devices. Only the ones that
|
||||||
# are active will be called by the top level ROMIO make
|
# are active will be called by the top level ROMIO make
|
||||||
@ -1842,8 +1926,6 @@ AC_OUTPUT_COMMANDS([chmod 755 util/romioinstall test/runtests])
|
|||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile
|
Makefile
|
||||||
localdefs
|
localdefs
|
||||||
mpi2-other/info/Makefile
|
|
||||||
mpi2-other/array/Makefile
|
|
||||||
test/Makefile
|
test/Makefile
|
||||||
test/misc.c
|
test/misc.c
|
||||||
test/large_file.c
|
test/large_file.c
|
||||||
@ -1851,14 +1933,17 @@ AC_CONFIG_FILES([
|
|||||||
test-internal/Makefile
|
test-internal/Makefile
|
||||||
util/romioinstall
|
util/romioinstall
|
||||||
include/mpio.h
|
include/mpio.h
|
||||||
include/mpiof.h
|
|
||||||
mpi2-other/info/fortran/Makefile
|
|
||||||
mpi2-other/array/fortran/Makefile
|
|
||||||
test/fmisc.f
|
test/fmisc.f
|
||||||
test/fcoll_test.f
|
test/fcoll_test.f
|
||||||
test/pfcoll_test.f
|
test/pfcoll_test.f
|
||||||
test/fperf.f
|
test/fperf.f
|
||||||
])
|
])
|
||||||
|
# Open MPI: intentionally skip the following:
|
||||||
|
# mpi2-other/info/Makefile
|
||||||
|
# mpi2-other/array/Makefile
|
||||||
|
# mpi2-other/info/fortran/Makefile
|
||||||
|
# mpi2-other/array/fortran/Makefile
|
||||||
|
# include/mpiof.h
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
dnl PAC_SUBDIR_CACHE_CLEANUP
|
dnl PAC_SUBDIR_CACHE_CLEANUP
|
||||||
|
|||||||
@ -807,13 +807,19 @@ to include the file {\tt mpio.h} for C or {\tt mpiof.h} for Fortran in
|
|||||||
your MPI-IO program.
|
your MPI-IO program.
|
||||||
|
|
||||||
Note that on HP machines running HPUX and on NEC SX-4, you need to
|
Note that on HP machines running HPUX and on NEC SX-4, you need to
|
||||||
compile Fortran programs with {\tt mpifort}.
|
compile Fortran programs with {\tt mpifort}, because {\tt mpif77} does
|
||||||
|
not support 8-byte integers.
|
||||||
|
|
||||||
With MPICH, HP MPI, or NEC MPI, you can compile MPI-IO programs as \\
|
With MPICH, HP MPI, or NEC MPI, you can compile MPI-IO programs as \\
|
||||||
\hspace*{.4in} {\tt mpicc foo.c}\\
|
\hspace*{.4in} {\tt mpicc foo.c}\\
|
||||||
or \\
|
or \\
|
||||||
|
\hspace*{.4in} {\tt mpif77 foo.f }\\
|
||||||
|
or\\
|
||||||
\hspace*{.4in} {\tt mpifort foo.f}\\
|
\hspace*{.4in} {\tt mpifort foo.f}\\
|
||||||
|
|
||||||
|
As mentioned above, mpifort is preferred over mpif77 on HPUX and NEC
|
||||||
|
because the f77 compilers on those machines do not support 8-byte integers.
|
||||||
|
|
||||||
With SGI MPI, you can compile MPI-IO programs as \\
|
With SGI MPI, you can compile MPI-IO programs as \\
|
||||||
\hspace*{.4in} {\tt cc foo.c -lmpi}\\
|
\hspace*{.4in} {\tt cc foo.c -lmpi}\\
|
||||||
or \\
|
or \\
|
||||||
@ -863,7 +869,8 @@ file systems because they don't support {\tt fcntl} file locks,
|
|||||||
and ROMIO uses that feature to implement shared file pointers.
|
and ROMIO uses that feature to implement shared file pointers.
|
||||||
|
|
||||||
\item On HP machines running HPUX and on NEC SX-4, you need to compile
|
\item On HP machines running HPUX and on NEC SX-4, you need to compile
|
||||||
Fortran programs with {\tt mpifort}.
|
Fortran programs with {\tt mpifort} instead of {\tt mpif77}, because
|
||||||
|
the {\tt f77} compilers on these machines don't support 8-byte integers.
|
||||||
|
|
||||||
\item The file-open mode {\tt MPI\_MODE\_EXCL} does not work on Intel
|
\item The file-open mode {\tt MPI\_MODE\_EXCL} does not work on Intel
|
||||||
PFS file system, due to a bug in PFS.
|
PFS file system, due to a bug in PFS.
|
||||||
|
|||||||
124
ompi/mca/io/romio314/romio/include/io_romio_conv.h
Обычный файл
124
ompi/mca/io/romio314/romio/include/io_romio_conv.h
Обычный файл
@ -0,0 +1,124 @@
|
|||||||
|
/*
|
||||||
|
* 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 MCA_IO_ROMIO_CONV_H
|
||||||
|
#define MCA_IO_ROMIO_CONV_H
|
||||||
|
|
||||||
|
/* Prefix that we add to all ROMIO symbols */
|
||||||
|
#ifdef ROMIO_PREFIX
|
||||||
|
#undef ROMIO_PREFIX
|
||||||
|
#endif
|
||||||
|
#define ROMIO_PREFIX(foo) mca_io_romio_dist_##foo
|
||||||
|
|
||||||
|
/* Section 9.2 */
|
||||||
|
/* Begin Prototypes */
|
||||||
|
#define MPI_File_open ROMIO_PREFIX(MPI_File_open)
|
||||||
|
#define MPI_File_close ROMIO_PREFIX(MPI_File_close)
|
||||||
|
#define MPI_File_delete ROMIO_PREFIX(MPI_File_delete)
|
||||||
|
#define MPI_File_set_size ROMIO_PREFIX(MPI_File_set_size)
|
||||||
|
#define MPI_File_preallocate ROMIO_PREFIX(MPI_File_preallocate)
|
||||||
|
#define MPI_File_get_size ROMIO_PREFIX(MPI_File_get_size)
|
||||||
|
#define MPI_File_get_group ROMIO_PREFIX(MPI_File_get_group)
|
||||||
|
#define MPI_File_get_amode ROMIO_PREFIX(MPI_File_get_amode)
|
||||||
|
#define MPI_File_set_info ROMIO_PREFIX(MPI_File_set_info)
|
||||||
|
#define MPI_File_get_info ROMIO_PREFIX(MPI_File_get_info)
|
||||||
|
|
||||||
|
/* Section 9.3 */
|
||||||
|
#define MPI_File_set_view ROMIO_PREFIX(MPI_File_set_view)
|
||||||
|
#define MPI_File_get_view ROMIO_PREFIX(MPI_File_get_view)
|
||||||
|
|
||||||
|
/* Section 9.4.2 */
|
||||||
|
#define MPI_File_read_at ROMIO_PREFIX(MPI_File_read_at)
|
||||||
|
#define MPI_File_read_at_all ROMIO_PREFIX(MPI_File_read_at_all)
|
||||||
|
#define MPI_File_write_at ROMIO_PREFIX(MPI_File_write_at)
|
||||||
|
#define MPI_File_write_at_all ROMIO_PREFIX(MPI_File_write_at_all)
|
||||||
|
#define MPI_File_iread_at ROMIO_PREFIX(MPI_File_iread_at)
|
||||||
|
#define MPI_File_iwrite_at ROMIO_PREFIX(MPI_File_iwrite_at)
|
||||||
|
|
||||||
|
/* Section 9.4.3 */
|
||||||
|
#define MPI_File_read ROMIO_PREFIX(MPI_File_read)
|
||||||
|
#define MPI_File_read_all ROMIO_PREFIX(MPI_File_read_all)
|
||||||
|
#define MPI_File_write ROMIO_PREFIX(MPI_File_write)
|
||||||
|
#define MPI_File_write_all ROMIO_PREFIX(MPI_File_write_all)
|
||||||
|
|
||||||
|
#define MPI_File_iread ROMIO_PREFIX(MPI_File_iread)
|
||||||
|
#define MPI_File_iwrite ROMIO_PREFIX(MPI_File_iwrite)
|
||||||
|
|
||||||
|
#define MPI_File_seek ROMIO_PREFIX(MPI_File_seek)
|
||||||
|
#define MPI_File_get_position ROMIO_PREFIX(MPI_File_get_position)
|
||||||
|
#define MPI_File_get_byte_offset ROMIO_PREFIX(MPI_File_get_byte_offset)
|
||||||
|
|
||||||
|
/* Section 9.4.4 */
|
||||||
|
#define MPI_File_read_shared ROMIO_PREFIX(MPI_File_read_shared)
|
||||||
|
#define MPI_File_write_shared ROMIO_PREFIX(MPI_File_write_shared)
|
||||||
|
#define MPI_File_iread_shared ROMIO_PREFIX(MPI_File_iread_shared)
|
||||||
|
#define MPI_File_iwrite_shared ROMIO_PREFIX(MPI_File_iwrite_shared)
|
||||||
|
#define MPI_File_read_ordered ROMIO_PREFIX(MPI_File_read_ordered)
|
||||||
|
#define MPI_File_write_ordered ROMIO_PREFIX(MPI_File_write_ordered)
|
||||||
|
#define MPI_File_seek_shared ROMIO_PREFIX(MPI_File_seek_shared)
|
||||||
|
#define MPI_File_get_position_shared ROMIO_PREFIX(MPI_File_get_position_shared)
|
||||||
|
|
||||||
|
/* Section 9.4.5 */
|
||||||
|
#define MPI_File_read_at_all_begin ROMIO_PREFIX(MPI_File_read_at_all_begin)
|
||||||
|
#define MPI_File_read_at_all_end ROMIO_PREFIX(MPI_File_read_at_all_end)
|
||||||
|
#define MPI_File_write_at_all_begin ROMIO_PREFIX(MPI_File_write_at_all_begin)
|
||||||
|
#define MPI_File_write_at_all_end ROMIO_PREFIX(MPI_File_write_at_all_end)
|
||||||
|
#define MPI_File_read_all_begin ROMIO_PREFIX(MPI_File_read_all_begin)
|
||||||
|
#define MPI_File_read_all_end ROMIO_PREFIX(MPI_File_read_all_end)
|
||||||
|
#define MPI_File_write_all_begin ROMIO_PREFIX(MPI_File_write_all_begin)
|
||||||
|
#define MPI_File_write_all_end ROMIO_PREFIX(MPI_File_write_all_end)
|
||||||
|
#define MPI_File_read_ordered_begin ROMIO_PREFIX(MPI_File_read_ordered_begin)
|
||||||
|
#define MPI_File_read_ordered_end ROMIO_PREFIX(MPI_File_read_ordered_end)
|
||||||
|
#define MPI_File_write_ordered_begin ROMIO_PREFIX(MPI_File_write_ordered_begin)
|
||||||
|
#define MPI_File_write_ordered_end ROMIO_PREFIX(MPI_File_write_ordered_end)
|
||||||
|
|
||||||
|
/* Section 9.5.1 */
|
||||||
|
#define MPI_File_get_type_extent ROMIO_PREFIX(MPI_File_get_type_extent)
|
||||||
|
|
||||||
|
/* Section 9.6.1 */
|
||||||
|
#define MPI_File_set_atomicity ROMIO_PREFIX(MPI_File_set_atomicity)
|
||||||
|
#define MPI_File_get_atomicity ROMIO_PREFIX(MPI_File_get_atomicity)
|
||||||
|
#define MPI_File_sync ROMIO_PREFIX(MPI_File_sync)
|
||||||
|
|
||||||
|
/* Section 4.13.3 */
|
||||||
|
#define MPI_File_set_errhandler ROMIO_PREFIX(MPI_File_set_errhandler)
|
||||||
|
#define MPI_File_get_errhandler ROMIO_PREFIX(MPI_File_get_errhandler)
|
||||||
|
/* End Prototypes */
|
||||||
|
|
||||||
|
#define MPI_Register_datarep ROMIO_PREFIX(MPI_Register_datarep)
|
||||||
|
|
||||||
|
/* JMS these don't seem to work... */
|
||||||
|
#define MPI_File_f2c ROMIO_PREFIX(MPI_File_f2c)
|
||||||
|
#define MPI_File_c2f ROMIO_PREFIX(MPI_File_c2f)
|
||||||
|
|
||||||
|
#define MPIO_Request_c2f ROMIO_PREFIX(MPIO_Request_c2f)
|
||||||
|
#define MPIO_Request_f2c ROMIO_PREFIX(MPIO_Request_f2c)
|
||||||
|
|
||||||
|
/* Conversion of MPI_File and MPIO_Request */
|
||||||
|
#define MPI_File ROMIO_PREFIX(MPI_File)
|
||||||
|
|
||||||
|
/* Open MPI's mpi.h #define's MPI_FILE_NULL, so we need to undef it
|
||||||
|
here and allow it to be re-assigned to whatever ROMIO wants */
|
||||||
|
#undef MPI_FILE_NULL
|
||||||
|
|
||||||
|
/* Let's not use MPIR_Status_set_bytes */
|
||||||
|
#ifndef MPIR_Status_set_bytes
|
||||||
|
#define MPIR_Status_set_bytes ROMIO_PREFIX(MPIR_Status_set_bytes)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* MCA_IO_ROMIO_CONV_H */
|
||||||
@ -11,6 +11,16 @@
|
|||||||
#define MPIO_INCLUDE
|
#define MPIO_INCLUDE
|
||||||
|
|
||||||
#include "mpi.h"
|
#include "mpi.h"
|
||||||
|
/* Open MPI: We need to rename almost all of these functions, as well
|
||||||
|
a the types to be names that conform to the prefix rule */
|
||||||
|
#include "io_romio_conv.h"
|
||||||
|
|
||||||
|
#define MPIIMPL_HAVE_MPI_COMBINER_DARRAY 1
|
||||||
|
#define MPIIMPL_HAVE_MPI_TYPE_CREATE_DARRAY 1
|
||||||
|
#define MPIIMPL_HAVE_MPI_COMBINER_SUBARRAY 1
|
||||||
|
#define MPIIMPL_HAVE_MPI_TYPE_CREATE_DARRAY 1
|
||||||
|
#define MPIIMPL_HAVE_MPI_COMBINER_DUP 1
|
||||||
|
#define MPICH_ATTR_POINTER_WITH_TYPE_TAG(x,y)
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
#if defined(__cplusplus)
|
||||||
extern "C" {
|
extern "C" {
|
||||||
@ -265,9 +275,12 @@ int MPI_Type_create_darray(int size, int rank, int ndims, const int array_of_gsi
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
/* above needed for some versions of mpi.h in MPICH!! */
|
/* above needed for some versions of mpi.h in MPICH!! */
|
||||||
|
/* Open MPI: I can't seem to make these #define properly. Oh well --
|
||||||
|
we don't need them anyway :-( */
|
||||||
|
#if 0
|
||||||
MPI_File MPI_File_f2c(MPI_Fint file);
|
MPI_File MPI_File_f2c(MPI_Fint file);
|
||||||
MPI_Fint MPI_File_c2f(MPI_File file);
|
MPI_Fint MPI_File_c2f(MPI_File file);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef HAVE_MPI_GREQUEST
|
#ifndef HAVE_MPI_GREQUEST
|
||||||
/* The following functions are required if generalized requests are not
|
/* The following functions are required if generalized requests are not
|
||||||
@ -315,15 +328,21 @@ int MPI_Info_free(MPI_Info *info);
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
/* above needed for some versions of mpi.h in MPICH!! */
|
/* above needed for some versions of mpi.h in MPICH!! */
|
||||||
|
/* Open MPI: we don't need these in ROMIO */
|
||||||
|
#if 0
|
||||||
MPI_Fint MPI_Info_c2f(MPI_Info info);
|
MPI_Fint MPI_Info_c2f(MPI_Info info);
|
||||||
MPI_Info MPI_Info_f2c(MPI_Fint info);
|
MPI_Info MPI_Info_f2c(MPI_Fint info);
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* HAVE_PRAGMA_HP_SEC_DEF */
|
#endif /* HAVE_PRAGMA_HP_SEC_DEF */
|
||||||
|
|
||||||
|
|
||||||
/**************** BINDINGS FOR THE PROFILING INTERFACE ***************/
|
/**************** BINDINGS FOR THE PROFILING INTERFACE ***************/
|
||||||
|
|
||||||
|
/* Open MPI: We don't want any of the profiling layer */
|
||||||
|
#if 0
|
||||||
|
|
||||||
|
|
||||||
/* Section 9.2 */
|
/* Section 9.2 */
|
||||||
int PMPI_File_open(MPI_Comm, const char *, int, MPI_Info, MPI_File *);
|
int PMPI_File_open(MPI_Comm, const char *, int, MPI_Info, MPI_File *);
|
||||||
@ -500,6 +519,8 @@ MPI_Fint PMPI_Info_c2f(MPI_Info);
|
|||||||
MPI_Info PMPI_Info_f2c(MPI_Fint);
|
MPI_Info PMPI_Info_f2c(MPI_Fint);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* Open MPI: We don't want any of the profiling layer */
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
#if defined(__cplusplus)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,7 +1,4 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
LIBS="@LIBS@"
|
||||||
# Append ROMIO library dependencies to the global list
|
|
||||||
EXTERNAL_LIBS="$EXTERNAL_LIBS @LIBS@"
|
|
||||||
|
|
||||||
MPI_OFFSET_TYPE="@MPI_OFFSET_TYPE@"
|
MPI_OFFSET_TYPE="@MPI_OFFSET_TYPE@"
|
||||||
FORTRAN_MPI_OFFSET="@FORTRAN_MPI_OFFSET@"
|
FORTRAN_MPI_OFFSET="@FORTRAN_MPI_OFFSET@"
|
||||||
|
|||||||
@ -14,8 +14,6 @@ noinst_HEADERS += mpi-io/mpioimpl.h mpi-io/mpioprof.h
|
|||||||
romio_mpi_sources += \
|
romio_mpi_sources += \
|
||||||
mpi-io/close.c \
|
mpi-io/close.c \
|
||||||
mpi-io/delete.c \
|
mpi-io/delete.c \
|
||||||
mpi-io/file_c2f.c \
|
|
||||||
mpi-io/file_f2c.c \
|
|
||||||
mpi-io/fsync.c \
|
mpi-io/fsync.c \
|
||||||
mpi-io/get_amode.c \
|
mpi-io/get_amode.c \
|
||||||
mpi-io/get_atom.c \
|
mpi-io/get_atom.c \
|
||||||
|
|||||||
@ -76,8 +76,13 @@ int MPI_File_close(MPI_File *fh)
|
|||||||
* somehow inform the MPI library that we no longer hold a reference to any
|
* somehow inform the MPI library that we no longer hold a reference to any
|
||||||
* user defined error handler. We do this by setting the errhandler at this
|
* user defined error handler. We do this by setting the errhandler at this
|
||||||
* point to MPI_ERRORS_RETURN. */
|
* point to MPI_ERRORS_RETURN. */
|
||||||
|
/* Open MPI: The call to PMPI_File_set_errhandler has to be done in romio/src/io_romio_file_open.c
|
||||||
|
in routine mca_io_romio_file_close()
|
||||||
|
*/
|
||||||
|
#if 0
|
||||||
error_code = PMPI_File_set_errhandler(*fh, MPI_ERRORS_RETURN);
|
error_code = PMPI_File_set_errhandler(*fh, MPI_ERRORS_RETURN);
|
||||||
if (error_code != MPI_SUCCESS) goto fn_fail;
|
if (error_code != MPI_SUCCESS) goto fn_fail;
|
||||||
|
#endif
|
||||||
|
|
||||||
ADIO_Close(adio_fh, &error_code);
|
ADIO_Close(adio_fh, &error_code);
|
||||||
MPIO_File_free(fh);
|
MPIO_File_free(fh);
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
include $(top_srcdir)/mpi-io/glue/default/Makefile.mk
|
include $(top_srcdir)/mpi-io/glue/default/Makefile.mk
|
||||||
include $(top_srcdir)/mpi-io/glue/mpich/Makefile.mk
|
include $(top_srcdir)/mpi-io/glue/mpich/Makefile.mk
|
||||||
|
include $(top_srcdir)/mpi-io/glue/openmpi/Makefile.mk
|
||||||
|
|
||||||
if !BUILD_ROMIO_EMBEDDED
|
if !BUILD_ROMIO_EMBEDDED
|
||||||
romio_other_sources += \
|
romio_other_sources += \
|
||||||
|
|||||||
@ -10,6 +10,15 @@
|
|||||||
building the profiling interface
|
building the profiling interface
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Open MPI: Unfortunately, ROMIO doesn't seem to be able to build
|
||||||
|
* without a profiling interface, but we don't want a profiling
|
||||||
|
* interface, since we are just using ROMIO "behind the scenes".
|
||||||
|
* So enable all the profiling defines, only compile once, and don't
|
||||||
|
* do all the name mangling. The effect is about the same, but without
|
||||||
|
* modification to all the files in the mpi-io directory.
|
||||||
|
*/
|
||||||
|
#if 0
|
||||||
#ifdef MPIO_BUILD_PROFILING
|
#ifdef MPIO_BUILD_PROFILING
|
||||||
|
|
||||||
#undef MPI_File_open
|
#undef MPI_File_open
|
||||||
@ -203,3 +212,4 @@
|
|||||||
#define MPIX_Grequest_class_create PMPIX_Grequest_class_create
|
#define MPIX_Grequest_class_create PMPIX_Grequest_class_create
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|||||||
Загрузка…
x
Ссылка в новой задаче
Block a user