diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2021-12-06 16:39:22 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-06 16:39:22 (GMT) |
commit | 65b1670861c62228cc68f98d4356edd180cfcb1f (patch) | |
tree | efed6221a60ef59c96975e7af0b8fe15af772203 /src/H5FDmpio.c | |
parent | ad953381fd3bc980547cf1594dbb5be98a316477 (diff) | |
download | hdf5-65b1670861c62228cc68f98d4356edd180cfcb1f.zip hdf5-65b1670861c62228cc68f98d4356edd180cfcb1f.tar.gz hdf5-65b1670861c62228cc68f98d4356edd180cfcb1f.tar.bz2 |
Merge branch 'selection_io' into selection_io_with_subfiling_vfd (#1265)
Diffstat (limited to 'src/H5FDmpio.c')
-rw-r--r-- | src/H5FDmpio.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 145f2be..e492f4e 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -223,21 +223,22 @@ H5FD_mpio_init(void) FUNC_ENTER_NOAPI(H5I_INVALID_HID) /* Register the MPI-IO VFD, if it isn't already */ - if (H5I_VFL != H5I_get_type(H5FD_MPIO_g)) + if (H5I_VFL != H5I_get_type(H5FD_MPIO_g)) { H5FD_MPIO_g = H5FD_register((const H5FD_class_t *)&H5FD_mpio_g, sizeof(H5FD_class_t), FALSE); - /* Check if MPI driver has been loaded dynamically */ - env = HDgetenv(HDF5_DRIVER); - if (env && !HDstrcmp(env, "mpio")) { - int mpi_initialized = 0; - - /* Initialize MPI if not already initialized */ - if (MPI_SUCCESS != MPI_Initialized(&mpi_initialized)) - HGOTO_ERROR(H5E_VFL, H5E_UNINITIALIZED, H5I_INVALID_HID, "can't check if MPI is initialized") - if (!mpi_initialized) { - if (MPI_SUCCESS != MPI_Init(NULL, NULL)) - HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID, "can't initialize MPI") - H5FD_mpi_self_initialized = TRUE; + /* Check if MPI driver has been loaded dynamically */ + env = HDgetenv(HDF5_DRIVER); + if (env && !HDstrcmp(env, "mpio")) { + int mpi_initialized = 0; + + /* Initialize MPI if not already initialized */ + if (MPI_SUCCESS != MPI_Initialized(&mpi_initialized)) + HGOTO_ERROR(H5E_VFL, H5E_UNINITIALIZED, H5I_INVALID_HID, "can't check if MPI is initialized") + if (!mpi_initialized) { + if (MPI_SUCCESS != MPI_Init(NULL, NULL)) + HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID, "can't initialize MPI") + H5FD_mpi_self_initialized = TRUE; + } } } |