Skip to content

io/romio321: refresh ROMIO based on latest stable MPICH 3.2.1 #4520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 22, 2018
Merged

io/romio321: refresh ROMIO based on latest stable MPICH 3.2.1 #4520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4272b57
ROMIO 3.2.1 refresh: prepare new romio directory ompi/mca/io/romio321
ggouaillardet Mar 30, 2015
2f391a9
ROMIO 3.2.1 refresh: import romio from mpich 3.2.1 tarball
ggouaillardet Nov 20, 2017
2f0db19
ROMIO 3.2.1 refresh: patch mpich romio for OMPI
ggouaillardet Nov 21, 2017
bf23e84
ROMIO 3.2.1 refresh: remove old romio
ggouaillardet Jun 20, 2018
4355a67
ROMIO 3.2.1 refresh: add refresh notes
ggouaillardet Nov 20, 2017
c29301d
io/romio321: fix minmax datatypes
ggouaillardet Jun 20, 2018
e5460dc
io/romio: do not use removed functions
ggouaillardet Jun 20, 2018
ad8c490
io/romio321: fix two more MPI-3 compliance issues
ggouaillardet Jun 20, 2018
11428e4
Replace MPI_Address with MPI_Get_address in ROMIO.
ggouaillardet Jun 20, 2018
9d7f0e1
Replace MPI_Type_extent with MPI_Type_get_extent in ROMIO.
ggouaillardet Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
58 changes: 0 additions & 58 deletions ompi/mca/io/romio314/REFRESH_NOTES.txt
View file
Open in desktop

This file was deleted.

Binary file removed ompi/mca/io/romio314/romio/doc/users-guide.pdf
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions ompi/mca/io/romio314/romio/localdefs.in
View file
Open in desktop

This file was deleted.

0 ompi/mca/io/romio314/.gitignore → ompi/mca/io/romio321/.gitignore
View file
Open in desktop
File renamed without changes.
27 changes: 14 additions & 13 deletions ompi/mca/io/romio314/Makefile.am → ompi/mca/io/romio321/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
# All rights reserved.
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 IBM Corporation. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -23,7 +25,7 @@ EXTRA_DIST = autogen.subdirs
sources =
include src/Makefile.extra

if MCA_io_romio314_SHOULD_BUILD
if MCA_io_romio321_SHOULD_BUILD
# Need to set both SUBDIRS and DIST_SUBDIRS due to oddities with AM
SUBDIRS = romio
DIST_SUBDIRS = romio
Expand All @@ -33,13 +35,13 @@ endif
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# (for static builds).

if MCA_BUILD_ompi_io_romio314_DSO
if MCA_BUILD_ompi_io_romio321_DSO
lib =
lib_sources =
component = mca_io_romio314.la
component = mca_io_romio321.la
component_sources = $(sources)
else
lib = libmca_io_romio314.la
lib = libmca_io_romio321.la
lib_sources = $(sources)
component =
component_sources =
Expand All @@ -49,14 +51,13 @@ libs = romio/libromio_dist.la

mcacomponentdir = $(ompilibdir)
mcacomponent_LTLIBRARIES = $(component)
mca_io_romio314_la_SOURCES = $(component_sources)
mca_io_romio314_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
$(libs)
mca_io_romio314_la_DEPENDENCIES = $(libs)
mca_io_romio314_la_LDFLAGS = -module -avoid-version
mca_io_romio321_la_SOURCES = $(component_sources)
mca_io_romio321_la_LIBADD = $(libs)
mca_io_romio321_la_DEPENDENCIES = $(libs)
mca_io_romio321_la_LDFLAGS = -module -avoid-version

noinst_LTLIBRARIES = $(lib)
libmca_io_romio314_la_SOURCES = $(lib_sources)
libmca_io_romio314_la_LIBADD = $(libs)
libmca_io_romio314_la_DEPENDENCIES = $(libs)
libmca_io_romio314_la_LDFLAGS = -module -avoid-version
libmca_io_romio321_la_SOURCES = $(lib_sources)
libmca_io_romio321_la_LIBADD = $(libs)
libmca_io_romio321_la_DEPENDENCIES = $(libs)
libmca_io_romio321_la_LDFLAGS = -module -avoid-version
39 changes: 39 additions & 0 deletions ompi/mca/io/romio321/REFRESH_NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
1. prepare new romio directory
cp -a <old romio> <new romio>
# cp -a ompi/mca/io/romio ompi/mca/io/romio321
rm -rf <new romio>/romio
# rm -rf ompi/mca/io/romio321/romio
git add <new romio>
# git add ompi/mca/io/romio321
# git commit

2. import new romio
cp -a <mpich dir>/src/mpi/romio <new romio>
# cp -a /.../mpich-3.2b1/src/mpi/romio ompi/mca/io/romio321
git add <new romio>
# git add ompi/mca/io/romio321
# git commit

3. patch romio
cd <new romio>
# cd ompi/mca/io/romio321
# git show 7a7968f02e2bad912426d1535119fb30d881b460 | patch -p5
# cd ../../../..
git add <new romio>
# git add ompi/mca/io/romio321
# git commit

4. prepare ompi to use new romio
vi <new romio>/Makefile.am <new romio>/configure.m4 <new romio>/src/Makefile.extra
# vi ompi/mca/io/romio321/Makefile.am ompi/mca/io/romio321/configure.m4 ompi/mca/io/romio321/src/Makefile.extra
git add <new romio>
# git add ompi/mca/io/romio321
# git commit


5. remove old romio
git rm -r <old romio>
# git rm -r ompi/mca/io/romio
# git commit
rm -rf <old romio>
# rm -rf ompi/mca/io/romio
0 ompi/mca/io/romio314/autogen.subdirs → ompi/mca/io/romio321/autogen.subdirs
View file
Open in desktop
File renamed without changes.
64 changes: 32 additions & 32 deletions ompi/mca/io/romio314/configure.m4 → ompi/mca/io/romio321/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2015 Research Organization for Information Science
# Copyright (c) 2015-2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
Expand All @@ -20,24 +20,24 @@
# $HEADER$
#

AC_DEFUN([MCA_ompi_io_romio314_POST_CONFIG], [
AM_CONDITIONAL([MCA_io_romio314_SHOULD_BUILD], [test $1 -eq 1])
AC_DEFUN([MCA_ompi_io_romio321_POST_CONFIG], [
AM_CONDITIONAL([MCA_io_romio321_SHOULD_BUILD], [test $1 -eq 1])
])


# MCA_io_romio314_CONFIG([action-if-found], [action-if-not-found])
# MCA_io_romio321_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
AC_DEFUN([MCA_ompi_io_romio314_CONFIG],[
AC_CONFIG_FILES([ompi/mca/io/romio314/Makefile])
AC_DEFUN([MCA_ompi_io_romio321_CONFIG],[
AC_CONFIG_FILES([ompi/mca/io/romio321/Makefile])

OPAL_VAR_SCOPE_PUSH([io_romio314_flags io_romio314_flags_define io_romio314_happy io_romio314_save_LIBS])
OPAL_VAR_SCOPE_PUSH([io_romio321_flags io_romio321_flags_define io_romio321_happy io_romio321_save_LIBS])
AC_ARG_ENABLE([io-romio],
[AC_HELP_STRING([--disable-io-romio],
[Disable the ROMIO MPI-IO component])])
AC_ARG_WITH([io-romio-flags],
[AC_HELP_STRING([--with-io-romio-flags=FLAGS],
[Pass FLAGS to the ROMIO distribution configuration script])])
AC_DEFINE_UNQUOTED([MCA_io_romio314_USER_CONFIGURE_FLAGS], ["$with_io_romio_flags"], [Set of user-defined configure flags given to ROMIOs configure script via --with-io-romio-flags])
AC_DEFINE_UNQUOTED([MCA_io_romio321_USER_CONFIGURE_FLAGS], ["$with_io_romio_flags"], [Set of user-defined configure flags given to ROMIOs configure script via --with-io-romio-flags])
AC_MSG_CHECKING([if want ROMIO component])
AS_IF([test "$enable_io_romio" = "no"],
[AC_MSG_RESULT([no])
Expand All @@ -53,50 +53,50 @@ AC_DEFUN([MCA_ompi_io_romio314_CONFIG],[
[AC_MSG_RESULT([yes])

AS_IF([test -n "$with_io_romio_flags" && test "$with_io_romio_flags" != "no"],
[io_romio314_flags="$with_io_romio_flags $io_romio314_flags"],
[io_romio314_flags=])
[io_romio321_flags="$with_io_romio_flags $io_romio321_flags"],
[io_romio321_flags=])
# If ROMIO is going to end up in a DSO, all we need is
# shared library-ized objects, as we're only building a
# DSO (which is always shared). Otherwise, build with
# same flags as OMPI, as we might need any combination of
# shared and static-ized objects...
AS_IF([test "$compile_mode" = "dso"],
[io_romio314_shared=enable
io_romio314_static=disable],
[io_romio321_shared=enable
io_romio321_static=disable],
[AS_IF([test "$enable_shared" = "yes"],
[io_romio314_shared=enable],
[io_romio314_shared=disable])
[io_romio321_shared=enable],
[io_romio321_shared=disable])
AS_IF([test "$enable_static" = "yes"],
[io_romio314_static=enable],
[io_romio314_static=disable])])
[io_romio321_static=enable],
[io_romio321_static=disable])])
AS_IF([test -n "$prefix" && test "$prefix" != "NONE"],
[io_romio314_prefix_arg="--prefix=$prefix"],
[io_romio314_prefix_arg=])
[io_romio321_prefix_arg="--prefix=$prefix"],
[io_romio321_prefix_arg=])

AS_IF([test "$cross_compiling" = "yes"],
[AS_IF([test ! -z $build], [io_romio314_flags="$io_romio314_flags --build=$build"])
AS_IF([test ! -z $host], [io_romio314_flags="$io_romio314_flags --host=$host"])
AS_IF([test ! -z $target], [io_romio314_flags="$io_romio314_flags --target=$target"])])
io_romio314_flags_define="$io_romio314_flags FROM_OMPI=yes CC='$CC' CFLAGS='$CFLAGS -D__EXTENSIONS__' CPPFLAGS='$CPPFLAGS' FFLAGS='$FFLAGS' LDFLAGS='$LDFLAGS' --$io_romio314_shared-shared --$io_romio314_static-static $io_romio314_flags $io_romio314_prefix_arg --disable-aio --disable-weak-symbols --enable-strict --disable-f77 --disable-f90"
AC_DEFINE_UNQUOTED([MCA_io_romio314_COMPLETE_CONFIGURE_FLAGS], ["$io_romio314_flags_define"], [Complete set of command line arguments given to ROMIOs configure script])
[AS_IF([test ! -z $build], [io_romio321_flags="$io_romio321_flags --build=$build"])
AS_IF([test ! -z $host], [io_romio321_flags="$io_romio321_flags --host=$host"])
AS_IF([test ! -z $target], [io_romio321_flags="$io_romio321_flags --target=$target"])])
io_romio321_flags_define="$io_romio321_flags FROM_OMPI=yes CC='$CC' CFLAGS='$CFLAGS -D__EXTENSIONS__' CPPFLAGS='$CPPFLAGS' FFLAGS='$FFLAGS' LDFLAGS='$LDFLAGS' --$io_romio321_shared-shared --$io_romio321_static-static $io_romio321_flags $io_romio321_prefix_arg --disable-aio --disable-weak-symbols --enable-strict --disable-f77 --disable-f90"
AC_DEFINE_UNQUOTED([MCA_io_romio321_COMPLETE_CONFIGURE_FLAGS], ["$io_romio321_flags_define"], [Complete set of command line arguments given to ROMIOs configure script])

io_romio314_flags="$io_romio314_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio314_shared-shared --$io_romio314_static-static $io_romio314_flags $io_romio314_prefix_arg --disable-aio --disable-weak-symbols --enable-strict --disable-f77 --disable-f90"
io_romio321_flags="$io_romio321_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio321_shared-shared --$io_romio321_static-static $io_romio321_flags $io_romio321_prefix_arg --disable-aio --disable-weak-symbols --enable-strict --disable-f77 --disable-f90"

opal_show_subtitle "Configuring ROMIO distribution"
OPAL_CONFIG_SUBDIR([ompi/mca/io/romio314/romio],
[$io_romio314_flags],
[io_romio314_happy=1], [io_romio314_happy=0])
OPAL_CONFIG_SUBDIR([ompi/mca/io/romio321/romio],
[$io_romio321_flags],
[io_romio321_happy=1], [io_romio321_happy=0])

AS_IF([test "$io_romio314_happy" = "1"],
AS_IF([test "$io_romio321_happy" = "1"],
[ # grab the libraries list from ROMIO. We don't
# need this for building the component, as libtool
# will figure that part out. But we do need it for
# the wrapper settings
io_romio314_save_LIBS="$LIBS"
io_romio321_save_LIBS="$LIBS"
LIBS=
. ompi/mca/io/romio314/romio/localdefs
io_romio314_LIBS="$LIBS"
LIBS="$io_romio314_save_LIBS"
. ompi/mca/io/romio321/romio/localdefs
io_romio321_LIBS="$LIBS"
LIBS="$io_romio321_save_LIBS"

echo "ROMIO distribution configured successfully"
$1],
Expand Down
Loading