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

Sync 1.14 branch with develop #3923

Merged
merged 17 commits into from
Jan 8, 2024
Merged

Sync 1.14 branch with develop #3923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1f67b00
Fix build error on freebsd (#3883)
balay Dec 7, 2023
785b1d1
Correct CMake command and example packaging (#3888)
byrnHDF Dec 8, 2023
2f4b31c
Feat: Hashpin sensitive dependencies on GitHub Actions and enable Dep…
diogoteles08 Dec 13, 2023
035a330
Some changes to portal links when they could be found on docs.hdfgrou…
loricooperhdf Dec 13, 2023
fa38b7f
Add variable option syncing for examples (#3885)
byrnHDF Dec 14, 2023
f865d3b
Add period(.) at the end of the sentence for consistency. (#3897)
hyoklee Dec 19, 2023
e40224b
Remove redundant backslash character from comment. (#3899)
hyoklee Dec 20, 2023
17fdf20
Disable doxygen as errors for netcdf (#3900)
byrnHDF Dec 20, 2023
1d863d9
Doc versions (#3903)
gheber Dec 21, 2023
6e5a3e2
Change Trouble Shooting to Troubleshooting (#3905)
hyoklee Dec 22, 2023
da2fd1f
Implement optimized support for vector I/O in Subfiling VFD (#3896)
jhendersonHDF Dec 27, 2023
c2ab905
Add 'warning density' computation to the warnhist script (#3910)
qkoziol Dec 29, 2023
2d59ae9
Added H5Fdelete_f with test (#3912)
brtnfld Dec 30, 2023
ed43d9d
New Fortran Examples added (#3916)
brtnfld Jan 3, 2024
3b56059
Version and space corrections.
lrknox Jan 4, 2024
c62278f
Restore H5_VERSION definition in configure.ac.
lrknox Jan 4, 2024
e6597ae
renamed defined H5_VERS* to avoid conflicts (#3926)
brtnfld Jan 5, 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
2 changes: 1 addition & 1 deletion .github/workflows/release-files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:
ls ${{ runner.workspace }}

- name: branch-only-docs
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ${{ github.workspace }}/${{ steps.get-file-base.outputs.FILE_BASE }}.doxygen
Expand Down
2 changes: 1 addition & 1 deletion HDF5Examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ if (${H5_LIBVER_DIR} GREATER 16)
endif ()

configure_file (${H5EX_F90_SRC_DIR}/H5D/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5D/h5_version.h @ONLY)
configure_file (${H5EX_F90_SRC_DIR}/H5G/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5G/h5_version.h @ONLY)
configure_file (${H5EX_F90_SRC_DIR}/H5D/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5G/h5_version.h @ONLY)
else ()
set (HDF_BUILD_FORTRAN OFF CACHE BOOL "Build examples FORTRAN support" FORCE)
endif ()
Expand Down
23 changes: 0 additions & 23 deletions HDF5Examples/FORTRAN/H5G/h5_version.h.in
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ project (HDF5Examples_FORTRAN_H5PAR Fortran)
INCLUDE_DIRECTORIES (
${CMAKE_Fortran_MODULE_DIRECTORY}${HDF_MOD_EXT}
${PROJECT_BINARY_DIR}
${HDF5_F90_BINARY_DIR}
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
)

Expand Down
11 changes: 11 additions & 0 deletions HDF5Examples/FORTRAN/H5PAR/Fortran_sourcefiles.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,14 @@ set (examples
ph5_f90_hyperslab_by_pattern
ph5_f90_hyperslab_by_chunk
)

if (HDF5_ENABLE_SUBFILING_VFD)
set (examples ${examples}
ph5_f90_subfiling
)
endif()
if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.14.4")
set (examples ${examples}
ph5_f90_filtered_writes_no_sel
)
endif()
3 changes: 1 addition & 2 deletions HDF5Examples/FORTRAN/H5PAR/ph5_f90_dataset.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
PROGRAM DATASET

USE HDF5 ! This module contains all necessary modules
USE MPI

IMPLICIT NONE

INCLUDE 'mpif.h'
CHARACTER(LEN=10), PARAMETER :: filename = "sds.h5" ! File name
CHARACTER(LEN=8), PARAMETER :: dsetname = "IntArray" ! Dataset name

Expand Down
2 changes: 1 addition & 1 deletion HDF5Examples/FORTRAN/H5PAR/ph5_f90_file_create.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
PROGRAM FILE_CREATE

USE HDF5 ! This module contains all necessary modules
USE MPI

IMPLICIT NONE

INCLUDE 'mpif.h'
CHARACTER(LEN=10), PARAMETER :: filename = "sds.h5" ! File name

INTEGER(HID_T) :: file_id ! File identifier
Expand Down
Loading