Skip to content

Commit 0368c82

Browse files
committed
deprecate configure option --disable-file-sync
1 parent 0af1d26 commit 0368c82

File tree

2 files changed

+1
-31
lines changed

2 files changed

+1
-31
lines changed

configure.ac

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ AH_TEMPLATE([NF_INT8_IS_C_], [C type for Fortran INT8])
130130
AH_TEMPLATE([NF_INT8_T], [Type for Fortran INT8])
131131
AH_TEMPLATE([NF_REAL_IS_C_], [C type for Fortran REAL])
132132
AH_TEMPLATE([NO_IEEE_FLOAT], [Does system have IEEE FLOAT])
133-
AH_TEMPLATE([DISABLE_FILE_SYNC], [Define if to disable MPI_File_sync])
134133
dnl AH_TEMPLATE([ENABLE_IN_PLACE_SWAP], [Define if to enable in-place byte swap])
135134
dnl AH_TEMPLATE([DISABLE_IN_PLACE_SWAP],[Define if to disable in-place byte swap])
136135
AH_TEMPLATE([ENABLE_SUBFILING], [Define if to enable subfiling feature])
@@ -2221,16 +2220,6 @@ AC_SUBST(LATEX)
22212220
AC_SUBST(DVIPDF)
22222221
AM_CONDITIONAL([HAS_LATEX], [test "x$has_latex" = xyes])
22232222

2224-
AC_ARG_ENABLE([file-sync],
2225-
[AS_HELP_STRING([--disable-file-sync],
2226-
[Disable MPI file sync if you know your file system can
2227-
provide data consistency. @<:@default: enabled@:>@])],
2228-
[file_sync=${enableval}], [file_sync=yes]
2229-
)
2230-
if test "x${file_sync}" = xno ; then
2231-
AC_DEFINE(DISABLE_FILE_SYNC)
2232-
fi
2233-
22342223
AC_ARG_ENABLE([large-single-req],
22352224
[AS_HELP_STRING([--enable-large-single-req],
22362225
[Enable large (> 2 GiB) single request in individual MPI-IO

src/drivers/ncmpio/ncmpio_sync.c

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
*/
3434
int
3535
ncmpio_file_sync(NC *ncp) {
36-
#ifndef DISABLE_FILE_SYNC
3736
int mpireturn;
3837

3938
if (ncp->independent_fh != MPI_FILE_NULL) {
@@ -49,7 +48,7 @@ ncmpio_file_sync(NC *ncp) {
4948
return ncmpii_error_mpi2nc(mpireturn, "MPI_File_sync");
5049

5150
TRACE_COMM(MPI_Barrier)(ncp->comm);
52-
#endif
51+
5352
return NC_NOERR;
5453
}
5554

@@ -205,24 +204,6 @@ ncmpio_sync_numrecs(void *ncdp)
205204
/* clear numrecs dirty bit */
206205
fClr(ncp->flags, NC_NDIRTY);
207206

208-
#ifndef DISABLE_FILE_SYNC
209-
if (NC_doFsync(ncp)) { /* NC_SHARE is set */
210-
int mpierr, mpireturn;
211-
if (NC_indep(ncp)) {
212-
TRACE_IO(MPI_File_sync)(ncp->independent_fh);
213-
}
214-
else {
215-
TRACE_IO(MPI_File_sync)(ncp->collective_fh);
216-
}
217-
if (mpireturn != MPI_SUCCESS) {
218-
mpierr = ncmpii_error_mpi2nc(mpireturn, "MPI_File_sync");
219-
if (status == NC_NOERR) status = mpierr;
220-
}
221-
TRACE_COMM(MPI_Barrier)(ncp->comm);
222-
if (mpireturn != MPI_SUCCESS)
223-
return ncmpii_error_mpi2nc(mpireturn, "MPI_Barrier");
224-
}
225-
#endif
226207
return status;
227208
}
228209

0 commit comments

Comments
 (0)