Skip to content

Commit 847b393

Browse files
committed
Use Julienne .expectEquals. support for 64-bit integers
Prefer 64-bit comparison for any use case where a truncating conversion could plausibly mask a defect. Also, use native kind real comparison whenever possible.
1 parent 24f2512 commit 847b393

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

test/prif_co_max_test.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function check_64_bit_integer() result(diag)
128128
call prif_co_max(my_val)
129129

130130
expected = maxval(reshape([(values(:, mod(i-1,size(values,2))+1), i = 1, ni)], [size(values,1),ni]), dim=2)
131-
diag = .all. (int(my_val) .equalsExpected. int(expected))
131+
diag = .all. (my_val .equalsExpected. expected)
132132
end function
133133

134134
function check_32_bit_real() result(diag)

test/prif_co_min_test.F90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ function check_64_bit_integer() result(diag)
126126
call prif_co_min(my_val)
127127

128128
expected = minval(reshape([(values(:, mod(i-1,size(values,2))+1), i = 1, ni)], [size(values,1),ni]), dim=2)
129-
diag = .all. (int(my_val) .equalsExpected. int(expected))
129+
diag = .all. (my_val .equalsExpected. expected)
130130
end function
131131

132132
function check_32_bit_real() result(diag)
133133
type(test_diagnosis_t) :: diag
134134

135135
real(c_float), parameter :: values(*,*,*) = reshape([1, 19, 5, 13, 11, 7, 17, 3], [2,2,2])
136-
real(c_double), parameter :: tolerance = 0_c_double
136+
real(c_float), parameter :: tolerance = 0_c_double
137137
integer :: me, ni, i
138138
real(c_float), dimension(size(values,1), size(values,2)) :: my_val, expected
139139

@@ -144,7 +144,7 @@ function check_32_bit_real() result(diag)
144144
call prif_co_min(my_val)
145145

146146
expected = minval(reshape([(values(:,:,mod(i-1,size(values,3))+1), i = 1, ni)], [size(values,1), size(values,2), ni]), dim=3)
147-
diag = .all. (real(expected,kind=c_double) .approximates. real(my_val,kind=c_double) .within. tolerance)
147+
diag = .all. (expected .approximates. my_val .within. tolerance)
148148
end function
149149

150150
function check_64_bit_real() result(diag)

test/prif_co_reduce_test.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function check_derived_type_reduction() result(diag)
112112
type(pair), dimension(size(values,1)) :: my_val, expected
113113
type(pair), dimension(:,:), allocatable :: tmp
114114
procedure(prif_operation_wrapper_interface), pointer :: op
115-
double precision, parameter :: tolerance = 0D0
115+
real, parameter :: tolerance = 0D0
116116

117117
op => pair_adder
118118
call prif_this_image_no_coarray(this_image=me)
@@ -138,7 +138,7 @@ function check_derived_type_reduction() result(diag)
138138
expected = reduce(tmp, add_pair, dim=2)
139139
#endif
140140
diag = .all. (my_val%fst .equalsExpected. expected%fst) &
141-
.also. (.all. ( real(my_val%snd, kind=kind(0.d0)) .approximates. real(expected%snd, kind=kind(0.d0)) .within. tolerance))
141+
.also. (.all. ( my_val%snd .approximates. expected%snd .within. tolerance))
142142
end function
143143

144144
pure function add_pair(lhs, rhs) result(total)

test/prif_co_sum_test.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ function check_64_bit_integer() result(diag)
129129
call prif_co_sum(my_val)
130130

131131
expected = sum(reshape([(values(:, mod(i-1,size(values,2))+1), i = 1, ni)], [size(values,1),ni]), dim=2)
132-
diag = .all. (int(my_val) .equalsExpected. int(expected))
132+
diag = .all. (my_val .equalsExpected. expected)
133133
end function
134134

135135
function check_32_bit_real() result(diag)

0 commit comments

Comments
 (0)