Skip to content
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

Add subfiling for h5dump filedriver option help message #3878

Merged
merged 7 commits into from
Mar 8, 2024
Merged

Add subfiling for h5dump filedriver option help message #3878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f2d320
Add subfiling for h5dump filedriver option help message
hyoklee Nov 30, 2023
839dcb0
Remove trailing spaces
hyoklee Nov 30, 2023
2e85810
Address CI failures
hyoklee Nov 30, 2023
0533942
Address @jhendersonHDF review. I won't update duplicate tests in pbit…
hyoklee Dec 14, 2023
f3a3e69
fix clang-format error
hyoklee Dec 14, 2023
1e761d4
Make all tests pass.
hyoklee Dec 20, 2023
98ae0a5
Make a minor change to run the failed netCDF CI again
hyoklee Feb 2, 2024
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
12 changes: 8 additions & 4 deletions tools/src/h5dump/h5dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,15 @@ usage(const char *prog)
" (Alternate compact form of subsetting is described in the Reference Manual)\n");
PRINTVALSTREAM(rawoutstream, "\n");
PRINTVALSTREAM(rawoutstream, "--------------- Option Argument Conventions ---------------\n");
PRINTVALSTREAM(rawoutstream, " D - is the file driver to use in opening the file. Acceptable values\n");
PRINTVALSTREAM(
rawoutstream,
" are \"sec2\", \"family\", \"split\", \"multi\", \"direct\", and \"stream\". Without\n");
PRINTVALSTREAM(rawoutstream, " the file driver flag, the file will be opened with each driver in\n");
" D - is the file driver to use in opening the file. Acceptable values are available from\n");
PRINTVALSTREAM(
rawoutstream,
" "
"https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html.\n");
Copy link
Collaborator

Choose a reason for hiding this comment

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

@bmribler @loricooperhdf Are the portal.hdfgroup.org urls in this PR going to remain, or will they need to be replaced?

Copy link
Collaborator

@lrknox lrknox Dec 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

They include "Hosted on GitHub Pages", so I assume they're probably going to be around.

Copy link
Contributor

Choose a reason for hiding this comment

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

@bmribler @loricooperhdf Are the portal.hdfgroup.org urls in this PR going to remain, or will they need to be replaced?

This url, https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html, is new and I assume it'll stay. Lori can confirm.

PRINTVALSTREAM(rawoutstream,
" Without the file driver flag, the file will be opened with each driver in\n");
PRINTVALSTREAM(rawoutstream, " turn and in the order specified above until one driver succeeds\n");
PRINTVALSTREAM(rawoutstream, " in opening the file.\n");
PRINTVALSTREAM(rawoutstream,
Expand Down Expand Up @@ -1469,7 +1473,7 @@ main(int argc, char *argv[])
xml_dtd_uri_g);
}
else {
/* TO DO: make -url option work in this case (may need new option) */
/* TODO: make -url option work in this case (may need new option) */
char *ns;
char *indx;

Expand Down
6 changes: 3 additions & 3 deletions tools/test/h5dump/expected/h5dump-help.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ usage: h5dump [OPTIONS] files
(Alternate compact form of subsetting is described in the Reference Manual)

--------------- Option Argument Conventions ---------------
D - is the file driver to use in opening the file. Acceptable values
are "sec2", "family", "split", "multi", "direct", and "stream". Without
the file driver flag, the file will be opened with each driver in
D - is the file driver to use in opening the file. Acceptable values are available from
https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html.
Without the file driver flag, the file will be opened with each driver in
turn and in the order specified above until one driver succeeds
in opening the file.
See examples below for family, split, and multi driver special file name usage.
Expand Down
6 changes: 3 additions & 3 deletions tools/test/h5dump/expected/pbits/tnofilename-with-packed-bits.ddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ usage: h5dump [OPTIONS] files
(Alternate compact form of subsetting is described in the Reference Manual)

--------------- Option Argument Conventions ---------------
D - is the file driver to use in opening the file. Acceptable values
are "sec2", "family", "split", "multi", "direct", and "stream". Without
the file driver flag, the file will be opened with each driver in
D - is the file driver to use in opening the file. Acceptable values are available from
https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html.
Without the file driver flag, the file will be opened with each driver in
turn and in the order specified above until one driver succeeds
in opening the file.
See examples below for family, split, and multi driver special file name usage.
Expand Down
6 changes: 3 additions & 3 deletions tools/test/h5dump/expected/pbits/tpbitsIncomplete.ddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ usage: h5dump [OPTIONS] files
(Alternate compact form of subsetting is described in the Reference Manual)

--------------- Option Argument Conventions ---------------
D - is the file driver to use in opening the file. Acceptable values
are "sec2", "family", "split", "multi", "direct", and "stream". Without
the file driver flag, the file will be opened with each driver in
D - is the file driver to use in opening the file. Acceptable values are available from
https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html.
Without the file driver flag, the file will be opened with each driver in
turn and in the order specified above until one driver succeeds
in opening the file.
See examples below for family, split, and multi driver special file name usage.
Expand Down
6 changes: 3 additions & 3 deletions tools/test/h5dump/expected/pbits/tpbitsLengthExceeded.ddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ usage: h5dump [OPTIONS] files
(Alternate compact form of subsetting is described in the Reference Manual)

--------------- Option Argument Conventions ---------------
D - is the file driver to use in opening the file. Acceptable values
are "sec2", "family", "split", "multi", "direct", and "stream". Without
the file driver flag, the file will be opened with each driver in
D - is the file driver to use in opening the file. Acceptable values are available from
https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html.
Without the file driver flag, the file will be opened with each driver in
turn and in the order specified above until one driver succeeds
in opening the file.
See examples below for family, split, and multi driver special file name usage.
Expand Down
6 changes: 3 additions & 3 deletions tools/test/h5dump/expected/pbits/tpbitsLengthPositive.ddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ usage: h5dump [OPTIONS] files
(Alternate compact form of subsetting is described in the Reference Manual)

--------------- Option Argument Conventions ---------------
D - is the file driver to use in opening the file. Acceptable values
are "sec2", "family", "split", "multi", "direct", and "stream". Without
the file driver flag, the file will be opened with each driver in
D - is the file driver to use in opening the file. Acceptable values are available from
https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html.
Without the file driver flag, the file will be opened with each driver in
turn and in the order specified above until one driver succeeds
in opening the file.
See examples below for family, split, and multi driver special file name usage.
Expand Down
6 changes: 3 additions & 3 deletions tools/test/h5dump/expected/pbits/tpbitsMaxExceeded.ddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ usage: h5dump [OPTIONS] files
(Alternate compact form of subsetting is described in the Reference Manual)

--------------- Option Argument Conventions ---------------
D - is the file driver to use in opening the file. Acceptable values
are "sec2", "family", "split", "multi", "direct", and "stream". Without
the file driver flag, the file will be opened with each driver in
D - is the file driver to use in opening the file. Acceptable values are available from
https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html.
Without the file driver flag, the file will be opened with each driver in
turn and in the order specified above until one driver succeeds
in opening the file.
See examples below for family, split, and multi driver special file name usage.
Expand Down
6 changes: 3 additions & 3 deletions tools/test/h5dump/expected/pbits/tpbitsOffsetExceeded.ddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ usage: h5dump [OPTIONS] files
(Alternate compact form of subsetting is described in the Reference Manual)

--------------- Option Argument Conventions ---------------
D - is the file driver to use in opening the file. Acceptable values
are "sec2", "family", "split", "multi", "direct", and "stream". Without
the file driver flag, the file will be opened with each driver in
D - is the file driver to use in opening the file. Acceptable values are available from
https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html.
Without the file driver flag, the file will be opened with each driver in
turn and in the order specified above until one driver succeeds
in opening the file.
See examples below for family, split, and multi driver special file name usage.
Expand Down
6 changes: 3 additions & 3 deletions tools/test/h5dump/expected/pbits/tpbitsOffsetNegative.ddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ usage: h5dump [OPTIONS] files
(Alternate compact form of subsetting is described in the Reference Manual)

--------------- Option Argument Conventions ---------------
D - is the file driver to use in opening the file. Acceptable values
are "sec2", "family", "split", "multi", "direct", and "stream". Without
the file driver flag, the file will be opened with each driver in
D - is the file driver to use in opening the file. Acceptable values are available from
https://portal.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html.
Without the file driver flag, the file will be opened with each driver in
turn and in the order specified above until one driver succeeds
in opening the file.
See examples below for family, split, and multi driver special file name usage.
Expand Down
Loading