Skip to content

Commit 693a081

Browse files
ggouaillardetggouaillardet
committed
romio341: update Open MPI component (glue only)
Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent bb73962 commit 693a081

12 files changed

+561
-581
lines changed

‎3rd-party/autogen.subdirs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
romio321
1+
romio341

‎ompi/mca/io/romio321/src/io_romio321_module.c

Lines changed: 0 additions & 153 deletions
This file was deleted.

‎ompi/mca/io/romio321/Makefile.am renamed to ‎ompi/mca/io/romio341/Makefile.am

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# All rights reserved.
1212
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2017 IBM Corporation. All rights reserved.
14-
# Copyright (c) 2017 Research Organization for Information Science
15-
# and Technology (RIST). All rights reserved.
14+
# Copyright (c) 2017-2021 Research Organization for Information Science
15+
# and Technology (RIST). All rights reserved.
1616
# $COPYRIGHT$
1717
#
1818
# Additional copyrights may follow
@@ -27,29 +27,29 @@ include src/Makefile.extra
2727
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
2828
# (for static builds).
2929

30-
if MCA_BUILD_ompi_io_romio321_DSO
30+
if MCA_BUILD_ompi_io_romio341_DSO
3131
lib =
3232
lib_sources =
33-
component = mca_io_romio321.la
33+
component = mca_io_romio341.la
3434
component_sources = $(sources)
3535
else
36-
lib = libmca_io_romio321.la
36+
lib = libmca_io_romio341.la
3737
lib_sources = $(sources)
3838
component =
3939
component_sources =
4040
endif
4141

42-
libs = $(top_builddir)/3rd-party/romio321/libromio_dist.la
42+
libs = $(top_builddir)/3rd-party/romio341/libromio_dist.la
4343

4444
mcacomponentdir = $(ompilibdir)
4545
mcacomponent_LTLIBRARIES = $(component)
46-
mca_io_romio321_la_SOURCES = $(component_sources)
47-
mca_io_romio321_la_LIBADD = $(libs)
48-
mca_io_romio321_la_DEPENDENCIES = $(libs)
49-
mca_io_romio321_la_LDFLAGS = -module -avoid-version
46+
mca_io_romio341_la_SOURCES = $(component_sources)
47+
mca_io_romio341_la_LIBADD = $(libs)
48+
mca_io_romio341_la_DEPENDENCIES = $(libs)
49+
mca_io_romio341_la_LDFLAGS = -module -avoid-version
5050

5151
noinst_LTLIBRARIES = $(lib)
52-
libmca_io_romio321_la_SOURCES = $(lib_sources)
53-
libmca_io_romio321_la_LIBADD = $(libs)
54-
libmca_io_romio321_la_DEPENDENCIES = $(libs)
55-
libmca_io_romio321_la_LDFLAGS = -module -avoid-version
52+
libmca_io_romio341_la_SOURCES = $(lib_sources)
53+
libmca_io_romio341_la_LIBADD = $(libs)
54+
libmca_io_romio341_la_DEPENDENCIES = $(libs)
55+
libmca_io_romio341_la_LDFLAGS = -module -avoid-version

‎ompi/mca/io/romio321/configure.m4 renamed to ‎ompi/mca/io/romio341/configure.m4

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@
2020
# $HEADER$
2121
#
2222

23-
AC_DEFUN([MCA_ompi_io_romio321_POST_CONFIG], [
24-
AM_CONDITIONAL([MCA_io_romio321_SHOULD_BUILD], [test $1 -eq 1])
23+
AC_DEFUN([MCA_ompi_io_romio341_POST_CONFIG], [
24+
AM_CONDITIONAL([MCA_io_romio341_SHOULD_BUILD], [test $1 -eq 1])
2525
])
2626

2727

28-
# MCA_io_romio321_CONFIG([action-if-found], [action-if-not-found])
28+
# MCA_io_romio341_CONFIG([action-if-found], [action-if-not-found])
2929
# -----------------------------------------------------------
30-
AC_DEFUN([MCA_ompi_io_romio321_CONFIG],[
31-
AC_CONFIG_FILES([ompi/mca/io/romio321/Makefile])
30+
AC_DEFUN([MCA_ompi_io_romio341_CONFIG],[
31+
AC_CONFIG_FILES([ompi/mca/io/romio341/Makefile])
3232

33-
OPAL_VAR_SCOPE_PUSH([io_romio321_flags io_romio321_flags_define io_romio321_happy io_romio321_save_LIBS])
33+
OPAL_VAR_SCOPE_PUSH([io_romio341_flags io_romio341_flags_define io_romio341_happy io_romio341_save_LIBS])
3434
AC_ARG_ENABLE([io-romio],
3535
[AS_HELP_STRING([--disable-io-romio],
3636
[Disable the ROMIO MPI-IO component])])
3737
AC_ARG_WITH([io-romio-flags],
3838
[AS_HELP_STRING([--with-io-romio-flags=FLAGS],
3939
[Pass FLAGS to the ROMIO distribution configuration script])])
40-
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])
40+
AC_DEFINE_UNQUOTED([MCA_io_romio341_USER_CONFIGURE_FLAGS], ["$with_io_romio_flags"], [Set of user-defined configure flags given to ROMIOs configure script via --with-io-romio-flags])
4141
AC_MSG_CHECKING([if want ROMIO component])
4242
AS_IF([test "$enable_io_romio" = "no"],
4343
[AC_MSG_RESULT([no])
@@ -53,54 +53,54 @@ AC_DEFUN([MCA_ompi_io_romio321_CONFIG],[
5353
[AC_MSG_RESULT([yes])
5454

5555
AS_IF([test -n "$with_io_romio_flags" && test "$with_io_romio_flags" != "no"],
56-
[io_romio321_flags="$with_io_romio_flags $io_romio321_flags"],
57-
[io_romio321_flags=])
56+
[io_romio341_flags="$with_io_romio_flags $io_romio341_flags"],
57+
[io_romio341_flags=])
5858
# If ROMIO is going to end up in a DSO, all we need is
5959
# shared library-ized objects, as we're only building a
6060
# DSO (which is always shared). Otherwise, build with
6161
# same flags as OMPI, as we might need any combination of
6262
# shared and static-ized objects...
6363
AS_IF([test "$compile_mode" = "dso"],
64-
[io_romio321_shared=enable
65-
io_romio321_static=disable],
64+
[io_romio341_shared=enable
65+
io_romio341_static=disable],
6666
[AS_IF([test "$enable_shared" = "yes"],
67-
[io_romio321_shared=enable],
68-
[io_romio321_shared=disable])
67+
[io_romio341_shared=enable],
68+
[io_romio341_shared=disable])
6969
AS_IF([test "$enable_static" = "yes"],
70-
[io_romio321_static=enable],
71-
[io_romio321_static=disable])])
70+
[io_romio341_static=enable],
71+
[io_romio341_static=disable])])
7272
AS_IF([test -n "$prefix" && test "$prefix" != "NONE"],
73-
[io_romio321_prefix_arg="--prefix=$prefix"],
74-
[io_romio321_prefix_arg=])
73+
[io_romio341_prefix_arg="--prefix=$prefix"],
74+
[io_romio341_prefix_arg=])
7575

7676
AS_IF([test "$cross_compiling" = "yes"],
77-
[AS_IF([test ! -z $build], [io_romio321_flags="$io_romio321_flags --build=$build"])
78-
AS_IF([test ! -z $host], [io_romio321_flags="$io_romio321_flags --host=$host"])
79-
AS_IF([test ! -z $target], [io_romio321_flags="$io_romio321_flags --target=$target"])])
77+
[AS_IF([test ! -z $build], [io_romio341_flags="$io_romio341_flags --build=$build"])
78+
AS_IF([test ! -z $host], [io_romio341_flags="$io_romio341_flags --host=$host"])
79+
AS_IF([test ! -z $target], [io_romio341_flags="$io_romio341_flags --target=$target"])])
8080
AS_IF([test "$enable_grequest_extensions" = "yes"],
81-
[io_romio321_flags="$io_romio321_flags --enable-grequest-extensions"])
82-
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"
83-
AC_DEFINE_UNQUOTED([MCA_io_romio321_COMPLETE_CONFIGURE_FLAGS], ["$io_romio321_flags_define"], [Complete set of command line arguments given to ROMIOs configure script])
81+
[io_romio341_flags="$io_romio341_flags --enable-grequest-extensions"])
82+
io_romio341_flags_define="$io_romio341_flags FROM_OMPI=yes CC='$CC' CFLAGS='$CFLAGS -D__EXTENSIONS__' CPPFLAGS='$CPPFLAGS' FFLAGS='$FFLAGS' LDFLAGS='$LDFLAGS' --$io_romio341_shared-shared --$io_romio341_static-static $io_romio341_flags $io_romio341_prefix_arg --disable-aio --disable-weak-symbols --enable-strict --disable-f77 --disable-f90"
83+
AC_DEFINE_UNQUOTED([MCA_io_romio341_COMPLETE_CONFIGURE_FLAGS], ["$io_romio341_flags_define"], [Complete set of command line arguments given to ROMIOs configure script])
8484

85-
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"
85+
io_romio341_flags="$io_romio341_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio341_shared-shared --$io_romio341_static-static $io_romio341_flags $io_romio341_prefix_arg --disable-aio --disable-weak-symbols --enable-strict --disable-f77 --disable-f90"
8686

8787
opal_show_subtitle "Configuring ROMIO distribution"
88-
OPAL_CONFIG_SUBDIR([3rd-party/romio321],
89-
[$io_romio321_flags],
90-
[io_romio321_happy=1], [io_romio321_happy=0])
88+
OPAL_CONFIG_SUBDIR([3rd-party/romio341],
89+
[$io_romio341_flags],
90+
[io_romio341_happy=1], [io_romio341_happy=0])
9191

92-
AS_IF([test "$io_romio321_happy" = "1"],
92+
AS_IF([test "$io_romio341_happy" = "1"],
9393
[ # grab the libraries list from ROMIO. We don't
9494
# need this for building the component, as libtool
9595
# will figure that part out. But we do need it for
9696
# the wrapper settings
97-
io_romio321_save_LIBS="$LIBS"
97+
io_romio341_save_LIBS="$LIBS"
9898
LIBS=
99-
. 3rd-party/romio321/localdefs
100-
io_romio321_LIBS="$LIBS"
101-
LIBS="$io_romio321_save_LIBS"
102-
OPAL_3RDPARTY_SUBDIRS="$OPAL_3RDPARTY_SUBDIRS romio321"
103-
OPAL_3RDPARTY_DIST_SUBDIRS="$OPAL_3RDPARTY_DIST_SUBDIRS romio321"
99+
. 3rd-party/romio341/localdefs
100+
io_romio341_LIBS="$LIBS"
101+
LIBS="$io_romio341_save_LIBS"
102+
OPAL_3RDPARTY_SUBDIRS="$OPAL_3RDPARTY_SUBDIRS romio341"
103+
OPAL_3RDPARTY_DIST_SUBDIRS="$OPAL_3RDPARTY_DIST_SUBDIRS romio341"
104104

105105
echo "ROMIO distribution configured successfully"
106106
$1],

‎ompi/mca/io/romio321/owner.txt renamed to ‎ompi/mca/io/romio341/owner.txt

File renamed without changes.

‎ompi/mca/io/romio321/src/Makefile.extra renamed to ‎ompi/mca/io/romio341/src/Makefile.extra

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
14-
# Copyright (c) 2017-2019 Research Organization for Information Science
14+
# Copyright (c) 2017-2021 Research Organization for Information Science
1515
# and Technology (RIST). All rights reserved.
1616
# $COPYRIGHT$
1717
#
@@ -30,16 +30,17 @@ AM_CPPFLAGS = \
3030
-I$(OMPI_TOP_BUILDDIR)/ompi/include \
3131
-I$(OMPI_TOP_SRCDIR)/ompi \
3232
-I$(OMPI_TOP_SRCDIR)/ompi/include \
33-
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio321 \
34-
-I$(OMPI_TOP_SRCDIR)/3rd-party/romio321/include \
35-
-I$(OMPI_TOP_SRCDIR)/3rd-party/romio321/adio/include \
33+
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio341 \
34+
-I$(OMPI_TOP_SRCDIR)/3rd-party/romio341/include \
35+
-I$(OMPI_TOP_SRCDIR)/3rd-party/romio341/adio/include \
36+
-I$(top_builddir)/3rd-party/romio341/mpl/include \
3637
-I$(top_builddir)
3738

3839
sources += \
39-
src/io_romio321.h \
40-
src/io_romio321_component.c \
41-
src/io_romio321_file_open.c \
42-
src/io_romio321_file_read.c \
43-
src/io_romio321_file_write.c \
44-
src/io_romio321_module.c
40+
src/io_romio341.h \
41+
src/io_romio341_component.c \
42+
src/io_romio341_file_open.c \
43+
src/io_romio341_file_read.c \
44+
src/io_romio341_file_write.c \
45+
src/io_romio341_module.c
4546

0 commit comments

Comments
 (0)