From 2ce2fb0054d4d774b1e762c747b83c12b34428be Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Sat, 23 Nov 2024 14:00:16 -0600 Subject: [PATCH] Convert file image ops file to doxygen (#5134) --- doxygen/aliases | 2 - doxygen/dox/RFC.dox | 1 - doxygen/dox/TechnicalNotes.dox | 8 +- doxygen/dox/UsersGuide.dox | 46 +- doxygen/dox/ViewTools.dox | 4 + doxygen/examples/FileImageOps.html | 1611 ---------------------------- doxygen/img/DOChunks_fig1.png | Bin 0 -> 22612 bytes doxygen/img/DOChunks_fig2.png | Bin 0 -> 208502 bytes hl/src/H5DOpublic.h | 215 +++- hl/src/H5LTpublic.h | 3 +- src/H5Dmodule.h | 2 +- src/H5Dpublic.h | 2 +- src/H5Fmodule.h | 1448 ++++++++++++++++++++++++- src/H5Fpublic.h | 2 +- src/H5PLmodule.h | 2 +- src/H5Pmodule.h | 2 +- src/H5Ppublic.h | 19 +- src/H5module.h | 2 +- 18 files changed, 1708 insertions(+), 1661 deletions(-) delete mode 100644 doxygen/examples/FileImageOps.html create mode 100644 doxygen/img/DOChunks_fig1.png create mode 100644 doxygen/img/DOChunks_fig2.png diff --git a/doxygen/aliases b/doxygen/aliases index 0d355c001f0..fffec1cc2aa 100644 --- a/doxygen/aliases +++ b/doxygen/aliases @@ -260,7 +260,6 @@ ALIASES += sa_metadata_ops="\sa \li H5Pget_all_coll_metadata_ops() \li H5Pget_co ################################################################################ ALIASES += ref_cons_semantics="Enabling a Strict Consistency Semantics Model in Parallel HDF5" -ALIASES += ref_file_image_ops="HDF5 File Image Operations" ALIASES += ref_filter_pipe="Data Flow Pipeline for H5Dread()" ALIASES += ref_group_impls="Group implementations in HDF5" ALIASES += ref_h5lib_relver="HDF5 Library Release Version Numbers" @@ -327,7 +326,6 @@ ALIASES += ref_rfc20121114="HDF5 File Space Management" ALIASES += ref_rfc20120828="New HDF5 API Routines for HPC Applications - Read/Write Multiple Datasets in an HDF5 file" ALIASES += ref_rfc20120523="HDF5 File Space Management: Paged Aggregation" -ALIASES += ref_rfc20120501="HDF5 File Image Operations" ALIASES += ref_rfc20120305="Enabling a Strict Consistency Semantics Model in Parallel HDF5" ALIASES += ref_rfc20120220="h5repack: Improved Hyperslab selections for Large Chunked Datasets" ALIASES += ref_rfc20120120="A Maintainer's Guide for the Datatype Module in HDF5 Library" diff --git a/doxygen/dox/RFC.dox b/doxygen/dox/RFC.dox index 1b1141b4fd5..0482aee0c98 100644 --- a/doxygen/dox/RFC.dox +++ b/doxygen/dox/RFC.dox @@ -53,7 +53,6 @@ 2012-10-24 \ref_rfc20121024 2012-08-28 \ref_rfc20120828 2012-05-23 \ref_rfc20120523 - 2012-05-01 \ref_rfc20120501 2012-03-05 \ref_rfc20120305 2012-02-20 \ref_rfc20120220 2012-01-20 \ref_rfc20120120 diff --git a/doxygen/dox/TechnicalNotes.dox b/doxygen/dox/TechnicalNotes.dox index 199d17de129..787a0d8a448 100644 --- a/doxygen/dox/TechnicalNotes.dox +++ b/doxygen/dox/TechnicalNotes.dox @@ -3,7 +3,7 @@ \li \ref api-compat-macros \li \ref APPDBG \li \ref FMTDISC -\li \ref FILEIMGOPS +\li \ref sec_file_image \li \ref subsubsec_dataset_transfer_filter \li \ref IOFLOW \li \ref TNMDC @@ -1061,12 +1061,6 @@ been used at the lowest level to process the request. */ -/** \page FILEIMGOPS HDF5 File Image Operations - -\htmlinclude FileImageOps.html - -*/ - /** \page APPDBG Debugging HDF5 Applications \htmlinclude DebuggingHDF5Applications.html diff --git a/doxygen/dox/UsersGuide.dox b/doxygen/dox/UsersGuide.dox index f6e4680ccfa..03151473d2a 100644 --- a/doxygen/dox/UsersGuide.dox +++ b/doxygen/dox/UsersGuide.dox @@ -304,12 +304,54 @@
  • \ref subsubsec_vol_compat_opt +\ref sec_file_image +\li \ref subsec_file_image_intro +\li \ref subsec_file_image_api + +\li \ref subsec_file_image_semantics + +\li \ref subsec_file_image_example + +\li \ref subsec_file_image_java +\li \ref subsec_file_image_fort + + \ref sec_async \li \ref subsec_async_intro \ref sec_map \ref sec_cltools +\li \ref H5TOOL_CP_UG +\li \ref H5TOOL_DF_UG +\li \ref H5TOOL_DP_UG +\li \ref H5TOOL_FC_UG +\li \ref H5TOOL_IM_UG +\li \ref H5TOOL_JAM_UG +\li \ref H5TOOL_LS_UG +\li \ref H5TOOL_RP_UG +\li \ref H5TOOL_ST_UG +\li \ref H5TOOL_CR_UG +\li \ref H5TOOL_DG_UG +\li \ref H5TOOL_DT_UG +\li \ref H5TOOL_MG_UG +\li \ref H5TOOL_RT_UG +\li \ref H5TOOL_WH_UG + \ref sec_addition @@ -345,7 +387,7 @@ These documents provide additional information for the use and tuning of specifi -

    Using the Direct Chunk Write Function

    +

    @ref H5DO_UG

    Describes another way that chunks can be written to datasets.

    @@ -377,7 +419,7 @@ These documents provide additional information for the use and tuning of specifi -

    HDF5 File Image Operations

    +

    \ref H5FIM_UG

    Describes how to work with HDF5 files in memory. Disk I/O is not required when file images are opened, created, read from, or written to.

    diff --git a/doxygen/dox/ViewTools.dox b/doxygen/dox/ViewTools.dox index 43686751bfb..6bb000eb71b 100644 --- a/doxygen/dox/ViewTools.dox +++ b/doxygen/dox/ViewTools.dox @@ -303,6 +303,8 @@ GROUP "/" { } \endcode +\see H5TOOL_DP_UG for more information. + \subsection subsecViewToolsViewContent_h5ls h5ls The h5ls tool by default just displays the objects in the root group. It will not display items in groups beneath the root group unless specified. Useful h5ls options for viewing @@ -355,6 +357,8 @@ The output is shown below: /HDFEOS\ INFORMATION/StructMetadata.0 Dataset {SCALAR} \endcode +\see H5TOOL_LS_UG for more information. + \section secViewToolsViewDset Datasets and Dataset Properties Both h5dump and h5ls can be used to view specific datasets. * * The signature of the HDF5 filter function and the accompanying filter structure (see the section below) - * are described in the HDF5 Reference Manual #H5Z_filter_t. + * are described in the \ref RM #H5Z_filter_t. * * \subsubsection subsubsec_filter_plugins_prog_reg Registering a Filter with The HDF Group * If you are writing a filter that will be used by others, it would be a good idea to request a filter diff --git a/src/H5Pmodule.h b/src/H5Pmodule.h index b7eb4c78a75..6a65f3a269b 100644 --- a/src/H5Pmodule.h +++ b/src/H5Pmodule.h @@ -816,7 +816,7 @@ * * The in-memory file image feature of HDF5 uses property lists in a manner that differs * substantially from their use elsewhere in HDF5. Those who plan to use in-memory file images - * must study "File Image Operations" (PDF) in the Advanced Topics in HDF5collection. + * must study \ref H5FIM_UG. * * \subsection subsec_plist_notes Notes * diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 09dfac7c0cc..34e4d76181f 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -3700,8 +3700,7 @@ H5_DLL herr_t H5Pget_fclose_degree(hid_t fapl_id, H5F_close_degree_t *degree); * \see H5LTopen_file_image(), H5Fget_file_image(), H5Pset_file_image(), * H5Pset_file_image_callbacks(), H5Pget_file_image_callbacks(), * \ref H5FD_file_image_callbacks_t, \ref H5FD_file_image_op_t, - * - * HDF5 File Image Operations. + * \ref H5FIM_UG. * * * \since 1.8.9 @@ -3740,8 +3739,7 @@ H5_DLL herr_t H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_l * \see H5LTopen_file_image(), H5Fget_file_image(), H5Pset_file_image(), * H5Pset_file_image_callbacks(), H5Pget_file_image_callbacks(), * \ref H5FD_file_image_callbacks_t, \ref H5FD_file_image_op_t, - * - * HDF5 File Image Operations. + * \ref H5FIM_UG. * * \since 1.8.9 * @@ -4683,9 +4681,7 @@ H5_DLL herr_t H5Pset_fclose_degree(hid_t fapl_id, H5F_close_degree_t degree); * \par Recommended Reading: * This function is part of the file image * operations feature set. It is highly recommended to study the guide - * [HDF5 File Image Operations] - * (https://\DOCURL/advanced_topics/file_image_ops.md - * ) before using this feature set. See the “See Also” section below + * \ref H5FIM_UG before using this feature set. See the “See Also” section below * for links to other elements of HDF5 file image operations. * * \see @@ -4695,10 +4691,7 @@ H5_DLL herr_t H5Pset_fclose_degree(hid_t fapl_id, H5F_close_degree_t degree); * \li H5Pset_file_image_callbacks() * \li H5Pget_file_image_callbacks() * - * \li [HDF5 File Image Operations] - * (https://\DOCURL/advanced_topics/file_image_ops.md) - * in [Advanced Topics in HDF5] - * (https://\DOCURL/advanced_topics_list.md) + * \li \ref H5FIM_UG * * \li Within H5Pset_file_image_callbacks(): * \li Callback #H5FD_file_image_callbacks_t @@ -4720,9 +4713,7 @@ H5_DLL herr_t H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len); * can then use the file without the overhead of disk I/O.\n * **Recommended Reading:** This function is part of the file * image operations feature set. It is highly recommended to study - * the guide [HDF5 File Image Operations] - * (https://\DOCURL/advanced_topics/file_image_ops.md - * ) before using this feature set. See the “See Also” section below + * the guide \ref H5FIM_UG before using this feature set. See the “See Also” section below * for links to other elements of HDF5 file image operations. * * \fapl_id diff --git a/src/H5module.h b/src/H5module.h index c0fb5ad348a..35429b57a15 100644 --- a/src/H5module.h +++ b/src/H5module.h @@ -706,7 +706,7 @@ * \subsection subsec_program_model The HDF5 Programming Model * In this section we introduce the HDF5 programming model by means of a series of short code * samples. These samples illustrate a broad selection of common HDF5 tasks. More details are - * provided in the following chapters and in the HDF5 Reference Manual. + * provided in the following chapters and in the \ref RM. * * \subsubsection subsubsec_program_model_create Creating an HDF5 File * Before an HDF5 file can be used or referred to in any manner, it must be explicitly created or