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.

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 tools usage text as doxygen for Tools UG #4602

Merged
merged 25 commits into from
Jul 15, 2024

Conversation

byrnHDF
Copy link
Contributor

@byrnHDF byrnHDF commented Jun 24, 2024

No description provided.

@byrnHDF byrnHDF added Merge - To 1.14 Priority - 2. Medium ⏹ It would be nice to have this in the next release Component - Tools Command-line tools like h5dump, includes high-level tools Component - Documentation Doxygen, markdown, etc. Type - New Feature Add a new API call, functionality, or tool labels Jun 24, 2024
@byrnHDF byrnHDF self-assigned this Jun 24, 2024
@byrnHDF byrnHDF mentioned this pull request Jun 24, 2024
@byrnHDF
Copy link
Contributor Author

byrnHDF commented Jun 24, 2024

Closes #2875

Copy link
Contributor

@bmribler bmribler left a comment

Choose a reason for hiding this comment

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

There are extra leading spaces in various paragraphs.
I'm aware that some of the text that I suggested to change were from the source code, but we can improve it here, and in the source code when we have the chance.

tools/src/misc/h5clear.h Outdated Show resolved Hide resolved
hl/tools/h5watch/h5watch.h Outdated Show resolved Hide resolved
tools/src/h5jam/h5jam.h Outdated Show resolved Hide resolved
tools/src/h5jam/h5jam.h Outdated Show resolved Hide resolved
tools/src/h5jam/h5jam.h Outdated Show resolved Hide resolved
tools/src/h5import/h5import.h Outdated Show resolved Hide resolved
tools/src/h5import/h5import.h Outdated Show resolved Hide resolved
tools/src/h5import/h5import.h Outdated Show resolved Hide resolved
tools/src/h5import/h5import.h Outdated Show resolved Hide resolved
tools/src/h5import/h5import.h Outdated Show resolved Hide resolved
@byrnHDF
Copy link
Contributor Author

byrnHDF commented Jun 24, 2024

There are extra leading spaces in various paragraphs. I'm aware that some of the text that I suggested to change were from the source code, but we can improve it here, and in the source code when we have the chance.

Oh yes this is a work in progress - for sure. Just remember that the important text is what is in the doxygen generated files! And first off I just need to make sure that is correct then come back and cleanup the source. So just keep the comments coming in!

* for a compound data type.
* \<list_of_fields\> can be specified as follows:
* <ul><li>1) A comma-separated list of field names in a
* compound data type. "," is the separatorfor field names while "." is the separator
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
* compound data type. "," is the separatorfor field names while "." is the separator
* compound data type. "," is the separator for field names while "." is the separator

Add missing space after "separator"

*
* \subsection subsec_cltools_h5copy_error Error Report Option
* \li <strong>--enable-error-stack</strong> Prints messages from the HDF5 error stack as they occur.
Optional value 2 also prints file open errors.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Code says enable-error-stack takes an optional_arg. Reading the help message I wasn't sure how the value 2 was to be specified. Would "Optional argument 2 be clearer?

* \section sec_cltools_h5diff h5diff
*
* \subsection subsec_cltools_h5diff_intro Introduction
* With h5diff, you can compare objects between a HDF5 file and another file.
Copy link
Collaborator

Choose a reason for hiding this comment

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

"between an HDF5 file", or possibly "you can compare objects in two HDF5 files" might be better.

"Optional value 2" in line 32: see comment in h5copy.h.
Also "Error Report Option"?

* \li <strong>--vfd-info-2</strong> VFD-specific info to pass to the VFL driver used for
* opening the second HDF5 file specified
* \li <strong>--follow-symlinks</strong>
* Follow symbolic links (soft links and external links and compare the)
Copy link
Collaborator

Choose a reason for hiding this comment

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

should the ')' come after "external links" and before "and compare the"?

* \li <strong>--compare</strong> List objects that are not comparable
* \li <strong>--nan</strong> Avoid NaNs detection
* \li <strong>--count=C</strong> Print differences up to C. C must be a positive integer.
* \li <strong>--delta=D</strong>
Copy link
Collaborator

Choose a reason for hiding this comment

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

In these three options, "Where a is ..." is a sentence fragment. "... positive number, where a is ..." would be grammatically correct.

* \li 4) <strong>Symbolic links</strong>
* The paths to the target objects are compared.
* (The option --follow-symlinks overrides the default behavior when
* symbolic links are compared.).
Copy link
Collaborator

Choose a reason for hiding this comment

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

Second '.' after ')' is unnecessary/incorrect.

*
* \subsection subsec_cltools_h5dump_options_file File Options
* \li <strong>--contents</strong> Print a list of the file contents and exit
* Optional value 1 also prints attributes.
Copy link
Collaborator

Choose a reason for hiding this comment

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

just curious: does it print attribute names, values, or both?

* \li <strong>--stride=STRIDE</strong> Hyperslab stride
* \li <strong>--count=COUNT</strong> Number of blocks to include in selection
* \li <strong>--block=BLOCK</strong> Size of block in hyperslab
* \b START, \b COUNT, \b STRIDE, and \b BLOCK - is a list of integers the number of which are equal to the
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think (I could be wrong) that each of START, COUNT, STRIDE and BLOCK is a list of integers, and as written it could be interpreted that START, COUNT, STRIDE and BLOCK is a list.

* - compact/contiguous dataset: downgrade the layout version to 3
* - virtual dataset: no action
*
* \li 3) h5format_convert --noop -dname=/group/dataset file_name
Copy link
Collaborator

Choose a reason for hiding this comment

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

should be --dname according to line 33.

* \subsection subsec_cltools_h5import_desc Description
* The primary objective of the utility is to convert floating
point or integer data stored in \b ASCII text or binary form
into a data-set according to the type and storage properties
Copy link
Collaborator

Choose a reason for hiding this comment

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

This file has 7 instances of data-set and ~20 of dataset. All other files in tools/src do not have data-set. Why in this file?

specified in this configuration file. A point to note is
that the floating point data in the \b ASCII text file may be
organized in the fixed floating form (for example 323.56)
or in a scientific notation (for example 3.23E+02). A
Copy link
Collaborator

Choose a reason for hiding this comment

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

should be either "or in scientific notation" or else "or in a scientific notation form".

\li 5. <strong>Compressed </strong> (has to be chunked)
\li 6. <strong>Compressed & Extendible</strong> (has to be chunked)

If the user wants to store raw data in a non-HDF file then
Copy link
Collaborator

Choose a reason for hiding this comment

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

non-HDF5?

unlimited, the extendible data set option can be chosen.

The user may also specify the type of compression and the
level to which the data set must be compresses by setting
Copy link
Collaborator

Choose a reason for hiding this comment

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

"must be compressed"

<li>STR</li>
<li>TEXTUIN</li>
<li>UIN</li></ul>
\b INPUT-CLASS "TEXTIN" denotes an ASCII text file with signed integer data in ASCII form,
Copy link
Collaborator

Choose a reason for hiding this comment

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

extra space between text and file in line 183

"FP" denotes a floating point binary file,
"IN" denotes a signed integer binary file,
"UIN" denotes an unsigned integer binary file,
& "STR" denotes an ASCII text file the contents of which should be stored as an 1-D
Copy link
Collaborator

Choose a reason for hiding this comment

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

stored as a 1-D

Integer denoting the number of dimensions.

* \li <strong>DIMENSION-SIZES</strong>
Integers separated by spaces to denote the dimension sizes for the no. of dimensions
Copy link
Collaborator

Choose a reason for hiding this comment

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

why abbreviate "no." here?

determined by rank.

* \li <strong>OUTPUT-CLASS</strong>
String dentoting data type of the dataset to be written ("IN","FP", "UIN")
Copy link
Collaborator

Choose a reason for hiding this comment

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

denoting
extra space between "to" and "be"

String dentoting data type of the dataset to be written ("IN","FP", "UIN")

* \li <strong>OUTPUT-SIZE</strong>
Integer denoting the size of the data in the output dataset to be written.
Copy link
Collaborator

Choose a reason for hiding this comment

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

extra space

* \li <strong>--indexed=L2</strong> Minimum number of links in the indexed format
* \li <strong>--ssize=S[:F]</strong> Shared object header message minimum size
* \li <strong>--minimum=M</strong> Do not apply the filter to datasets smaller than M
* \li <strong>--file=E</strong> Name of file E with the -f and -l options
Copy link
Collaborator

Choose a reason for hiding this comment

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

If this doxygen section doesn't have entries for -f and -l, this line for --file should probably read "... with the --filter and --layout options"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

* driver.
* \li The default strategy when not set is \b FSM_AGGR without persisting free-space.
*
* \li <strong>FS_PERSIST</strong> is 1 to persisting free-space or 0 to not persisting free-space.
Copy link
Collaborator

Choose a reason for hiding this comment

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

could maybe be "1 for persisting" and "0 for not persisting"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@lrknox lrknox merged commit f8069fa into HDFGroup:develop Jul 15, 2024
59 checks passed
qkoziol pushed a commit to qkoziol/hdf5 that referenced this pull request Jul 15, 2024
qkoziol pushed a commit to qkoziol/hdf5 that referenced this pull request Jul 16, 2024
@byrnHDF byrnHDF deleted the develop-tools-doxy branch July 19, 2024 15:21
lrknox pushed a commit to lrknox/hdf5 that referenced this pull request Jul 19, 2024
lrknox added a commit that referenced this pull request Jul 19, 2024
* Test fixes for log-based vol (#4618)

* fixes to address failures in the log-based VOL

* moved file cleanup to tests proper

* skipped index API test if not supported

* Add 'try' parameter to H5Z_find, and remove calls to H5E_clear_stack() (#4609)

* Bump the github-actions group with 4 updates (#4620)

Bumps the github-actions group with 4 updates: [actions/checkout](https://github.com/actions/checkout), [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials), [softprops/action-gh-release](https://github.com/softprops/action-gh-release) and [github/codeql-action](https://github.com/github/codeql-action).

Updates `actions/checkout` from 4.1.1 to 4.1.7
- [Release notes](https://github.com/actions/checkout/releases)
- [Commits](actions/checkout@v4.1.1...v4.1.7)

Updates `aws-actions/configure-aws-credentials` from 1 to 4
- [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases)
- [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md)
- [Commits](aws-actions/configure-aws-credentials@v1...v4)

Updates `softprops/action-gh-release` from 2.0.5 to 2.0.6
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](softprops/action-gh-release@69320db...a74c6b7)

Updates `github/codeql-action` from 3.25.7 to 3.25.11
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@f079b84...b611370)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: aws-actions/configure-aws-credentials
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix a stack size warning in ros3 VFD code (#4625)

Just makes a stack array dynamic. Valgrind shows no memory leaks.

* Reworked cleaning up API test files (#4626)

* Reworked cleaning up test files, only removing test files if present to account for skipped tests

* changed to using H5Fis_accessible

* update to full use of remove_test_file

* corrected offset type in C wrapper (#4622)

* Remove some internal use of API calls and H5E_BEGIN_TRY/H5E_END_TRY (#4624)

* Remove auto NSIS check because of issues with CI (#4646)

* Add python testing for examples (#4628)

* Clean up Fortran __float128 configure-time checks (#4649)

* Always use DECIMAL_DIG instead of LDBL_DIG. This was controlled by
  an ifdef that is always true in C99 or greater

It's confusing to use float.h C constants as variable names in
configure.ac and the PAC_FC_LDBL_DIG macro.

* Directly compare MY_FLT128_DIG and MY_LDBL_DIG

* Make uniform across CMake and Autotools
* Don't export quadmath.h variables to H5pubconf.h

* Feature/awesome (#4604)

* Added Doxygen Awesome and fixed a few quirks.

* Fixed unterminated strings.

* Added Doxygen Awesome by copy.

* Add tools usage text as doxygen  for Tools UG (#4602)

* Add h5* compiler wrapper testing for CMake #4605 (#4613)

* Add show option

* remove non-static libs and correct names of static libs

* Fixup the pkg-config libs and comp builds

* Fix commands and add fortran pkg-config test scripts

* Add help usage option

* Add temporary fix for ARM64 Mac _Float16 build failure (#4639)

* Correct H5VL_t ref count on H5O_refresh_metadata failure (#4636)

* Fix bad H5VL_t rc on H5O_refresh_metadata fail

* Decrement nrefs before raising error

* Update doxygen Learn Basics / example refs. Add Reference sections (#4640)

* Fixed messed up table captions.  (#4653)

* Fixed messed up table captions. Browsers don't seem to respect relative values for width. Hardcoding 800px for now.

* Fixed FetchContent usage for new CMake reqs. (#4650)

CMake version 3.30 changed the behavior of the FetchContent module to deprecate
the use of FetchContent_Populate() in favor of FetchContent_MakeAvailable(). Therefore,
the copying of HDF specialized CMakeLists.txt files to the dependent project's source
was implemented in the FetchContent_Declare() call.

* Fixed usage issue with FindZLIB.cmake module (#4655)

* Add a comment on the FindZLIB.cmake module usage

* Allow choice of static/shared compression libs for Find Module

* Added new option to INSTALL_CMake file and changed option text

* Eliminate more H5E_BEGIN/END_TRY macros and H5E_clear_stack() calls (#4648)

* Correct name of zlib_ng option (#4658)

* Fix the examples for testing java with binaries (#4660)

* Update filename in RELEASE_PROCESS.md to current name
INSTALL_autotools.txt.

* Remove reference to V116 in tools/src/h5repack/h5repack.h.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component - Documentation Doxygen, markdown, etc. Component - Tools Command-line tools like h5dump, includes high-level tools Priority - 2. Medium ⏹ It would be nice to have this in the next release Type - New Feature Add a new API call, functionality, or tool
Projects
Status: Needs Merged
Development

Successfully merging this pull request may close these issues.

3 participants