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 presets cookbook and use cases #5323

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/cmake-ctest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Enable Developer Command Prompt
uses: ilammy/[email protected]
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Set file base name (Linux)
id: set-file-base
Expand Down Expand Up @@ -331,7 +331,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: check clang version
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cmake-par-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Enable Developer Command Prompt
uses: ilammy/[email protected]
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Setup MPI (${{ matrix.mpi }})
id: setup-mpi
Expand Down Expand Up @@ -279,7 +279,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Setup MPI (${{ matrix.mpi }})
id: setup-mpi
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmake-par-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Install Doxygen
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Set file base name (OpenMPI)
id: set-file-base
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
- name: Install Doxygen
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Set file base name (MPICH)
id: set-file-base
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cmake-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Enable Developer Command Prompt
uses: ilammy/[email protected]
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Set file base name (Linux)
id: set-file-base
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: check clang version
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.9.7"
version: "1.13.2"

- name: Set environment for MSVC (Windows)
run: |
Expand Down
2 changes: 1 addition & 1 deletion CMakeInstallation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
endif ()

find_program (RPMBUILD_EXE rpmbuild)
if (RPMBUILD_EXE)
if (RPMBUILD_EXE AND NOT HDF_ENABLE_PARALLEL)
list (APPEND CPACK_GENERATOR "RPM")
set (CPACK_RPM_PACKAGE_RELEASE "1")
set (CPACK_RPM_PACKAGE_RELEASE_DIST ON)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ if (HDF5_BUILD_DOC AND EXISTS "${HDF5_DOXYGEN_DIR}" AND IS_DIRECTORY "${HDF5_DOX
option (HDF5_ENABLE_DOXY_WARNINGS "Enable fail if doxygen parsing has warnings." OFF)
mark_as_advanced (HDF5_ENABLE_DOXY_WARNINGS)
if (HDF5_ENABLE_DOXY_WARNINGS)
set (HDF5_DOXY_WARNINGS "FAIL_ON_WARNINGS")
set (HDF5_DOXY_WARNINGS "FAIL_ON_WARNINGS_PRINT")
else ()
set (HDF5_DOXY_WARNINGS "NO")
endif ()
Expand Down
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
HDF5 version 2.0.0 currently under development

![HDF5 Logo](doxygen/img/HDF5.png)
![HDF5 Logo][u3]

[![develop cmake build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/cmake.yml?branch=develop&label=HDF5%20develop%20CMake%20CI)](https://github.com/HDFGroup/hdf5/actions/workflows/cmake.yml?query=branch%3Adevelop)
[![develop autotools build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/autotools.yml?branch=develop&label=HDF5%20develop%20Autotools%20CI)](https://github.com/HDFGroup/hdf5/actions/workflows/autotools.yml?query=branch%3Adevelop)
Expand Down Expand Up @@ -40,10 +40,10 @@ The latest Doxygen documentation generated on changes to `develop`, which does *

https://hdfgroup.github.io/hdf5/develop

See the [RELEASE.txt](release_docs/RELEASE.txt) file in the [release_docs/](release_docs/) directory for information specific
See the [RELEASE.txt][u1] file in the [release_docs/][u4] directory for information specific
to the features and updates included in this release of the library.

Several more files are located within the [release_docs/](release_docs/) directory with specific
Several more files are located within the [release_docs/][u4] directory with specific
details for several common platforms and configurations.

INSTALL - Start Here. General instructions for compiling and installing the library
Expand Down Expand Up @@ -80,7 +80,7 @@ conversation. Please read the [instructions](https://forum.hdfgroup.org/t/quick
RELEASE SCHEDULE
----------------

![HDF5 release schedule](doc/img/release-schedule.png)
![HDF5 release schedule][u2]

HDF5 does not follow a regular release schedule. Instead, updates are based on the
introduction of new features and the resolution of bugs. However, we aim to have at
Expand Down Expand Up @@ -120,3 +120,8 @@ Development code is available at our Github location:

https://github.com/HDFGroup/hdf5.git

[u1]: https://github.com/HDFGroup/hdf5/blob/develop/release_docs/RELEASE.txt
[u2]: https://github.com/HDFGroup/hdf5/blob/develop/doc/img/release-schedule.png
[u3]: https://github.com/HDFGroup/hdf5/blob/develop/doxygen/img/HDF5.png
[u4]: https://github.com/HDFGroup/hdf5/blob/develop/release_docs

7 changes: 6 additions & 1 deletion config/cmake/HDFLibMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
set (zlib_folder "ZLIB")
endif ()
if (${compress_type} MATCHES "GIT")
if (${ZLIB_BRANCH} MATCHES "develop")
set (ZLIB_FILE "devCMakeLists")
else ()
set (ZLIB_FILE "CMakeLists")
endif ()
FetchContent_Declare (HDF5_ZLIB
GIT_REPOSITORY ${ZLIB_URL}
GIT_TAG ${ZLIB_BRANCH}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
${HDF_RESOURCES_DIR}/${zlib_folder}/CMakeLists.txt
${HDF_RESOURCES_DIR}/${zlib_folder}/${ZLIB_FILE}.txt
<SOURCE_DIR>/CMakeLists.txt
)
elseif (${compress_type} MATCHES "TGZ")
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/README.md.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ For more information see USING_CMake_Examples.txt in the install folder.
===========================================================================

Documentation for this release can be found at the following URL:
https://support.hdfgroup.org/releases/hdf5/@${H5_VERS_MAJOR}@_@${H5_VERS_MINOR}@/@${H5_VERS_MAJOR}@_@${H5_VERS_MINOR}@_@${H5_VERS_RELEASE}@/documentation/doxygen/index.html
https://support.hdfgroup.org/releases/hdf5/@H5_VERS_MAJOR@_@H5_VERS_MINOR@/@H5_VERS_MAJOR@_@H5_VERS_MINOR@_@H5_VERS_RELEASE@/documentation/doxygen/index.html

Bugs should be reported to [email protected].
Loading
Loading