Skip to content

Commit 56dbd09

Browse files
committed
io/ompio: remove the special handling of Lustre in the selection logic
ompio is now the default on Lustre as well Signed-off-by: Edgar Gabriel <[email protected]>
1 parent aa2d21e commit 56dbd09

File tree

1 file changed

+2
-34
lines changed

1 file changed

+2
-34
lines changed

ompi/mca/io/ompio/io_ompio_component.c

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* University of Stuttgart. All rights reserved.
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
13-
* Copyright (c) 2008-2019 University of Houston. All rights reserved.
13+
* Copyright (c) 2008-2020 University of Houston. All rights reserved.
1414
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2015-2018 Research Organization for Information Science
@@ -302,42 +302,11 @@ file_query(struct ompi_file_t *file,
302302
int *priority)
303303
{
304304
mca_common_ompio_data_t *data;
305-
char *tmp;
306-
int rank;
307-
int is_lustre=0; //false
308-
309-
tmp = strchr (file->f_filename, ':');
310-
rank = ompi_comm_rank ( file->f_comm);
311-
if (!tmp) {
312-
if ( 0 == rank) {
313-
if (LUSTRE == mca_fs_base_get_fstype(file->f_filename)) {
314-
is_lustre = 1; //true
315-
}
316-
}
317-
318-
file->f_comm->c_coll->coll_bcast (&is_lustre,
319-
1,
320-
MPI_INT,
321-
0,
322-
file->f_comm,
323-
file->f_comm->c_coll->coll_bcast_module);
324-
}
325-
else {
326-
if (!strncasecmp(file->f_filename, "lustre:", 7) ) {
327-
is_lustre = 1;
328-
}
329-
}
330305

331-
if (is_lustre) {
332-
*priority = 1;
333-
}
334-
else {
335-
*priority = priority_param;
336-
}
306+
*priority = priority_param;
337307

338308
/* Allocate a space for this module to hang private data (e.g.,
339309
the OMPIO file handle) */
340-
341310
data = calloc(1, sizeof(mca_common_ompio_data_t));
342311
if (NULL == data) {
343312
return NULL;
@@ -346,7 +315,6 @@ file_query(struct ompi_file_t *file,
346315
*private_data = (struct mca_io_base_file_t*) data;
347316

348317
/* All done */
349-
350318
return &mca_io_ompio_module;
351319
}
352320

0 commit comments

Comments
 (0)