ROMIO 3.1.4 refresh: use romio from mpich 3.1.4
Этот коммит содержится в:
родитель
92f6c7c1e2
Коммит
85e77079b4
@ -32,7 +32,7 @@ endif
|
|||||||
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
|
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
|
||||||
# (for static builds).
|
# (for static builds).
|
||||||
|
|
||||||
if MCA_BUILD_ompi_io_romio_DSO
|
if MCA_BUILD_ompi_io_romio314_DSO
|
||||||
lib =
|
lib =
|
||||||
lib_sources =
|
lib_sources =
|
||||||
component = mca_io_romio.la
|
component = mca_io_romio.la
|
||||||
|
@ -20,15 +20,15 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
AC_DEFUN([MCA_ompi_io_romio_POST_CONFIG], [
|
AC_DEFUN([MCA_ompi_io_romio314_POST_CONFIG], [
|
||||||
AM_CONDITIONAL([MCA_io_romio_SHOULD_BUILD], [test $1 -eq 1])
|
AM_CONDITIONAL([MCA_io_romio_SHOULD_BUILD], [test $1 -eq 1])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
# MCA_io_romio_CONFIG([action-if-found], [action-if-not-found])
|
# MCA_io_romio_CONFIG([action-if-found], [action-if-not-found])
|
||||||
# -----------------------------------------------------------
|
# -----------------------------------------------------------
|
||||||
AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
|
AC_DEFUN([MCA_ompi_io_romio314_CONFIG],[
|
||||||
AC_CONFIG_FILES([ompi/mca/io/romio/Makefile])
|
AC_CONFIG_FILES([ompi/mca/io/romio314/Makefile])
|
||||||
|
|
||||||
OPAL_VAR_SCOPE_PUSH([io_romio_flags io_romio_flags_define io_romio_happy io_romio_save_LIBS])
|
OPAL_VAR_SCOPE_PUSH([io_romio_flags io_romio_flags_define io_romio_happy io_romio_save_LIBS])
|
||||||
AC_ARG_ENABLE([io-romio],
|
AC_ARG_ENABLE([io-romio],
|
||||||
@ -83,7 +83,7 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
|
|||||||
io_romio_flags="$io_romio_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg --disable-aio --disable-weak-symbols --enable-strict"
|
io_romio_flags="$io_romio_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg --disable-aio --disable-weak-symbols --enable-strict"
|
||||||
|
|
||||||
opal_show_subtitle "Configuring ROMIO distribution"
|
opal_show_subtitle "Configuring ROMIO distribution"
|
||||||
OPAL_CONFIG_SUBDIR([ompi/mca/io/romio/romio],
|
OPAL_CONFIG_SUBDIR([ompi/mca/io/romio314/romio],
|
||||||
[$io_romio_flags],
|
[$io_romio_flags],
|
||||||
[io_romio_happy=1], [io_romio_happy=0])
|
[io_romio_happy=1], [io_romio_happy=0])
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
|
|||||||
# the wrapper settings
|
# the wrapper settings
|
||||||
io_romio_save_LIBS="$LIBS"
|
io_romio_save_LIBS="$LIBS"
|
||||||
LIBS=
|
LIBS=
|
||||||
. ompi/mca/io/romio/romio/localdefs
|
. ompi/mca/io/romio314/romio/localdefs
|
||||||
io_romio_LIBS="$LIBS"
|
io_romio_LIBS="$LIBS"
|
||||||
LIBS="$io_romio_save_LIBS"
|
LIBS="$io_romio_save_LIBS"
|
||||||
|
|
||||||
|
@ -31,9 +31,9 @@ AM_CPPFLAGS = \
|
|||||||
-I$(OMPI_TOP_BUILDDIR)/ompi/include \
|
-I$(OMPI_TOP_BUILDDIR)/ompi/include \
|
||||||
-I$(OMPI_TOP_SRCDIR)/ompi \
|
-I$(OMPI_TOP_SRCDIR)/ompi \
|
||||||
-I$(OMPI_TOP_SRCDIR)/ompi/include \
|
-I$(OMPI_TOP_SRCDIR)/ompi/include \
|
||||||
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio \
|
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio314 \
|
||||||
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio/romio/include \
|
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio314/romio/include \
|
||||||
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio/romio/adio/include \
|
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio314/romio/adio/include \
|
||||||
-I$(top_builddir)
|
-I$(top_builddir)
|
||||||
|
|
||||||
sources += \
|
sources += \
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user