romio341: patch ROMIO 3.4.1 for Open MPI

Signed-off-by: Gilles Gouaillardet <[email protected]>

Author: ggouaillardet

3rd-party/romio341/.config_params

@@ -36,3 +36,4 @@ __sgi_mpi
 __hp_mpi
 __cray_mpi
 __lam_mpi
+__open_mpi

3rd-party/romio341/Makefile.am

@@ -1,8 +1,29 @@
+## 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 (c) 2020      Research Organization for Information Science
+##                         and Technology (RIST).  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
 ##
 ## Copyright (C) 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 +38,6 @@ include_HEADERS =
 nodist_include_HEADERS =
 noinst_HEADERS = 
 AM_CFLAGS = @VISIBILITY_CFLAGS@
-AM_CPPFLAGS =
 EXTRA_DIST =
 SUFFIXES = 
 doc1_src_txt =
@@ -52,7 +72,9 @@ AM_CPPFLAGS += $(MPI_H_INCLUDE)
 # handle the "include" directory here
 AM_CPPFLAGS += -I$(top_builddir)/include -I$(top_srcdir)/include $(external_includes)
 # 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
 
 # ------------------------------------------------------------------------
 
@@ -69,8 +91,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
@@ -92,8 +114,8 @@ libpromio_la_CPPFLAGS = $(AM_CPPFLAGS) -DMPIO_BUILD_PROFILING
 libpromio_la_LDFLAGS = $(external_ldflags)
 libpromio_la_LIBADD = $(external_libs)
 else !BUILD_PROFILING_LIB
-libromio_la_LDFLAGS = $(external_ldflags)
-libromio_la_LIBADD = $(external_libs)
+libromio_dist_la_LDFLAGS = $(external_ldflags)
+libromio_dist_la_LIBADD = $(external_libs)
 endif !BUILD_PROFILING_LIB
 
 else !BUILD_ROMIO_EMBEDDED

3rd-party/romio341/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

3rd-party/romio341/adio/Makefile.mk

@@ -13,12 +13,14 @@ noinst_HEADERS +=                      \
     adio/include/adioi_errmsg.h        \
     adio/include/adioi_error.h         \
     adio/include/adioi_fs_proto.h      \
+    adio/include/ad_tuning.h           \
     adio/include/heap_sort.h           \
     adio/include/lock_internal.h       \
     adio/include/mpio_error.h          \
     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
 

3rd-party/romio341/adio/ad_lustre/ad_lustre.h

@@ -9,6 +9,12 @@
 /* temp*/
 #define HAVE_ASM_TYPES_H 1
 
+#define _GNU_SOURCE 1
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include <unistd.h>
 #include <linux/types.h>
 

3rd-party/romio341/adio/ad_lustre/ad_lustre_rwcontig.c

@@ -3,11 +3,12 @@
  *     See COPYRIGHT in top-level directory
  */
 
+#include "ad_lustre.h"
+
 #include <unistd.h>
 
 #include <stdlib.h>
 #include <malloc.h>
-#include "ad_lustre.h"
 
 #define LUSTRE_MEMALIGN (1<<12) /* to use page_shift */
 

3rd-party/romio341/adio/common/ad_end.c

@@ -14,7 +14,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
 
 /* free file and info tables used for Fortran interface */
     if (ADIOI_Ftable)

3rd-party/romio341/adio/common/ad_iread_coll.c

@@ -15,6 +15,8 @@
 #include "mpe.h"
 #endif
 
+#ifdef HAVE_MPI_GREQUEST_EXTENSIONS
+
 /* ADIOI_GEN_IreadStridedColl */
 struct ADIOI_GEN_IreadStridedColl_vars {
     /* requests */
@@ -1299,3 +1301,5 @@ static int ADIOI_GEN_irc_wait_fn(int count, void **array_of_states,
   fn_exit:
     return errcode;
 }
+
+#endif /* HAVE_MPI_GREQUEST_EXTENSIONS */

3rd-party/romio341/adio/common/ad_iwrite_coll.c

@@ -12,6 +12,8 @@
 #include "mpe.h"
 #endif
 
+#ifdef HAVE_MPI_GREQUEST_EXTENSIONS
+
 /* ADIOI_GEN_IwriteStridedColl */
 struct ADIOI_GEN_IwriteStridedColl_vars {
     /* requests */
@@ -1496,3 +1498,5 @@ static int ADIOI_GEN_iwc_wait_fn(int count, void **array_of_states,
   fn_exit:
     return errcode;
 }
+
+#endif /* HAVE_MPI_GREQUEST_EXTENSIONS */

3rd-party/romio341/adio/include/adioi.h

@@ -444,16 +444,24 @@ 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