ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge branch 'master' of https://github.com/open-mpi/ompi

Просмотр исходного кода
Этот коммит содержится в:
mjbhaskar 2015-01-08 14:12:01 -06:00
родитель 27dfcaaab2 c65f026fee
Коммит ba5dc660f7
10 изменённых файлов: 113 добавлений и 64 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
ompi/mca/io/romio/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/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 += \

104
ompi/mca/io/romio/romio/ompi.patch
Просмотреть файл

@ -1,6 +1,6 @@
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/common/ad_end.c ompi/ompi/mca/io/romio/romio/adio/common/ad_end.c diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/adio/common/ad_end.c ompi/ompi/mca/io/romio/romio/adio/common/ad_end.c
--- mpich/src/mpi/romio/adio/common/ad_end.c 2014-12-25 16:45:58.224965512 +0900 --- mpich/src/mpi/romio/adio/common/ad_end.c 2014-12-25 16:45:58.224965512 +0900
+++ ompi/ompi/mca/io/romio/romio/adio/common/ad_end.c 2015-01-06 19:41:59.287738412 +0900 +++ ompi/ompi/mca/io/romio/romio/adio/common/ad_end.c 2015-01-06 19:43:31.734793345 +0900
@@ -16,7 +16,12 @@ @@ -16,7 +16,12 @@
/* 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
@ -14,9 +14,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/common/ad_end.c ompi/
/* delete the flattened datatype list */ /* delete the flattened datatype list */
curr = ADIOI_Flatlist; curr = ADIOI_Flatlist;
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/common/ad_iread_coll.c ompi/ompi/mca/io/romio/romio/adio/common/ad_iread_coll.c diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/adio/common/ad_iread_coll.c ompi/ompi/mca/io/romio/romio/adio/common/ad_iread_coll.c
--- mpich/src/mpi/romio/adio/common/ad_iread_coll.c 2014-12-25 16:45:58.225965642 +0900 --- mpich/src/mpi/romio/adio/common/ad_iread_coll.c 2014-12-25 16:45:58.225965642 +0900
+++ ompi/ompi/mca/io/romio/romio/adio/common/ad_iread_coll.c 2015-01-06 19:41:59.287738412 +0900 +++ ompi/ompi/mca/io/romio/romio/adio/common/ad_iread_coll.c 2015-01-07 11:01:28.116415010 +0900
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
#include "mpe.h" #include "mpe.h"
#endif #endif
@ -31,9 +31,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/common/ad_iread_coll.
} }
+#endif /* HAVE_MPI_GREQUEST_EXTENSIONS */ +#endif /* HAVE_MPI_GREQUEST_EXTENSIONS */
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/common/ad_iwrite_coll.c ompi/ompi/mca/io/romio/romio/adio/common/ad_iwrite_coll.c diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/adio/common/ad_iwrite_coll.c ompi/ompi/mca/io/romio/romio/adio/common/ad_iwrite_coll.c
--- mpich/src/mpi/romio/adio/common/ad_iwrite_coll.c 2014-12-25 16:45:58.225965642 +0900 --- mpich/src/mpi/romio/adio/common/ad_iwrite_coll.c 2014-12-25 16:45:58.225965642 +0900
+++ ompi/ompi/mca/io/romio/romio/adio/common/ad_iwrite_coll.c 2015-01-06 19:41:59.287738412 +0900 +++ ompi/ompi/mca/io/romio/romio/adio/common/ad_iwrite_coll.c 2015-01-07 11:01:28.179454706 +0900
@@ -12,6 +12,8 @@ @@ -12,6 +12,8 @@
#include "mpe.h" #include "mpe.h"
#endif #endif
@ -48,9 +48,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/common/ad_iwrite_coll
} }
+#endif /* HAVE_MPI_GREQUEST_EXTENSIONS */ +#endif /* HAVE_MPI_GREQUEST_EXTENSIONS */
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/include/adioi.h ompi/ompi/mca/io/romio/romio/adio/include/adioi.h diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/adio/include/adioi.h ompi/ompi/mca/io/romio/romio/adio/include/adioi.h
--- mpich/src/mpi/romio/adio/include/adioi.h 2014-12-25 16:45:58.228966032 +0900 --- mpich/src/mpi/romio/adio/include/adioi.h 2014-12-25 16:45:58.228966032 +0900
+++ ompi/ompi/mca/io/romio/romio/adio/include/adioi.h 2015-01-06 19:41:59.291738936 +0900 +++ ompi/ompi/mca/io/romio/romio/adio/include/adioi.h 2015-01-07 11:01:28.353564349 +0900
@@ -429,18 +429,26 @@ @@ -429,18 +429,26 @@
MPI_Datatype datatype, int file_ptr_type, MPI_Datatype datatype, int file_ptr_type,
ADIO_Offset offset, ADIO_Status *status, int ADIO_Offset offset, ADIO_Status *status, int
@ -78,9 +78,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/include/adioi.h ompi/
void ADIOI_Calc_my_off_len(ADIO_File fd, int bufcount, MPI_Datatype void ADIOI_Calc_my_off_len(ADIO_File fd, int bufcount, MPI_Datatype
datatype, int file_ptr_type, ADIO_Offset datatype, int file_ptr_type, ADIO_Offset
offset, ADIO_Offset **offset_list_ptr, ADIO_Offset offset, ADIO_Offset **offset_list_ptr, ADIO_Offset
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/include/romioconf-undefs.h ompi/ompi/mca/io/romio/romio/adio/include/romioconf-undefs.h diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/adio/include/romioconf-undefs.h ompi/ompi/mca/io/romio/romio/adio/include/romioconf-undefs.h
--- mpich/src/mpi/romio/adio/include/romioconf-undefs.h 1970-01-01 09:00:00.000000000 +0900 --- mpich/src/mpi/romio/adio/include/romioconf-undefs.h 1970-01-01 09:00:00.000000000 +0900
+++ ompi/ompi/mca/io/romio/romio/adio/include/romioconf-undefs.h 2015-01-06 19:41:59.291738936 +0900 +++ ompi/ompi/mca/io/romio/romio/adio/include/romioconf-undefs.h 2015-01-07 11:01:28.438617911 +0900
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
+/* +/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@ -127,17 +127,32 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/adio/include/romioconf-und
+#endif +#endif
+ +
+#endif /* ROMIOCONF_UNDEFS_H */ +#endif /* ROMIOCONF_UNDEFS_H */
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/.config_params ompi/ompi/mca/io/romio/romio/.config_params diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/adio/Makefile.mk ompi/ompi/mca/io/romio/romio/adio/Makefile.mk
--- mpich/src/mpi/romio/adio/Makefile.mk 2014-12-25 16:45:58.214964210 +0900
+++ ompi/ompi/mca/io/romio/romio/adio/Makefile.mk 2015-01-07 14:46:19.504816749 +0900
@@ -19,7 +19,10 @@
adio/include/mpio_error.h \
adio/include/mpipr.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/hint_fns.h
include $(top_srcdir)/adio/ad_gpfs/Makefile.mk
include $(top_srcdir)/adio/ad_gpfs/bg/Makefile.mk
diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/.config_params ompi/ompi/mca/io/romio/romio/.config_params
--- mpich/src/mpi/romio/.config_params 2014-12-25 16:45:58.214964210 +0900 --- mpich/src/mpi/romio/.config_params 2014-12-25 16:45:58.214964210 +0900
+++ ompi/ompi/mca/io/romio/romio/.config_params 2015-01-06 19:41:59.277737109 +0900 +++ ompi/ompi/mca/io/romio/romio/.config_params 2015-01-06 19:43:31.738793869 +0900
@@ -36,3 +36,4 @@ @@ -36,3 +36,4 @@
__hp_mpi __hp_mpi
__cray_mpi __cray_mpi
__lam_mpi __lam_mpi
+__open_mpi +__open_mpi
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/configure.ac ompi/ompi/mca/io/romio/romio/configure.ac diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/configure.ac ompi/ompi/mca/io/romio/romio/configure.ac
--- mpich/src/mpi/romio/configure.ac 2014-12-25 16:45:58.229966162 +0900 --- mpich/src/mpi/romio/configure.ac 2014-12-25 16:45:58.229966162 +0900
+++ ompi/ompi/mca/io/romio/romio/configure.ac 2015-01-06 19:41:59.293739196 +0900 +++ ompi/ompi/mca/io/romio/romio/configure.ac 2015-01-07 11:01:28.602721250 +0900
@@ -3,12 +3,21 @@ @@ -3,12 +3,21 @@
# autoconf --localdir=../confdb configure.ac # autoconf --localdir=../confdb configure.ac
# (or wherever the confdb is) # (or wherever the confdb is)
@ -483,7 +498,7 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/configure.ac ompi/ompi/mca
AC_OUTPUT AC_OUTPUT
dnl PAC_SUBDIR_CACHE_CLEANUP dnl PAC_SUBDIR_CACHE_CLEANUP
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/doc/Makefile ompi/ompi/mca/io/romio/romio/doc/Makefile diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/doc/Makefile ompi/ompi/mca/io/romio/romio/doc/Makefile
--- mpich/src/mpi/romio/doc/Makefile 2014-12-25 16:45:58.229966162 +0900 --- mpich/src/mpi/romio/doc/Makefile 2014-12-25 16:45:58.229966162 +0900
+++ ompi/ompi/mca/io/romio/romio/doc/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ ompi/ompi/mca/io/romio/romio/doc/Makefile 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
@ -498,9 +513,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/doc/Makefile ompi/ompi/mca
- -rm -f users-guide.toc users-guide.log users-guide.dvi \ - -rm -f users-guide.toc users-guide.log users-guide.dvi \
- users-guide.aux users-guide.bbl users-guide.ps \ - users-guide.aux users-guide.bbl users-guide.ps \
- users-guide.blg - users-guide.blg
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/doc/users-guide.tex ompi/ompi/mca/io/romio/romio/doc/users-guide.tex diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/doc/users-guide.tex ompi/ompi/mca/io/romio/romio/doc/users-guide.tex
--- mpich/src/mpi/romio/doc/users-guide.tex 2014-12-25 16:45:58.230966293 +0900 --- mpich/src/mpi/romio/doc/users-guide.tex 2014-12-25 16:45:58.230966293 +0900
+++ ompi/ompi/mca/io/romio/romio/doc/users-guide.tex 2015-01-06 19:41:59.294739326 +0900 +++ ompi/ompi/mca/io/romio/romio/doc/users-guide.tex 2015-01-07 11:01:28.619731962 +0900
@@ -807,13 +807,19 @@ @@ -807,13 +807,19 @@
your MPI-IO program. your MPI-IO program.
@ -532,9 +547,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/doc/users-guide.tex ompi/o
\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.
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/.gitignore ompi/ompi/mca/io/romio/romio/.gitignore diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/.gitignore ompi/ompi/mca/io/romio/romio/.gitignore
--- mpich/src/mpi/romio/.gitignore 1970-01-01 09:00:00.000000000 +0900 --- mpich/src/mpi/romio/.gitignore 1970-01-01 09:00:00.000000000 +0900
+++ ompi/ompi/mca/io/romio/romio/.gitignore 2015-01-06 19:41:59.277737109 +0900 +++ ompi/ompi/mca/io/romio/romio/.gitignore 2015-01-07 11:01:26.982701076 +0900
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+/Makefile +/Makefile
+/.deps +/.deps
@ -549,9 +564,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/.gitignore ompi/ompi/mca/i
+.state-cache +.state-cache
+version.m4 +version.m4
+confdb/config.rpath +confdb/config.rpath
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/include/io_romio_conv.h ompi/ompi/mca/io/romio/romio/include/io_romio_conv.h diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/include/io_romio_conv.h ompi/ompi/mca/io/romio/romio/include/io_romio_conv.h
--- mpich/src/mpi/romio/include/io_romio_conv.h 1970-01-01 09:00:00.000000000 +0900 --- mpich/src/mpi/romio/include/io_romio_conv.h 1970-01-01 09:00:00.000000000 +0900
+++ ompi/ompi/mca/io/romio/romio/include/io_romio_conv.h 2015-01-06 19:41:59.294739326 +0900 +++ ompi/ompi/mca/io/romio/romio/include/io_romio_conv.h 2015-01-07 11:01:28.638743935 +0900
@@ -0,0 +1,124 @@ @@ -0,0 +1,124 @@
+/* +/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@ -677,9 +692,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/include/io_romio_conv.h om
+#endif +#endif
+ +
+#endif /* MCA_IO_ROMIO_CONV_H */ +#endif /* MCA_IO_ROMIO_CONV_H */
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/include/mpio.h.in ompi/ompi/mca/io/romio/romio/include/mpio.h.in diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/include/mpio.h.in ompi/ompi/mca/io/romio/romio/include/mpio.h.in
--- mpich/src/mpi/romio/include/mpio.h.in 2014-12-25 16:45:58.230966293 +0900 --- mpich/src/mpi/romio/include/mpio.h.in 2014-12-25 16:45:58.230966293 +0900
+++ ompi/ompi/mca/io/romio/romio/include/mpio.h.in 2015-01-06 19:41:59.294739326 +0900 +++ ompi/ompi/mca/io/romio/romio/include/mpio.h.in 2015-01-07 11:01:28.655754646 +0900
@@ -11,6 +11,16 @@ @@ -11,6 +11,16 @@
#define MPIO_INCLUDE #define MPIO_INCLUDE
@ -742,9 +757,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/include/mpio.h.in ompi/omp
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/localdefs.in ompi/ompi/mca/io/romio/romio/localdefs.in diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/localdefs.in ompi/ompi/mca/io/romio/romio/localdefs.in
--- mpich/src/mpi/romio/localdefs.in 2014-12-25 16:45:58.230966293 +0900 --- mpich/src/mpi/romio/localdefs.in 2014-12-25 16:45:58.230966293 +0900
+++ ompi/ompi/mca/io/romio/romio/localdefs.in 2015-01-06 19:41:59.294739326 +0900 +++ ompi/ompi/mca/io/romio/romio/localdefs.in 2015-01-06 19:43:31.743794524 +0900
@@ -1,7 +1,4 @@ @@ -1,7 +1,4 @@
#! /bin/sh #! /bin/sh
- -
@ -754,9 +769,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/localdefs.in ompi/ompi/mca
+LIBS="@LIBS@" +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@"
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/Makefile.am ompi/ompi/mca/io/romio/romio/Makefile.am diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/Makefile.am ompi/ompi/mca/io/romio/romio/Makefile.am
--- mpich/src/mpi/romio/Makefile.am 2014-12-25 16:45:58.214964210 +0900 --- mpich/src/mpi/romio/Makefile.am 2014-12-25 16:45:58.214964210 +0900
+++ ompi/ompi/mca/io/romio/romio/Makefile.am 2015-01-06 19:41:59.277737109 +0900 +++ ompi/ompi/mca/io/romio/romio/Makefile.am 2015-01-07 11:01:27.001713046 +0900
@@ -1,9 +1,28 @@ @@ -1,9 +1,28 @@
# -*- Mode: Makefile; -*- # -*- Mode: Makefile; -*-
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana +# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
@ -816,9 +831,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/Makefile.am ompi/ompi/mca/
## 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
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/Makefile.options ompi/ompi/mca/io/romio/romio/Makefile.options diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/Makefile.options ompi/ompi/mca/io/romio/romio/Makefile.options
--- mpich/src/mpi/romio/Makefile.options 1970-01-01 09:00:00.000000000 +0900 --- mpich/src/mpi/romio/Makefile.options 1970-01-01 09:00:00.000000000 +0900
+++ ompi/ompi/mca/io/romio/romio/Makefile.options 2015-01-06 19:41:59.277737109 +0900 +++ ompi/ompi/mca/io/romio/romio/Makefile.options 2015-01-07 11:01:27.015721870 +0900
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+# -*- makefile -*- +# -*- makefile -*-
+# +#
@ -856,9 +871,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/Makefile.options ompi/ompi
+ -I$(OMPI_TOP_BUILDDIR)/ompi/include \ + -I$(OMPI_TOP_BUILDDIR)/ompi/include \
+ -I$(top_srcdir)/include \ + -I$(top_srcdir)/include \
+ -I$(top_srcdir)/adio/include + -I$(top_srcdir)/adio/include
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/mpi-io/close.c ompi/ompi/mca/io/romio/romio/mpi-io/close.c diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/mpi-io/close.c ompi/ompi/mca/io/romio/romio/mpi-io/close.c
--- mpich/src/mpi/romio/mpi-io/close.c 2014-12-25 16:45:58.230966293 +0900 --- mpich/src/mpi/romio/mpi-io/close.c 2014-12-25 16:45:58.230966293 +0900
+++ ompi/ompi/mca/io/romio/romio/mpi-io/close.c 2015-01-06 19:41:59.294739326 +0900 +++ ompi/ompi/mca/io/romio/romio/mpi-io/close.c 2015-01-07 11:01:28.670764098 +0900
@@ -76,8 +76,13 @@ @@ -76,8 +76,13 @@
* 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
@ -873,9 +888,20 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/mpi-io/close.c ompi/ompi/m
ADIO_Close(adio_fh, &error_code); ADIO_Close(adio_fh, &error_code);
MPIO_File_free(fh); MPIO_File_free(fh);
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/mpi-io/iread_all.c ompi/ompi/mca/io/romio/romio/mpi-io/iread_all.c diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/mpi-io/glue/Makefile.mk ompi/ompi/mca/io/romio/romio/mpi-io/glue/Makefile.mk
--- mpich/src/mpi/romio/mpi-io/glue/Makefile.mk 2014-12-25 16:45:58.232966555 +0900
+++ ompi/ompi/mca/io/romio/romio/mpi-io/glue/Makefile.mk 2015-01-08 14:02:47.060155366 +0900
@@ -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 -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/mpi-io/iread_all.c ompi/ompi/mca/io/romio/romio/mpi-io/iread_all.c
--- mpich/src/mpi/romio/mpi-io/iread_all.c 2014-12-25 16:45:58.233966685 +0900 --- mpich/src/mpi/romio/mpi-io/iread_all.c 2014-12-25 16:45:58.233966685 +0900
+++ ompi/ompi/mca/io/romio/romio/mpi-io/iread_all.c 2015-01-06 19:41:59.298739847 +0900 +++ ompi/ompi/mca/io/romio/romio/mpi-io/iread_all.c 2015-01-07 11:01:28.885899578 +0900
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
#include "mpioprof.h" #include "mpioprof.h"
#endif #endif
@ -885,9 +911,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/mpi-io/iread_all.c ompi/om
#include "mpiu_greq.h" #include "mpiu_greq.h"
#endif #endif
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/mpi-io/Makefile.mk ompi/ompi/mca/io/romio/romio/mpi-io/Makefile.mk diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/mpi-io/Makefile.mk ompi/ompi/mca/io/romio/romio/mpi-io/Makefile.mk
--- mpich/src/mpi/romio/mpi-io/Makefile.mk 2014-12-25 16:45:58.230966293 +0900 --- mpich/src/mpi/romio/mpi-io/Makefile.mk 2014-12-25 16:45:58.230966293 +0900
+++ ompi/ompi/mca/io/romio/romio/mpi-io/Makefile.mk 2015-01-06 19:41:59.294739326 +0900 +++ ompi/ompi/mca/io/romio/romio/mpi-io/Makefile.mk 2015-01-07 11:01:28.669763468 +0900
@@ -14,8 +14,6 @@ @@ -14,8 +14,6 @@
romio_mpi_sources += \ romio_mpi_sources += \
mpi-io/close.c \ mpi-io/close.c \
@ -897,9 +923,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/mpi-io/Makefile.mk ompi/om
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 \
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/mpi-io/mpioprof.h ompi/ompi/mca/io/romio/romio/mpi-io/mpioprof.h diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/mpi-io/mpioprof.h ompi/ompi/mca/io/romio/romio/mpi-io/mpioprof.h
--- mpich/src/mpi/romio/mpi-io/mpioprof.h 2014-12-25 16:45:58.233966685 +0900 --- mpich/src/mpi/romio/mpi-io/mpioprof.h 2014-12-25 16:45:58.233966685 +0900
+++ ompi/ompi/mca/io/romio/romio/mpi-io/mpioprof.h 2015-01-06 19:41:59.298739847 +0900 +++ ompi/ompi/mca/io/romio/romio/mpi-io/mpioprof.h 2015-01-07 11:01:29.005975192 +0900
@@ -10,6 +10,15 @@ @@ -10,6 +10,15 @@
building the profiling interface building the profiling interface
*/ */
@ -921,9 +947,9 @@ diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/mpi-io/mpioprof.h ompi/omp
#endif #endif
+#endif +#endif
diff -x ompi.patch -x confdb -ruN mpich/src/mpi/romio/README_OMPI ompi/ompi/mca/io/romio/romio/README_OMPI diff -x ompi.patch -x confdb -x autom4te.cache -x version.m4 -x aclocal.m4 -ruN mpich/src/mpi/romio/README_OMPI ompi/ompi/mca/io/romio/romio/README_OMPI
--- mpich/src/mpi/romio/README_OMPI 1970-01-01 09:00:00.000000000 +0900 --- mpich/src/mpi/romio/README_OMPI 1970-01-01 09:00:00.000000000 +0900
+++ ompi/ompi/mca/io/romio/romio/README_OMPI 2015-01-06 19:41:59.277737109 +0900 +++ ompi/ompi/mca/io/romio/romio/README_OMPI 2015-01-07 11:01:27.034733843 +0900
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+Please note that this is *NOT* a vanilla MPICH v3.2a2-84-gef1cf14 +Please note that this is *NOT* a vanilla MPICH v3.2a2-84-gef1cf14
+distribution of the ROMIO package from Argonne National Labs. +distribution of the ROMIO package from Argonne National Labs.

3
ompi/mca/osc/pt2pt/Makefile.am
Просмотреть файл

@ -10,6 +10,7 @@
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2014 Los Alamos National Security, LLC. All rights # Copyright (c) 2014 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2015 Intel, Inc. All rights reserved
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -27,7 +28,7 @@ pt2pt_sources = \
osc_pt2pt_frag.h \ osc_pt2pt_frag.h \
osc_pt2pt_frag.c \ osc_pt2pt_frag.c \
osc_pt2pt_header.h \ osc_pt2pt_header.h \
osc_pt2pt_obj_convert.h \ osc_pt2pt_pending_frag.h \
osc_pt2pt_request.h \ osc_pt2pt_request.h \
osc_pt2pt_request.c \ osc_pt2pt_request.c \
osc_pt2pt_active_target.c \ osc_pt2pt_active_target.c \

4
opal/class/opal_fifo.h
Просмотреть файл

@ -12,7 +12,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2007 Voltaire All rights reserved. * Copyright (c) 2007 Voltaire All rights reserved.
* Copyright (c) 2010 IBM Corporation. All rights reserved. * Copyright (c) 2010 IBM Corporation. All rights reserved.
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights * Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights
* reseved. * reseved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -219,6 +219,8 @@ static inline opal_list_item_t *opal_fifo_pop_atomic (opal_fifo_t *fifo)
opal_atomic_wmb (); opal_atomic_wmb ();
} while (1); } while (1);
opal_atomic_wmb();
item = opal_fifo_head (fifo); item = opal_fifo_head (fifo);
if (&fifo->opal_fifo_ghost == item) { if (&fifo->opal_fifo_ghost == item) {
fifo->opal_fifo_head.data.counter = 0; fifo->opal_fifo_head.data.counter = 0;

11
opal/mca/btl/openib/btl_openib_async.c
Просмотреть файл

@ -123,7 +123,7 @@ static mca_btl_openib_endpoint_t * qp2endpoint(struct ibv_qp *qp, mca_btl_openib
return NULL; return NULL;
} }
#if HAVE_XRC #if HAVE_XRC && !OPAL_HAVE_CONNECTX_XRC_DOMAINS
/* XRC recive QP to endpoint */ /* XRC recive QP to endpoint */
static mca_btl_openib_endpoint_t * xrc_qp2endpoint(uint32_t qp_num, mca_btl_openib_device_t *device) static mca_btl_openib_endpoint_t * xrc_qp2endpoint(uint32_t qp_num, mca_btl_openib_device_t *device)
{ {
@ -131,11 +131,7 @@ static mca_btl_openib_endpoint_t * xrc_qp2endpoint(uint32_t qp_num, mca_btl_open
int ep_i; int ep_i;
for(ep_i = 0; ep_i < opal_pointer_array_get_size(device->endpoints); ep_i++) { for(ep_i = 0; ep_i < opal_pointer_array_get_size(device->endpoints); ep_i++) {
ep = opal_pointer_array_get_item(device->endpoints, ep_i); ep = opal_pointer_array_get_item(device->endpoints, ep_i);
#if OPAL_HAVE_CONNECTX_XRC_DOMAINS
if (qp_num == ep->xrc_recv_qp->qp_num)
#else
if (qp_num == ep->xrc_recv_qp_num) if (qp_num == ep->xrc_recv_qp_num)
#endif
return ep; return ep;
} }
return NULL; return NULL;
@ -376,13 +372,10 @@ static int btl_openib_async_deviceh(struct mca_btl_openib_async_poll *devices_po
if (!xrc_event) if (!xrc_event)
mca_btl_openib_load_apm(event.element.qp, mca_btl_openib_load_apm(event.element.qp,
qp2endpoint(event.element.qp, device)); qp2endpoint(event.element.qp, device));
#if HAVE_XRC #if HAVE_XRC && !OPAL_HAVE_CONNECTX_XRC_DOMAINS
#if OPAL_HAVE_CONNECTX_XRC_DOMAINS
#else
else else
mca_btl_openib_load_apm_xrc_rcv(event.element.xrc_qp_num, mca_btl_openib_load_apm_xrc_rcv(event.element.xrc_qp_num,
xrc_qp2endpoint(event.element.xrc_qp_num, device)); xrc_qp2endpoint(event.element.xrc_qp_num, device));
#endif
#endif #endif
} }
break; break;

20
opal/mca/btl/tcp/btl_tcp_endpoint.c
Просмотреть файл

@ -12,6 +12,8 @@
* Copyright (c) 2007-2008 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2007-2008 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -180,26 +182,33 @@ mca_btl_tcp_endpoint_dump(int level,
sprintf(dst, "%s", inet_ntoa(inaddr.sin_addr)); sprintf(dst, "%s", inet_ntoa(inaddr.sin_addr));
#endif #endif
used += snprintf(&outmsg[used], 1024 - used, "%s: %s - %s [%d", used = snprintf(outmsg, 1024, "%s: %s - %s [%d",
msg, src, dst, btl_endpoint->endpoint_sd); msg, src, dst, btl_endpoint->endpoint_sd);
if (used >= 1024) goto out;
switch(btl_endpoint->endpoint_state) { switch(btl_endpoint->endpoint_state) {
case MCA_BTL_TCP_CONNECTING: case MCA_BTL_TCP_CONNECTING:
used += snprintf(&outmsg[used], 1024 - used, ":%s]", "connecting"); used += snprintf(&outmsg[used], 1024 - used, ":%s]", "connecting");
if (used >= 1024) goto out;
break; break;
case MCA_BTL_TCP_CONNECT_ACK: case MCA_BTL_TCP_CONNECT_ACK:
used += snprintf(&outmsg[used], 1024 - used, ":%s]", "ack"); used += snprintf(&outmsg[used], 1024 - used, ":%s]", "ack");
if (used >= 1024) goto out;
break; break;
case MCA_BTL_TCP_CLOSED: case MCA_BTL_TCP_CLOSED:
used += snprintf(&outmsg[used], 1024 - used, ":%s]", "close"); used += snprintf(&outmsg[used], 1024 - used, ":%s]", "close");
if (used >= 1024) goto out;
break; break;
case MCA_BTL_TCP_FAILED: case MCA_BTL_TCP_FAILED:
used += snprintf(&outmsg[used], 1024 - used, ":%s]", "failed"); used += snprintf(&outmsg[used], 1024 - used, ":%s]", "failed");
if (used >= 1024) goto out;
break; break;
case MCA_BTL_TCP_CONNECTED: case MCA_BTL_TCP_CONNECTED:
used += snprintf(&outmsg[used], 1024 - used, ":%s]", "connected"); used += snprintf(&outmsg[used], 1024 - used, ":%s]", "connected");
if (used >= 1024) goto out;
break; break;
default: default:
used += snprintf(&outmsg[used], 1024 - used, ":%s]", "unknown"); used += snprintf(&outmsg[used], 1024 - used, ":%s]", "unknown");
if (used >= 1024) goto out;
break; break;
} }
@ -238,26 +247,35 @@ mca_btl_tcp_endpoint_dump(int level,
#endif #endif
used += snprintf(&outmsg[used], 1024 - used, " nodelay %d sndbuf %d rcvbuf %d flags %08x", used += snprintf(&outmsg[used], 1024 - used, " nodelay %d sndbuf %d rcvbuf %d flags %08x",
nodelay, sndbuf, rcvbuf, flags); nodelay, sndbuf, rcvbuf, flags);
if (used >= 1024) goto out;
#if MCA_BTL_TCP_ENDPOINT_CACHE #if MCA_BTL_TCP_ENDPOINT_CACHE
used += snprintf(&outmsg[used], 1024 - used, "\n\t[cache %p used %lu/%lu]", used += snprintf(&outmsg[used], 1024 - used, "\n\t[cache %p used %lu/%lu]",
btl_endpoint->endpoint_cache, btl_endpoint->endpoint_cache_pos - btl_endpoint->endpoint_cache, btl_endpoint->endpoint_cache, btl_endpoint->endpoint_cache_pos - btl_endpoint->endpoint_cache,
btl_endpoint->endpoint_cache_length); btl_endpoint->endpoint_cache_length);
if (used >= 1024) goto out;
#endif /* MCA_BTL_TCP_ENDPOINT_CACHE */ #endif /* MCA_BTL_TCP_ENDPOINT_CACHE */
used += snprintf(&outmsg[used], 1024 - used, "{%s - retries %d}", used += snprintf(&outmsg[used], 1024 - used, "{%s - retries %d}",
(btl_endpoint->endpoint_nbo ? "NBO" : ""), (int)btl_endpoint->endpoint_retries); (btl_endpoint->endpoint_nbo ? "NBO" : ""), (int)btl_endpoint->endpoint_retries);
if (used >= 1024) goto out;
} }
used += snprintf(&outmsg[used], 1024 - used, "\n"); used += snprintf(&outmsg[used], 1024 - used, "\n");
if (used >= 1024) goto out;
if( NULL != btl_endpoint->endpoint_recv_frag ) if( NULL != btl_endpoint->endpoint_recv_frag )
used += mca_btl_tcp_frag_dump(btl_endpoint->endpoint_recv_frag, "active recv", used += mca_btl_tcp_frag_dump(btl_endpoint->endpoint_recv_frag, "active recv",
&outmsg[used], 1024 - used); &outmsg[used], 1024 - used);
if (used >= 1024) goto out;
if( NULL != btl_endpoint->endpoint_send_frag ) if( NULL != btl_endpoint->endpoint_send_frag )
used += mca_btl_tcp_frag_dump(btl_endpoint->endpoint_send_frag, "active send (inaccurate iov)", used += mca_btl_tcp_frag_dump(btl_endpoint->endpoint_send_frag, "active send (inaccurate iov)",
&outmsg[used], 1024 - used); &outmsg[used], 1024 - used);
if (used >= 1024) goto out;
OPAL_LIST_FOREACH(item, &btl_endpoint->endpoint_frags, mca_btl_tcp_frag_t) { OPAL_LIST_FOREACH(item, &btl_endpoint->endpoint_frags, mca_btl_tcp_frag_t) {
used += mca_btl_tcp_frag_dump(item, "pending send", &outmsg[used], 1024 - used); used += mca_btl_tcp_frag_dump(item, "pending send", &outmsg[used], 1024 - used);
if (used >= 1024) goto out;
} }
out:
outmsg[1023] = '\0';
opal_output_verbose(level, opal_btl_base_framework.framework_output, opal_output_verbose(level, opal_btl_base_framework.framework_output,
"[%s:%d:%s][%s -> %s] %s", "[%s:%d:%s][%s -> %s] %s",
fname, lineno, funcname, fname, lineno, funcname,

8
opal/mca/btl/tcp/btl_tcp_frag.c
Просмотреть файл

@ -13,6 +13,8 @@
* Copyright (c) 2008-2012 Oracle and/or all its affiliates. All rights reserved. * Copyright (c) 2008-2012 Oracle and/or all its affiliates. All rights reserved.
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights * Copyright (c) 2014 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -90,14 +92,16 @@ OBJ_CLASS_INSTANCE(
size_t mca_btl_tcp_frag_dump(mca_btl_tcp_frag_t* frag, char* msg, char* buf, size_t length) size_t mca_btl_tcp_frag_dump(mca_btl_tcp_frag_t* frag, char* msg, char* buf, size_t length)
{ {
int i, used = 0; int i, used;
used += snprintf(&buf[used], length - used, "%s frag %p iov_cnt %d iov_idx %d size %lu\n", used = snprintf(buf, length, "%s frag %p iov_cnt %d iov_idx %d size %lu\n",
msg, (void*)frag, (int)frag->iov_cnt, (int)frag->iov_idx, frag->size); msg, (void*)frag, (int)frag->iov_cnt, (int)frag->iov_idx, frag->size);
if (used >= length) return length;
for( i = 0; i < (int)frag->iov_cnt; i++ ) { for( i = 0; i < (int)frag->iov_cnt; i++ ) {
used += snprintf(&buf[used], length - used, "[%s%p:%lu] ", used += snprintf(&buf[used], length - used, "[%s%p:%lu] ",
(i < (int)frag->iov_idx ? "*" : ""), (i < (int)frag->iov_idx ? "*" : ""),
frag->iov[i].iov_base, frag->iov[i].iov_len); frag->iov[i].iov_base, frag->iov[i].iov_len);
if (used >= length) return length;
} }
return used; return used;
} }

2
opal/mca/btl/ugni/btl_ugni_endpoint.c
Просмотреть файл

@ -77,8 +77,10 @@ int mca_btl_ugni_ep_disconnect (mca_btl_base_endpoint_t *ep, bool send_disconnec
(void) opal_common_ugni_ep_destroy (&ep->rdma_ep_handle); (void) opal_common_ugni_ep_destroy (&ep->rdma_ep_handle);
OPAL_THREAD_UNLOCK(&ep->common->dev->dev_lock); OPAL_THREAD_UNLOCK(&ep->common->dev->dev_lock);
if (ep->mailbox) {
OMPI_FREE_LIST_RETURN_MT(&ep->btl->smsg_mboxes, ((ompi_free_list_item_t *) ep->mailbox)); OMPI_FREE_LIST_RETURN_MT(&ep->btl->smsg_mboxes, ((ompi_free_list_item_t *) ep->mailbox));
ep->mailbox = NULL; ep->mailbox = NULL;
}
ep->state = MCA_BTL_UGNI_EP_STATE_INIT; ep->state = MCA_BTL_UGNI_EP_STATE_INIT;

2
opal/mca/btl/ugni/btl_ugni_module.c
Просмотреть файл

@ -166,6 +166,7 @@ mca_btl_ugni_module_finalize (struct mca_btl_base_module_t *btl)
BTL_ERROR(("error tearing down RX SMSG CQ - %s",gni_err_str[rc])); BTL_ERROR(("error tearing down RX SMSG CQ - %s",gni_err_str[rc]));
} }
if (mca_btl_ugni_component.progress_thread_enabled) {
rc = GNI_CqDestroy (ugni_module->rdma_local_irq_cq); rc = GNI_CqDestroy (ugni_module->rdma_local_irq_cq);
if (GNI_RC_SUCCESS != rc) { if (GNI_RC_SUCCESS != rc) {
BTL_ERROR(("error tearing down local BTE/FMA CQ - %s",gni_err_str[rc])); BTL_ERROR(("error tearing down local BTE/FMA CQ - %s",gni_err_str[rc]));
@ -175,6 +176,7 @@ mca_btl_ugni_module_finalize (struct mca_btl_base_module_t *btl)
if (GNI_RC_SUCCESS != rc) { if (GNI_RC_SUCCESS != rc) {
BTL_ERROR(("error tearing down remote SMSG CQ - %s",gni_err_str[rc])); BTL_ERROR(("error tearing down remote SMSG CQ - %s",gni_err_str[rc]));
} }
}
/* cancel wildcard post */ /* cancel wildcard post */
rc = GNI_EpPostDataCancelById (ugni_module->wildcard_ep, rc = GNI_EpPostDataCancelById (ugni_module->wildcard_ep,

2
opal/mca/btl/vader/btl_vader_xpmem.c
Просмотреть файл

@ -27,7 +27,7 @@ int mca_btl_vader_xpmem_init (void)
} }
mca_btl_vader.super.btl_get = mca_btl_vader_get_xpmem; mca_btl_vader.super.btl_get = mca_btl_vader_get_xpmem;
mca_btl_vader.super.btl_put = mca_btl_vader_get_xpmem; mca_btl_vader.super.btl_put = mca_btl_vader_put_xpmem;
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }