Skip to content

Commit

Permalink
Closes #975 and #979 by setting HDF5-API to v110
Browse files Browse the repository at this point in the history
This enables compatibility between HDF5 1.10.x and 1.12.x
This also updates help_h5ls.c to use the proxied HDF5 API functions.
  • Loading branch information
glitch committed Nov 30, 2021
1 parent d7f3544 commit 402f359
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ default: $(DEFAULT_TARGET)
VERBOSE ?= 0

CHPL := chpl

# We need to make the HDF5 API use the 1.10.x version for compatibility between 1.10 and 1.12
CHPL_FLAGS += --ccflags="-DH5_USE_110_API"

CHPL_DEBUG_FLAGS += --print-passes
ifdef ARKOUDA_DEVELOPER
CHPL_FLAGS += --ccflags="-O1"
Expand Down Expand Up @@ -248,6 +252,7 @@ else
ARKOUDA_COMPAT_MODULES += -M $(ARKOUDA_SOURCE_DIR)/compat/lt-125
endif

# This is the main compilation statement section
$(ARKOUDA_MAIN_MODULE): check-deps $(ARROW_O) $(ARKOUDA_SOURCES) $(ARKOUDA_MAKEFILES)
$(CHPL) $(CHPL_DEBUG_FLAGS) $(PRINT_PASSES_FLAGS) $(REGEX_MAX_CAPTURES_FLAG) $(OPTIONAL_SERVER_FLAGS) $(CHPL_FLAGS_WITH_VERSION) $(ARKOUDA_MAIN_SOURCE) $(ARKOUDA_COMPAT_MODULES) -o $@

Expand Down
3 changes: 2 additions & 1 deletion src/c_helpers/help_h5ls.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ herr_t c_get_HDF5_obj_type(hid_t loc_id, const char *name, H5O_type_t *obj_type)
{
herr_t status;
H5O_info_t info_t;
status = H5Oget_info_by_name1(loc_id, name, &info_t, H5P_DEFAULT);
H5O_info_t* info_t_ptr = &info_t;
status = H5Oget_info_by_name(loc_id, name, info_t_ptr, H5P_DEFAULT);
*obj_type = info_t.type;
return status;
}
Expand Down

0 comments on commit 402f359

Please sign in to comment.