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

Hdf5 1 8 22 #266

Merged
merged 19 commits into from
Jan 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
52f6744
Restores maintainer mode in the autotools (#200)
derobins Dec 18, 2020
9d1999c
Update configure for Restores maintainer mode in the autotools (#200).
lrknox Dec 18, 2020
f34233c
Update MANIFEST for switch_maint_mode script.
lrknox Dec 18, 2020
0277b7d
Update so numbers for 1.8.22 release.
lrknox Dec 21, 2020
37b5b8e
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Dec 21, 2020
a008cd0
Add so numbers changes in Makefile.ins for 1.8.22 release.
lrknox Dec 21, 2020
57df34d
Update pkgconfig settings with version - #218 (#223)
byrnHDF Dec 22, 2020
10dbac8
Add notice of final HDFF5 1.8 release.
lrknox Dec 22, 2020
c4fcff1
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Dec 22, 2020
458be32
Update 1.8 final release notice.
lrknox Dec 22, 2020
5fde85a
Update CMake/HDF5Examples version in bin/release
lrknox Dec 22, 2020
1c44828
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Dec 22, 2020
faf36a3
Fixed typo in an error message. (#227)
bmribler Dec 23, 2020
1c141c0
Remove duplicate setting (#239)
byrnHDF Jan 5, 2021
2d5ac50
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Jan 9, 2021
6810e75
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Jan 14, 2021
03ca350
RELEASE.txt cleanup.
lrknox Jan 14, 2021
751596f
Add macOS Big Sur to tested machines, also missing entries for macOS …
lrknox Jan 15, 2021
216de13
)Update version.
lrknox Jan 15, 2021
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 README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HDF5 version 1.8.22-12 currently under development
HDF5 version 1.8.22-13 currently under development

------------------------------------------------------------------------------
Please refer to the release_docs/INSTALL file for installation instructions.
Expand Down
2 changes: 1 addition & 1 deletion c++/src/cpp_doc_config
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ PROJECT_NAME = "HDF5 C++ API"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "1.8.22-12, currently under development"
PROJECT_NUMBER = "1.8.22-13, currently under development"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/scripts/HDF5config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.12)
##############################################################################

set (CTEST_SOURCE_VERSION "1.8.22")
set (CTEST_SOURCE_VERSEXT "-12")
set (CTEST_SOURCE_VERSEXT "-13")

##############################################################################
# handle input parameters to script.
Expand Down
22 changes: 11 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Id.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for HDF5 1.8.22-12.
# Generated by GNU Autoconf 2.69 for HDF5 1.8.22-13.
#
# Report bugs to <help@hdfgroup.org>.
#
Expand Down Expand Up @@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='HDF5'
PACKAGE_TARNAME='hdf5'
PACKAGE_VERSION='1.8.22-12'
PACKAGE_STRING='HDF5 1.8.22-12'
PACKAGE_VERSION='1.8.22-13'
PACKAGE_STRING='HDF5 1.8.22-13'
PACKAGE_BUGREPORT='help@hdfgroup.org'
PACKAGE_URL=''

Expand Down Expand Up @@ -1511,7 +1511,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures HDF5 1.8.22-12 to adapt to many kinds of systems.
\`configure' configures HDF5 1.8.22-13 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1581,7 +1581,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of HDF5 1.8.22-12:";;
short | recursive ) echo "Configuration of HDF5 1.8.22-13:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1823,7 +1823,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
HDF5 configure 1.8.22-12
HDF5 configure 1.8.22-13
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2760,7 +2760,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by HDF5 $as_me 1.8.22-12, which was
It was created by HDF5 $as_me 1.8.22-13, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -3631,7 +3631,7 @@ fi

# Define the identity of the package.
PACKAGE='hdf5'
VERSION='1.8.22-12'
VERSION='1.8.22-13'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -30282,7 +30282,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."

lt_cl_version="\
HDF5 config.lt 1.8.22-12
HDF5 config.lt 1.8.22-13
configured by $0, generated by GNU Autoconf 2.69.

Copyright (C) 2011 Free Software Foundation, Inc.
Expand Down Expand Up @@ -32358,7 +32358,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by HDF5 $as_me 1.8.22-12, which was
This file was extended by HDF5 $as_me 1.8.22-13, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -32424,7 +32424,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
HDF5 config.status 1.8.22-12
HDF5 config.status 1.8.22-13
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ AC_PREREQ([2.69])
## NOTE: Do not forget to change the version number here when we do a
## release!!!
##
AC_INIT([HDF5], [1.8.22-12], [help@hdfgroup.org])
AC_INIT([HDF5], [1.8.22-13], [help@hdfgroup.org])
AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h])

Expand Down
58 changes: 39 additions & 19 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HDF5 version 1.8.22-12 currently under development
HDF5 version 1.8.22-13 currently under development
================================================================================

Notice: HDF5 1.8.22 will be followed later in 2021 by HDF5 1.8.23, the final
Expand Down Expand Up @@ -57,28 +57,28 @@ New Features

The HDF filter plugins project is a collection of registered compression
filters that can be dynamically loaded when needed to access data stored
in a hdf5 file. This CMake-only option allows the plugins to be built and
in an hdf5 file. This CMake-only option allows the plugins to be built and
distributed with the hdf5 library and tools. Like the options for szip and
zlib, either a tgz file or a git repository can be specified for the source.

The option was refactored to use the CMake FetchContent process. This allows
more control over the filter targets, but required external project command
options to be moved to a CMake include file, HDF5PluginCache.cmake. Also
enabled the filter examples to be used as tests for operation of the
options to be moved to a CMake include file, HDF5PluginCache.cmake. It also
allows the filter examples to be used as tests for operation of the
filter plugins.

(ADB - 2020/12/10, OESS-98)

- CMake option to use MSVC naming conventions with MinGW

HDF5_MSVC_NAMING_CONVENTION option enable to use MSVC naming conventions
HDF5_MSVC_NAMING_CONVENTION option enables using MSVC naming conventions
when using a MinGW toolchain

(xan - 2020/10/30)

- CMake option to statically link gcc libs with MinGW

HDF5_MINGW_STATIC_GCC_LIBS allows to statically link libg/libstdc++
HDF5_MINGW_STATIC_GCC_LIBS allows statically linking libg/libstdc++
with the MinGW toolchain

(xan - 2020/10/30)
Expand All @@ -87,7 +87,7 @@ New Features

The HDF filter plugins project is a collection of registered compression
filters that can be dynamically loaded when needed to access data stored
in a hdf5 file. This CMake-only option allows the plugins to be built and
in an hdf5 file. This CMake-only option allows the plugins to be built and
distributed with the hdf5 library and tools. Like the options for szip and
zlib, either a tgz file or a git repository can be specified for the source.

Expand Down Expand Up @@ -138,8 +138,8 @@ New Features
The open source AEC library is a replacement library for SZip. In
order to use it for hdf5 the libaec CMake source was changed to add
"-fPIC" and exclude test files. Autotools does not build the
compression libraries within hdf5 builds. New option USE_LIBAEC is
required to compensate for the different files produced by AEC build.
compression libraries within hdf5 builds. CMake requires new option
USE_LIBAEC to compensate for the different files produced by AEC build.

(ADB - 2020/04/22, OESS-65)

Expand All @@ -160,7 +160,7 @@ New Features
Intel C, Fortran warnings flags were moved to files in a config sub-folder
named intel-warnings.

There are flags in named "error-xxx" files with warnings that may
There are flags in files named "error-xxx" with warnings that may
be promoted to errors. Some source files may still need fixes.

There are also pairs of files named "developer-xxx" and "no-developer-xxx"
Expand Down Expand Up @@ -260,12 +260,12 @@ New Features

- Add mingw CMake support with a toolchain file

There has been a number of mingw issues that has been linked under
There have been a number of mingw issues that have been linked under
HDFFV-10845. It has been decided to implement the CMake cross-compiling
technique of toolchain files. We will use a linux platform with the mingw
compiler stack for testing. Only the C language is fully supported, and
the error tests are skipped. The C++ language works for static but shared
builds has a shared library issue with the mingw Standard Exception Handling
builds have a shared library issue with the mingw Standard Exception Handling
library, which is not available on Windows. Fortran has a common cross-compile
problem with the fortran configure tests.

Expand Down Expand Up @@ -301,7 +301,7 @@ New Features

(ADB - 2018/10/04, HDFFV-10594)

- Add warning flags for Intel compilers
- Add warnings flags for Intel compilers

Identified Intel compiler specific warnings flags that should be used
instead of GNU flags.
Expand All @@ -321,9 +321,13 @@ New Features

Library
-------
- Add S3 and HDFS VFDs to HDF5 maintenance
- Added S3 and HDFS Virtual File Drivers (VFDs) to HDF5

Fix windows requirements and java tests. Windows requires CMake 3.13.
These new VFDs have been added in HDF5-1.8.22. Instructions to
enable them when configuring HDF5 on Linux and Mac may be found at
https://portal.hdfgroup.org/display/HDF5/Virtual+File+Drivers+-+S3+and+HDFS.

Installing on Windows requires CMake 3.13 and the following additional setup.
Install openssl library (with dev files);
from "Shining Light Productions". msi package preferred.

Expand All @@ -349,7 +353,9 @@ New Features
- Allow pre-generated H5Tinit.c and H5make_libsettings.c to be used.

Rather than always running H5detect and generating H5Tinit.c and
H5make_libsettings.c, supply a location for those files.
H5make_libsettings.c, supply a location for those files with CMake variables
HDF5_USE_PREGEN and HDF5_USE_PREGEN_DIR. See release_docs/README_HPC
section VI "Other cross compiling options".

(ADB - 2018/09/18, HDFFV-10332)

Expand Down Expand Up @@ -517,7 +523,7 @@ Bug Fixes since HDF5-1.8.21
-----
- h5repack was fixed to repack the reference attributes properly.
The code line that checks if the update of reference inside a compound
datatype is misplaced outside the code block loop that carries out the
datatype was misplaced outside the code block loop that carries out the
check. In consequence, the next attribute that is not the reference
type was repacked again as the reference type and caused the failure of
repacking. The fix is to move the corresponding code line to the correct
Expand Down Expand Up @@ -546,6 +552,7 @@ Bug Fixes since HDF5-1.8.21

(LRK - 2019/05/09, HDFFV-10596)


C++ API
-------
- None
Expand Down Expand Up @@ -593,6 +600,13 @@ Supported Platforms
Visual Studio 2019 w/ Intel Fortran 19 (cmake)
Visual Studio 2019 w/ MSMPI 10.1 (cmake)

macOS High Sierra 10.13.6 Apple LLVM version 10.0.0 (clang-1000.10.44.4)
64-bit gfortran GNU Fortran (GCC) 6.3.0
(bear) Intel icc/icpc/ifort version 19.0.4.233 20190416

macOS Mojave 10.14.6 Apple LLVM version 10.0.1 (clang-1001.0.46.4)
64-bit gfortran GNU Fortran (GCC) 6.3.0
(bobcat) Intel icc/icpc/ifort version 19.0.4.233 20190416


Tested Configuration Features Summary
Expand Down Expand Up @@ -692,8 +706,8 @@ The following platforms are not supported but have been tested for this release.
(cori) intel/19.0.3

Linux-4.4.180-94.107-default cray-mpich/7.7.6
# 1SMP x86_64 GNU/Linux gcc/7.2.0, 8.2.0
(mutrino) intel/17.0.4, 18.0.2, 19.0.4
# 1SMP x86_64 GNU/Linux gcc/8.3.0, 9.3.0
(mutrino) intel/19.0.4

Fedora32 5.8.18-200.fc32.x86_64
#1 SMP x86_64 GNU/Linux GNU gcc (GCC) 10.2.1 20201016 (Red Hat 10.2.1-6)
Expand All @@ -713,6 +727,12 @@ The following platforms are not supported but have been tested for this release.
Mac OS Sierra 10.12.6 Apple LLVM version 8.1 (clang-802.0.42)
64-bit gfortran GNU Fortran (GCC) 7.4.0
(kite) Intel icc/icpc/ifort version 17.0.2
l


macOS Big Sur 11.1 Apple clang version 12.0.0 (clang-1200.0.32.28)
64-bit gfortran GNU Fortran )Homebrew GCC 10.2.0) 10.2.0
(BIGSUR-1) Intel icc/icpc/ifort version 2021.1

SunOS 5.11 11.3 Sun C 5.15 SunOS_sparc
32- and 64-bit Sun Fortran 95 8.8 SunOS_sparc
Expand Down
4 changes: 2 additions & 2 deletions src/H5public.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ extern "C" {
#define H5_VERS_MAJOR 1 /* For major interface/format changes */
#define H5_VERS_MINOR 8 /* For minor interface/format changes */
#define H5_VERS_RELEASE 22 /* For tweaks, bug-fixes, or development */
#define H5_VERS_SUBRELEASE "12" /* For pre-releases like snap0 */
#define H5_VERS_SUBRELEASE "13" /* For pre-releases like snap0 */
/* Empty string for real releases. */
#define H5_VERS_INFO "HDF5 library version: 1.8.22-12" /* Full version string */
#define H5_VERS_INFO "HDF5 library version: 1.8.22-13" /* Full version string */

#define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE)

Expand Down