mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r29928] HDFFV-9912:

Browse Source 
configure fails to detect valid KINDs on FreeBSD

Added the exponential option to SELECTED_REAL_KIND to distinguish KINDs of same precision.

Tested: FredBSD, jam, platypus.
This commit is contained in:
Scot Breitenfeld 2016-05-12 16:57:08 -05:00
parent 18ad868b23
commit 5871eed008
2 changed files with 110 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
config/cmake/HDF5UseFortran.cmake
View File

@ -140,55 +140,64 @@ endif(FORTRAN_HAVE_STORAGE_SIZE)
#-----------------------------------------------------------------------------
FORTRAN_RUN("REAL and INTEGER KINDs"
"
PROGRAM main
"
PROGRAM main
IMPLICIT NONE
INTEGER :: ik, k, lastkind, max_decimal_prec
INTEGER :: num_rkinds, num_ikinds
num_ikinds = 0
lastkind=SELECTED_INT_KIND(1)
INTEGER :: ik, jk, k, max_decimal_prec
INTEGER :: num_rkinds = 1, num_ikinds = 1
INTEGER, DIMENSION(1:10) :: list_ikinds = -1
INTEGER, DIMENSION(1:10) :: list_rkinds = -1
! Find integer KINDs
DO ik=2,36
k = SELECTED_INT_KIND(ik)
IF (k .NE. lastkind) THEN
num_ikinds = num_ikinds + 1
WRITE(*,'(I0)',ADVANCE='NO') lastkind
lastkind = k
IF(k.GT.0) WRITE(*,'(A)',ADVANCE='NO') ','
ENDIF
IF (k .LE. 0) EXIT
list_ikinds(num_ikinds)=SELECTED_INT_KIND(1)
DO ik = 2, 36
k = SELECTED_INT_KIND(ik)
IF(k.LT.0) EXIT
IF(k.GT.list_ikinds(num_ikinds))THEN
num_ikinds = num_ikinds + 1
list_ikinds(num_ikinds) = k
ENDIF
ENDDO
IF (lastkind.NE.-1) THEN
num_ikinds = num_ikinds + 1
WRITE(*,'(I0)') lastkind
ELSE
WRITE(*,'()')
ENDIF
DO k = 1, num_ikinds
WRITE(*,'(I0)', ADVANCE='NO') list_ikinds(k)
IF(k.NE.num_ikinds)THEN
WRITE(*,'(A)',ADVANCE='NO') ','
ELSE
WRITE(*,'()')
ENDIF
ENDDO
! Find real KINDs
num_rkinds = 0
lastkind=SELECTED_REAL_KIND(1)
max_decimal_prec = 1
DO ik=2,36
k = SELECTED_REAL_KIND(ik)
IF (k .NE. lastkind) THEN
num_rkinds = num_rkinds + 1
WRITE(*,'(I0)',ADVANCE='NO') lastkind
lastkind = k
IF(k.GT.0) WRITE(*,'(A)',ADVANCE='NO') ','
max_decimal_prec = ik
ENDIF
IF (k .LE. 0) EXIT
list_rkinds(num_rkinds)=SELECTED_REAL_KIND(1)
max_decimal_prec = 1
prec: DO ik = 2, 36
exp: DO jk = 1, 17000
k = SELECTED_REAL_KIND(ik,jk)
IF(k.LT.0) EXIT exp
IF(k.GT.list_rkinds(num_rkinds))THEN
num_rkinds = num_rkinds + 1
list_rkinds(num_rkinds) = k
ENDIF
max_decimal_prec = ik
ENDDO exp
ENDDO prec
DO k = 1, num_rkinds
WRITE(*,'(I0)', ADVANCE='NO') list_rkinds(k)
IF(k.NE.num_rkinds)THEN
WRITE(*,'(A)',ADVANCE='NO') ','
ELSE
WRITE(*,'()')
ENDIF
ENDDO
IF (lastkind.NE.-1)THEN
num_rkinds = num_rkinds + 1
WRITE(*,'(I0)') lastkind
ELSE
WRITE(*,'()')
ENDIF
WRITE(*,'(I0)') max_decimal_prec
WRITE(*,'(I0)') num_ikinds
WRITE(*,'(I0)') num_rkinds
END
WRITE(*,'(I0)') max_decimal_prec
WRITE(*,'(I0)') num_ikinds
WRITE(*,'(I0)') num_rkinds
END PROGRAM main
"
XX
YY

105
m4/aclocal_fc.m4
View File

@ -325,54 +325,63 @@ rm -f pac_fconftest.out
AC_RUN_IFELSE([
AC_LANG_SOURCE([
PROGRAM main
IMPLICIT NONE
INTEGER :: ik, k, lastkind, max_decimal_prec
INTEGER :: num_rkinds, num_ikinds
num_ikinds = 0
lastkind=SELECTED_INT_KIND(1)
OPEN(8, FILE='pac_fconftest.out', form='formatted')
! Find integer KINDs
DO ik=2,36
k = SELECTED_INT_KIND(ik)
IF (k .NE. lastkind) THEN
num_ikinds = num_ikinds + 1
WRITE(8,'(I0)',ADVANCE='NO') lastkind
lastkind = k
IF(k.GT.0) WRITE(8,'(A)',ADVANCE='NO') ','
ENDIF
IF (k .LE. 0) EXIT
ENDDO
IF (lastkind.NE.-1) THEN
num_ikinds = num_ikinds + 1
WRITE(8,'(I0)') lastkind
ELSE
WRITE(8,'()')
ENDIF
! Find real KINDs
num_rkinds = 0
lastkind=SELECTED_REAL_KIND(1)
max_decimal_prec = 1
DO ik=2,36
k = SELECTED_REAL_KIND(ik)
IF (k .NE. lastkind) THEN
num_rkinds = num_rkinds + 1
WRITE(8,'(I0)',ADVANCE='NO') lastkind
lastkind = k
IF(k.GT.0) WRITE(8,'(A)',ADVANCE='NO') ','
max_decimal_prec = ik
ENDIF
IF (k .LE. 0) EXIT
ENDDO
IF (lastkind.NE.-1)THEN
num_rkinds = num_rkinds + 1
WRITE(8,'(I0)') lastkind
ELSE
WRITE(8,'()')
ENDIF
WRITE(8,'(I0)') max_decimal_prec
WRITE(8,'(I0)') num_ikinds
WRITE(8,'(I0)') num_rkinds
END
IMPLICIT NONE
INTEGER :: ik, jk, k, max_decimal_prec
INTEGER :: num_rkinds = 1, num_ikinds = 1
INTEGER, DIMENSION(1:10) :: list_ikinds = -1
INTEGER, DIMENSION(1:10) :: list_rkinds = -1
OPEN(8, FILE='pac_fconftest.out', FORM='formatted')
! Find integer KINDs
list_ikinds(num_ikinds)=SELECTED_INT_KIND(1)
DO ik = 2, 36
k = SELECTED_INT_KIND(ik)
IF(k.LT.0) EXIT
IF(k.GT.list_ikinds(num_ikinds))THEN
num_ikinds = num_ikinds + 1
list_ikinds(num_ikinds) = k
ENDIF
ENDDO
DO k = 1, num_ikinds
WRITE(8,'(I0)', ADVANCE='NO') list_ikinds(k)
IF(k.NE.num_ikinds)THEN
WRITE(8,'(A)',ADVANCE='NO') ','
ELSE
WRITE(8,'()')
ENDIF
ENDDO
! Find real KINDs
list_rkinds(num_rkinds)=SELECTED_REAL_KIND(1)
max_decimal_prec = 1
prec: DO ik = 2, 36
exp: DO jk = 1, 17000
k = SELECTED_REAL_KIND(ik,jk)
IF(k.LT.0) EXIT exp
IF(k.GT.list_rkinds(num_rkinds))THEN
num_rkinds = num_rkinds + 1
list_rkinds(num_rkinds) = k
ENDIF
max_decimal_prec = ik
ENDDO exp
ENDDO prec
DO k = 1, num_rkinds
WRITE(8,'(I0)', ADVANCE='NO') list_rkinds(k)
IF(k.NE.num_rkinds)THEN
WRITE(8,'(A)',ADVANCE='NO') ','
ELSE
WRITE(8,'()')
ENDIF
ENDDO
WRITE(8,'(I0)') max_decimal_prec
WRITE(8,'(I0)') num_ikinds
WRITE(8,'(I0)') num_rkinds
END PROGRAM main
])
],[
if test -s pac_fconftest.out ; then