From 940edf43440147b22d2c39d9fd637d7aaf7296ce Mon Sep 17 00:00:00 2001 From: "M. Scot Breitenfeld" Date: Tue, 10 Oct 2023 14:38:28 -0500 Subject: [PATCH 1/4] added cmake ieee flag for nagfor --- config/cmake/HDFFortranCompilerFlags.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake index e08df05c52d..8ac3b7826f2 100644 --- a/config/cmake/HDFFortranCompilerFlags.cmake +++ b/config/cmake/HDFFortranCompilerFlags.cmake @@ -51,6 +51,10 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERS set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdiagnostics-urls=never -fno-diagnostics-color") endif () endif () +if (CMAKE_Fortran_COMPILER_ID STREQUAL "NAG") + message (STATUS "... Select IEEE floating-point mode full") + list (APPEND HDF5_CMAKE_Fortran_FLAGS "-ieee=full") +endif () if (CMAKE_Fortran_COMPILER_ID STREQUAL "NAG") message (STATUS "... Select IEEE floating-point mode full") From 83aa1cdcf636490670f3c7bd04a4cafa4887d8c3 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 11 Oct 2023 23:25:56 -0500 Subject: [PATCH 2/4] fixes gfortran -O2 and -O3, -fdefault-real-16 --- fortran/test/tH5P_F03.F90 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fortran/test/tH5P_F03.F90 b/fortran/test/tH5P_F03.F90 index 4f390d5fb76..24934eb3e05 100644 --- a/fortran/test/tH5P_F03.F90 +++ b/fortran/test/tH5P_F03.F90 @@ -146,7 +146,6 @@ SUBROUTINE test_create(total_error) ! Compound datatype test f_ptr = C_LOC(fill_ctype) - CALL H5Pget_fill_value_f(dcpl, comp_type_id, f_ptr, error) CALL check("H5Pget_fill_value_f",error, total_error) @@ -184,6 +183,7 @@ SUBROUTINE test_create(total_error) CALL VERIFY("***ERROR: Returned wrong fill value (real)", rfill, 2.0, total_error) ! For the actual compound type + f_ptr = C_LOC(fill_ctype) CALL H5Pset_fill_value_f(dcpl, comp_type_id, f_ptr, error) CALL check("H5Pget_fill_value_f",error, total_error) @@ -254,7 +254,6 @@ SUBROUTINE test_create(total_error) CALL check("H5Dget_create_plist_f", error, total_error) f_ptr = C_LOC(rd_c) - CALL H5Pget_fill_value_f(dcpl, comp_type_id, f_ptr, error) CALL check("H5Pget_fill_value_f", error, total_error) CALL verify("***ERROR: Returned wrong fill value", rd_c%a, fill_ctype%a, total_error) From 2419d85469bb77cbcd00469480e73465251dcc18 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 11 Oct 2023 23:36:18 -0500 Subject: [PATCH 3/4] fixed sync --- config/cmake/HDFFortranCompilerFlags.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake index 8ac3b7826f2..e08df05c52d 100644 --- a/config/cmake/HDFFortranCompilerFlags.cmake +++ b/config/cmake/HDFFortranCompilerFlags.cmake @@ -51,10 +51,6 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERS set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdiagnostics-urls=never -fno-diagnostics-color") endif () endif () -if (CMAKE_Fortran_COMPILER_ID STREQUAL "NAG") - message (STATUS "... Select IEEE floating-point mode full") - list (APPEND HDF5_CMAKE_Fortran_FLAGS "-ieee=full") -endif () if (CMAKE_Fortran_COMPILER_ID STREQUAL "NAG") message (STATUS "... Select IEEE floating-point mode full") From a78323e8a4edaa0b2654ffb42ea9d8cb87b74c54 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 11 Oct 2023 23:51:13 -0500 Subject: [PATCH 4/4] updated release notes --- release_docs/RELEASE.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index bcc91df70d2..bfaab5e030a 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -880,7 +880,12 @@ Bug Fixes since HDF5-1.14.0 release configuration information in the HDF5_VOL_CONNECTOR environment variable and would incorrectly report that the specified VOL connector isn't registered due to including the configuration information as part of the VOL connector - name being checked for registration status. This has now been fixed. + name being checked for registration status. This has now been fixed. + + - Fixed Fortran 2003 test with gfortran-v13, optimization levels O2,O3 + + Fixes failing Fortran 2003 test with gfortran, optimization level O2,O3 + with -fdefault-real-16. Fixes GH #2928. Platforms Tested