Skip to content

Set subfiling vfd default enabled=ON #5518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lrknox wants to merge 8 commits into from
Closed

Set subfiling vfd default enabled=ON #5518

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f51d272
Made Subfiling VFD default enabled when parallel is enabled and not on
lrknox May 6, 2025
93b9bd0
Merge branch 'develop' of https://github.com/HDFGroup/hdf5 into subfi…
lrknox May 6, 2025
70b0d6c
Correct syntax in condition list for older CMake versions.
lrknox May 8, 2025
55406e4
Merge branch 'develop' of https://github.com/HDFGroup/hdf5 into subfi…
lrknox Jun 3, 2025
604a563
Merge branch 'develop' of https://github.com/HDFGroup/hdf5 into subfi…
lrknox Jun 20, 2025
dd892cf
Merge branch 'develop' of https://github.com/HDFGroup/hdf5 into subfi…
lrknox Jun 29, 2025
e4ae046
Disable subfiling_vfd until MPI_Init_thread error on a NULL communicator
lrknox Jun 29, 2025
2b8bd71
Move comment.
lrknox Jun 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ else()
set (HDF5_EXTERNALLY_CONFIGURED 1)
endif()
endif()
include (CMakeDependentOption)
#-----------------------------------------------------------------------------
# Instructions for use : Sub-Project Build
#
Expand Down Expand Up @@ -835,32 +836,18 @@ set (HDF5_SRC_INCLUDE_DIRS
${HDF5_SRC_INCLUDE_DIRS}
${H5FD_SUBFILING_DIR}
)
option (HDF5_ENABLE_SUBFILING_VFD "Build Parallel HDF5 Subfiling VFD" OFF)
cmake_dependent_option(HDF5_ENABLE_SUBFILING_VFD "Build Parallel HDF5 Subfiling VFD" ON "HDF5_ENABLE_PARALLEL AND NOT WIN32" OFF)
Copy link
Collaborator

@jhendersonHDF jhendersonHDF May 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, it looks like this syntax for the condition is only supported as of CMake 3.22 and otherwise has to be a semicolon-separated list.

Copy link
Contributor

@byrnHDF byrnHDF May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are still on 3.18 then we need to use the semis

Copy link
Collaborator Author

@lrknox lrknox May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will fix this.

if (HDF5_ENABLE_SUBFILING_VFD)
if (WIN32)
Copy link
Collaborator

@jhendersonHDF jhendersonHDF May 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this check is still needed. cmake_dependent_option just hides the option, but someone could still set it on Win32.

Copy link
Contributor

@byrnHDF byrnHDF May 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to know for sure - as I believe the documentation states:
"condition": A boolean expression involving other CMake options. It must evaluate to true or false.
Of course NOT WIN32 might not evaluate correctly. Then we would need to add if NOT WIN32 around the whole block.

Copy link
Collaborator

@jhendersonHDF jhendersonHDF May 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I mean is that CMake hides the option, but I don't think that means it's actually gone. I think it's similar to just being marked with mark_as_advanced().

Copy link
Contributor

@byrnHDF byrnHDF May 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it hides the option but the condition forces a value if it is hidden

Copy link
Collaborator Author

@lrknox lrknox May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran " ccmake -DMPIEXEC_PREFLAGS:STRING="-n;6" -DHDF5_ENABLE_SUBFILING_VFD=ON ../lrk-hdf5", then configured without any other changes. The subfiling vfd option was missing and libhdf5.settings reported Subfiling VFD OFF.

message (FATAL_ERROR " **** Subfiling is not supported on Windows **** ")
endif ()
if (NOT HDF5_ENABLE_PARALLEL)
message (FATAL_ERROR "Subfiling VFD requires a parallel HDF5 build")
else ()
# Make sure we found MPI_Comm_split_type previously
if (NOT H5_HAVE_MPI_Comm_split_type)
message (FATAL_ERROR "Subfiling VFD requires MPI-3 support for MPI_Comm_split_type")
endif ()
if (NOT H5_HAVE_MPI_Comm_split_type)
message (FATAL_ERROR "Subfiling VFD requires MPI-3 support for MPI_Comm_split_type")
endif ()

# Subfiling requires thread operations
if (NOT Threads_FOUND)
message (FATAL_ERROR "Subfiling requires thread operations support")
endif ()

set (H5_HAVE_SUBFILING_VFD 1)
# IOC VFD is currently only built when subfiling is enabled
set (H5_HAVE_IOC_VFD 1)

if(NOT H5_HAVE_SUBFILING_VFD EQUAL 1)
set (HDF5_ENABLE_SUBFILING_VFD OFF CACHE BOOL "Build Parallel HDF5 Subfiling VFD" FORCE)
endif()
endif()


Expand Down
2 changes: 1 addition & 1 deletion doxygen/Doxyfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ SORT_MEMBER_DOCS = YES
# this will also influence the order of the classes in the class list.
# The default value is: NO.

SORT_BRIEF_DOCS = NO
SORT_BRIEF_DOCS = YES

# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then Doxygen will sort the
# (brief and detailed) documentation of class members so that constructors and
Expand Down
Loading