Add patch to properly call MPI_Finalize() in t_pflush1
This commit is contained in:
parent
a3f8aad740
commit
78ddcff82b
29
hdf5-mpi.patch
Normal file
29
hdf5-mpi.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
diff -up hdf5-1.8.16/testpar/t_pflush1.c.mpi hdf5-1.8.16/testpar/t_pflush1.c
|
||||||
|
--- hdf5-1.8.16/testpar/t_pflush1.c.mpi 2015-10-23 23:13:44.000000000 -0600
|
||||||
|
+++ hdf5-1.8.16/testpar/t_pflush1.c 2016-03-20 21:46:42.089409776 -0600
|
||||||
|
@@ -171,6 +171,7 @@ main(int argc, char* argv[])
|
||||||
|
* because MPI_File_close wants to modify the file-handle variable.
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#if 0
|
||||||
|
/* close file1 */
|
||||||
|
if(H5Fget_vfd_handle(file1, fapl, (void **)&mpifh_p) < 0) {
|
||||||
|
printf("H5Fget_vfd_handle for file1 failed\n");
|
||||||
|
@@ -189,14 +190,17 @@ main(int argc, char* argv[])
|
||||||
|
printf("MPI_File_close for file2 failed\n");
|
||||||
|
goto error;
|
||||||
|
} /* end if */
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
fflush(stdout);
|
||||||
|
fflush(stderr);
|
||||||
|
+ MPI_Finalize();
|
||||||
|
HD_exit(0);
|
||||||
|
|
||||||
|
error:
|
||||||
|
fflush(stdout);
|
||||||
|
fflush(stderr);
|
||||||
|
+ MPI_Finalize();
|
||||||
|
HD_exit(1);
|
||||||
|
}
|
||||||
|
|
@ -7,7 +7,7 @@
|
|||||||
# You need to recompile all users of HDF5 for each version change
|
# You need to recompile all users of HDF5 for each version change
|
||||||
Name: hdf5
|
Name: hdf5
|
||||||
Version: 1.8.16
|
Version: 1.8.16
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: A general purpose library and file format for storing scientific data
|
Summary: A general purpose library and file format for storing scientific data
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -18,6 +18,8 @@ Source1: h5comp
|
|||||||
# For man pages
|
# For man pages
|
||||||
Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.8.15-patch1+docs-5.debian.tar.xz
|
Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.8.15-patch1+docs-5.debian.tar.xz
|
||||||
Patch0: hdf5-LD_LIBRARY_PATH.patch
|
Patch0: hdf5-LD_LIBRARY_PATH.patch
|
||||||
|
# Properly run MPI_Finalize() in t_pflush1
|
||||||
|
Patch1: hdf5-mpi.patch
|
||||||
# Fix -Werror=format-security errors
|
# Fix -Werror=format-security errors
|
||||||
Patch2: hdf5-format.patch
|
Patch2: hdf5-format.patch
|
||||||
# Fix long double conversions on ppc64le
|
# Fix long double conversions on ppc64le
|
||||||
@ -149,6 +151,7 @@ HDF5 parallel openmpi static libraries
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -a 2 -n %{name}-%{version}%{?snaprel}
|
%setup -q -a 2 -n %{name}-%{version}%{?snaprel}
|
||||||
%patch0 -p1 -b .LD_LIBRARY_PATH
|
%patch0 -p1 -b .LD_LIBRARY_PATH
|
||||||
|
%patch1 -p1 -b .mpi
|
||||||
%patch2 -p1 -b .format
|
%patch2 -p1 -b .format
|
||||||
%patch3 -p1 -b .ldouble-ppc64le
|
%patch3 -p1 -b .ldouble-ppc64le
|
||||||
# Force shared by default for compiler wrappers (bug #1266645)
|
# Force shared by default for compiler wrappers (bug #1266645)
|
||||||
@ -419,6 +422,9 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Mar 20 2016 Orion Poplawski <orion@cora.nwra.com> - 1.8.16-4
|
||||||
|
- Add patch to properly call MPI_Finalize() in t_pflush1
|
||||||
|
|
||||||
* Wed Mar 2 2016 Orion Poplawski <orion@cora.nwra.com> - 1.8.16-3
|
* Wed Mar 2 2016 Orion Poplawski <orion@cora.nwra.com> - 1.8.16-3
|
||||||
- Make hdf5-mpich-devel require mpich-devel (bug #1314091)
|
- Make hdf5-mpich-devel require mpich-devel (bug #1314091)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user