diff --git a/configure.ac b/configure.ac
index 314035375d66c53daf8cb1a35ded548d6563026a..3f150457bde3a3c3b0cad778d85df92e9a0aa9cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
#
# License: see file COPYING in top level of source distribution.
#
-AC_INIT([H5hut], [2.0.0rc6], [h5part@lists.psi.ch], H5hut)
+AC_INIT([H5hut], [2.0.0rc7], [h5part@lists.psi.ch], H5hut)
AC_PREREQ(2.60)
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/h5core/h5_file.c b/src/h5core/h5_file.c
index 1ac7e5f9a35777a393a400c6a6f649cce2672fc5..869bc96cd8641d8922b72e97fb5e63b2832a2b76 100644
--- a/src/h5core/h5_file.c
+++ b/src/h5core/h5_file.c
@@ -92,7 +92,7 @@ mpi_init (
TRY (hdf5_set_fapl_mpiposix_property (f->props->access_prop,
f->props->comm, use_gpfs));
- } else if ((f->props->flags & H5_VFD_CORE)) {
+ } else if ((f->props->flags & H5_VFD_CORE_IO)) {
h5_info("Selecting CORE VFD");
TRY (hdf5_set_fapl_core (f->props->access_prop,
f->props->align, 1));
@@ -112,7 +112,7 @@ mpi_init (
}
#else
// VFD_MPIO_POSIX has been removed in HDF5 1.8.13
- if ((f->props->flags & H5_VFD_CORE)) {
+ if ((f->props->flags & H5_VFD_CORE_IO)) {
h5_info("Selecting CORE VFD");
TRY (hdf5_set_fapl_core (f->props->access_prop,
f->props->align, 1));
@@ -197,7 +197,7 @@ h5_set_prop_file_mpio_collective (
(long long int)props->class);
}
#ifdef H5_HAVE_PARALLEL
- props->flags &= ~(H5_VFD_MPIO_POSIX | H5_VFD_MPIO_INDEPENDENT | H5_VFD_CORE);
+ props->flags &= ~(H5_VFD_MPIO_POSIX | H5_VFD_MPIO_INDEPENDENT | H5_VFD_CORE_IO);
props->flags |= H5_VFD_MPIO_COLLECTIVE;
props->comm = *comm;
if (props->throttle > 0) {
@@ -225,7 +225,7 @@ h5_set_prop_file_mpio_independent (
(long long int)props->class);
}
#ifdef H5_HAVE_PARALLEL
- props->flags &= ~(H5_VFD_MPIO_COLLECTIVE | H5_VFD_MPIO_POSIX | H5_VFD_CORE);
+ props->flags &= ~(H5_VFD_MPIO_COLLECTIVE | H5_VFD_MPIO_POSIX | H5_VFD_CORE_IO);
props->flags |= H5_VFD_MPIO_INDEPENDENT;
props->comm = *comm;
#else
@@ -250,7 +250,7 @@ h5_set_prop_file_mpio_posix (
(long long int)props->class);
}
#ifdef H5_HAVE_PARALLEL
- props->flags &= ~(H5_VFD_MPIO_COLLECTIVE | H5_VFD_MPIO_POSIX | H5_VFD_CORE);
+ props->flags &= ~(H5_VFD_MPIO_COLLECTIVE | H5_VFD_MPIO_POSIX | H5_VFD_CORE_IO);
props->flags |= H5_VFD_MPIO_INDEPENDENT;
props->comm = *comm;
#else
diff --git a/src/h5core/private/h5_attribs.h b/src/h5core/private/h5_attribs.h
index a1bfb7e1480730c279ada639cf65dab744a85ce2..abdac3004d50a29ed0aa92a4da93cb01b0a1c15f 100644
--- a/src/h5core/private/h5_attribs.h
+++ b/src/h5core/private/h5_attribs.h
@@ -99,7 +99,7 @@ h5priv_write_attrib (
attrib_name,
(long long int)attrib_type,
attrib_value,
- attrib_nelem);
+ (long long unsigned)attrib_nelem);
hid_t space_id;
hid_t attrib_id;
hid_t hdf5_type;
@@ -147,7 +147,7 @@ h5priv_append_attrib (
attrib_name,
(long long int)attrib_type,
attrib_value,
- attrib_nelem);
+ (long long unsigned)attrib_nelem);
h5_err_t exists;
TRY (exists = hdf5_attribute_exists (id, attrib_name));
if (exists) {
diff --git a/src/h5core/private/h5_file.h b/src/h5core/private/h5_file.h
index 17da2bbf6951acee011d6e1285ccb921aae3c47f..39e1819bca1c0d1975f80cd93bf8ecb9e4e6b566 100644
--- a/src/h5core/private/h5_file.h
+++ b/src/h5core/private/h5_file.h
@@ -9,7 +9,7 @@
#define H5_VFD_MPIO_POSIX 0x00000010
#define H5_VFD_MPIO_INDEPENDENT 0x00000020
#define H5_VFD_MPIO_COLLECTIVE 0x00000040
-#define H5_VFD_CORE 0x00000080
+#define H5_VFD_CORE_IO 0x00000080
#define H5_FLUSH_FILE 0x00001000
#define H5_FLUSH_ITERATION 0x00002000
diff --git a/src/h5core/private/h5_hdf5.c b/src/h5core/private/h5_hdf5.c
index 59b766dce25ee32efaba328fff9621ce8fc5d0dc..e8c545cc555fa54fe18cdfd6e7035c1a2ed27fa4 100644
--- a/src/h5core/private/h5_hdf5.c
+++ b/src/h5core/private/h5_hdf5.c
@@ -110,10 +110,18 @@ iter_op_get_obj_type (
name);
return H5O_TYPE_UNKNOWN;
}
+#if H5_VERSION_GE(1,12,0)
+ herr = H5Oget_info(obj_id, &objinfo, H5O_INFO_ALL);
+#else
herr = H5Oget_info(obj_id, &objinfo);
+#endif
}
else { // H5L_TYPE_HARD
+#if H5_VERSION_GE(1,12,0)
+ herr = H5Oget_info_by_name(g_id, name, &objinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+#else
herr = H5Oget_info_by_name(g_id, name, &objinfo, H5P_DEFAULT);
+#endif
}
if (herr < 0) {
@@ -245,7 +253,8 @@ hdf5_get_name_of_group_by_idx (
HDF5_WRAPPER_ENTER (h5_err_t,
"loc_id=%lld (%s), idx=%llu, name=%p, len=%llu",
(long long int)loc_id, hdf5_get_objname (loc_id),
- idx, name, (unsigned long long)len);
+ (long long unsigned)idx,
+ name, (unsigned long long)len);
op_data_t op_data;
memset (&op_data, 0, sizeof (op_data));
op_data.type = H5O_TYPE_GROUP;
@@ -304,7 +313,8 @@ hdf5_get_name_of_dataset_by_idx (
HDF5_WRAPPER_ENTER (h5_err_t,
"loc_id=%lld (%s), idx=%llu, name=%p, len=%llu",
(long long int)loc_id, hdf5_get_objname (loc_id),
- idx, name, (unsigned long long)len);
+ (long long unsigned)idx,
+ name, (unsigned long long)len);
op_data_t op_data;
memset (&op_data, 0, sizeof (op_data));
op_data.type = H5O_TYPE_DATASET;
diff --git a/src/h5core/private/h5_hdf5.h b/src/h5core/private/h5_hdf5.h
index 2e2d6c34c08ca648b6bc7347e61fddbc34bb3497..17ce1b6aeca5a8f5bcfa4a0cb48332103f1a53aa 100644
--- a/src/h5core/private/h5_hdf5.h
+++ b/src/h5core/private/h5_hdf5.h
@@ -718,7 +718,7 @@ hdf5_set_dataset_extent (
"dataset_id=%lld (%s), size=%llu",
(long long int)dataset_id,
hdf5_get_objname(dataset_id),
- *size);
+ (long long unsigned int)*size);
if (H5Dset_extent(dataset_id, size) < 0) {
H5_RETURN_ERROR (
H5_ERR_HDF5,
@@ -873,7 +873,7 @@ static inline hid_t
hdf5_create_string_type(
const hsize_t len
) {
- HDF5_WRAPPER_ENTER (hid_t, "len = %llu", len);
+ HDF5_WRAPPER_ENTER (hid_t, "len = %llu", (long long unsigned)len);
hid_t type_id = H5Tcopy (H5T_C_S1);
if (type_id < 0)
H5_RETURN_ERROR (
@@ -1003,7 +1003,7 @@ hdf5_set_chunk_property (
) {
HDF5_WRAPPER_ENTER (h5_err_t,
"plist=%lld, rank=%d, dims[0]=%llu ...",
- (long long int)plist, rank, dims[0]);
+ (long long int)plist, rank, (long long unsigned)dims[0]);
if (H5Pset_chunk (plist, rank, dims) < 0)
H5_RETURN_ERROR (
H5_ERR_HDF5,
@@ -1146,7 +1146,8 @@ hdf5_set_btree_ik_property (
) {
HDF5_WRAPPER_ENTER (h5_err_t,
"fapl_id=%lld, btree_ik=%llu",
- (long long int)fcpl_id, btree_ik);
+ (long long int)fcpl_id,
+ (long long unsigned)btree_ik);
if (H5Pset_istore_k (fcpl_id, btree_ik) < 0)
H5_RETURN_ERROR (
H5_ERR_HDF5,
@@ -1164,13 +1165,16 @@ hdf5_set_alignment_property (
) {
HDF5_WRAPPER_ENTER (h5_err_t,
"plist=%lld, threshold=%llu, alignment=%llu",
- (long long int)plist, threshold, alignment);
+ (long long int)plist,
+ (long long unsigned)threshold,
+ (long long unsigned)alignment);
if (H5Pset_alignment (plist, threshold, alignment) < 0)
H5_RETURN_ERROR (
H5_ERR_HDF5,
"Cannot set alignment property to %llu "
"and threshold %llu",
- alignment, threshold);
+ (long long unsigned)alignment,
+ (long long unsigned)threshold);
H5_RETURN (H5_SUCCESS);
}
@@ -1181,12 +1185,13 @@ hdf5_set_meta_block_size (
) {
HDF5_WRAPPER_ENTER (h5_err_t,
"fapl_id=%lld, size=%llu",
- (long long int)fapl_id, size);
+ (long long int)fapl_id,
+ (long long unsigned)size);
if (H5Pset_meta_block_size (fapl_id, size) < 0)
H5_RETURN_ERROR (
H5_ERR_HDF5,
"Cannot set meta block size property to %llu",
- size);
+ (long long unsigned)size);
H5_RETURN (H5_SUCCESS);
}
@@ -1292,9 +1297,15 @@ hdf5_close_file (
for (ssize_t i = 0; i < max_objs; i++) {
hid_t object_id = obj_id_list [i];
h5_debug ("Open object: %lld", (long long)object_id);
+#if H5_VERSION_GE(1,12,0)
+ H5O_info_t object_info;
+ if (H5Oget_info (object_id, &object_info, H5O_INFO_ALL) < 0)
+ continue;
+#else
H5O_info_t object_info;
if (H5Oget_info (object_id, &object_info) < 0)
continue;
+#endif
switch (object_info.type) {
case H5O_TYPE_GROUP:
case H5O_TYPE_DATASET:
diff --git a/src/include/H5_const.f90 b/src/include/H5_const.f90
index c0861f5413cc5c1c77c4dfd84e805402a04e9e9c..a17efcf3031b751197207ee85341654930e275f7 100644
--- a/src/include/H5_const.f90
+++ b/src/include/H5_const.f90
@@ -13,7 +13,8 @@
INTEGER*8, PARAMETER :: H5_VFD_MPIPOSIX = Z'00000010'
INTEGER*8, PARAMETER :: H5_VFD_MPIIO_IND = Z'00000020'
- INTEGER*8, PARAMETER :: H5_VFD_CORE = Z'00000040'
+ INTEGER*8, PARAMETER :: H5_VFD_MPIIO_COL = Z'00000040'
+ INTEGER*8, PARAMETER :: H5_VFD_CORE_IO = Z'00000080'
INTEGER*8, PARAMETER :: H5_PROP_DEFAULT = 0
diff --git a/test/testframe.c b/test/testframe.c
index cbd88733dfaade2a5620e7c40cb339fce81559f3..c5210437bb552045a1584f7877dd7b09b3f2ddbe 100644
--- a/test/testframe.c
+++ b/test/testframe.c
@@ -658,7 +658,11 @@ test_open_objects(h5_file_t file, int max_objects)
H5O_info_t info;
int i;
for (i=0; i<nopen; i++) {
- H5Oget_info(list[i], &info);
+#if H5_VERSION_GE(1,12,0)
+ H5Oget_info(list[i], &info, H5O_INFO_BASIC);
+#else
+ H5Oget_info(list[i], &info);
+#endif
switch (info.type) {
case H5O_TYPE_GROUP:
TestErrPrintf("obj%d has type GROUP\n", i);