Skip to content

Commit 2797b65

Browse files
committed
Revert "Debug ubuntu-22.04/cmake/intel-classic"
This reverts commit c2fbf36.
1 parent 189b81e commit 2797b65

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

test/linalg/test_linalg_pivoting_qr.fypp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ module test_linalg_pivoting_qr
2323

2424
#:for rk,rt,ri in RC_KINDS_TYPES
2525
call add_test(tests,new_unittest("pivoting_qr_random_tall_matrix_${ri}$",test_pivoting_qr_random_tall_matrix_${ri}$))
26-
! call add_test(tests,new_unittest("pivoting_qr_random_rank_deficient_${ri}$",test_pivoting_qr_random_rank_deficient_${ri}$))
27-
! call add_test(tests,new_unittest("pivoting_qr_random_wide_matrix_${ri}$",test_pivoting_qr_random_wide_matrix_${ri}$))
26+
call add_test(tests,new_unittest("pivoting_qr_random_rank_deficient_${ri}$",test_pivoting_qr_random_rank_deficient_${ri}$))
27+
call add_test(tests,new_unittest("pivoting_qr_random_wide_matrix_${ri}$",test_pivoting_qr_random_wide_matrix_${ri}$))
2828
#:endfor
2929
end subroutine test_pivoting_qr_factorization
3030

@@ -62,31 +62,31 @@ module test_linalg_pivoting_qr
6262
if (allocated(error)) return
6363

6464
! Check solution
65-
call check(error, mnorm(a(:, pivots)-matmul(q,r), order=2) < tol, 'converged solution (full)')
65+
call check(error, all(abs(a(:, pivots)-matmul(q,r))<tol), 'converged solution (full)')
6666
if (allocated(error)) return
67-
67+
6868
! 2) QR factorization with reduced matrices
6969
call qr(a, qred, rred, pivots, err=state)
7070

7171
! Check return code
7272
call check(error,state%ok(),state%print())
7373
if (allocated(error)) return
74-
!
75-
! ! Check solution
76-
! call check(error, all(abs(a(:, pivots)-matmul(qred,rred))<tol), 'converged solution (reduced)')
77-
! if (allocated(error)) return
78-
!
74+
75+
! Check solution
76+
call check(error, all(abs(a(:, pivots)-matmul(qred,rred))<tol), 'converged solution (reduced)')
77+
if (allocated(error)) return
78+
7979
! 3) overwrite A
8080
call qr(a, qred, rred, pivots, overwrite_a=.true., err=state)
8181

8282
! Check return code
8383
call check(error,state%ok(),state%print())
8484
if (allocated(error)) return
85-
!
86-
! ! Check solution
87-
! call check(error, all(abs(aorig(:, pivots)-matmul(qred,rred))<tol), 'converged solution (overwrite A)')
88-
! if (allocated(error)) return
89-
!
85+
86+
! Check solution
87+
call check(error, all(abs(aorig(:, pivots)-matmul(qred,rred))<tol), 'converged solution (overwrite A)')
88+
if (allocated(error)) return
89+
9090
! 4) External storage option
9191
a = aorig
9292
call qr_space(a, lwork, pivoting=.true.)
@@ -96,11 +96,11 @@ module test_linalg_pivoting_qr
9696
! Check return code
9797
call check(error,state%ok(),state%print())
9898
if (allocated(error)) return
99-
!
100-
! ! Check solution
101-
! call check(error, all(abs(a(:, pivots)-matmul(q,r))<tol), 'converged solution (external storage)')
102-
! if (allocated(error)) return
103-
!
99+
100+
! Check solution
101+
call check(error, all(abs(a(:, pivots)-matmul(q,r))<tol), 'converged solution (external storage)')
102+
if (allocated(error)) return
103+
104104
! Check that an invalid problem size returns an error
105105
a = aorig
106106
call qr(a, qerr, rerr, pivots, err=state)
@@ -140,9 +140,9 @@ module test_linalg_pivoting_qr
140140
call check(error,state%ok(),state%print())
141141
if (allocated(error)) return
142142

143-
! ! Check solution
144-
! call check(error, all(abs(a(:, pivots)-matmul(q,r))<tol), 'converged solution (full)')
145-
! if (allocated(error)) return
143+
! Check solution
144+
call check(error, all(abs(a(:, pivots)-matmul(q,r))<tol), 'converged solution (full)')
145+
if (allocated(error)) return
146146

147147
! 2) QR factorization with reduced matrices
148148
call qr(a, qred, rred, pivots, err=state)
@@ -151,9 +151,9 @@ module test_linalg_pivoting_qr
151151
call check(error,state%ok(),state%print())
152152
if (allocated(error)) return
153153

154-
! ! Check solution
155-
! call check(error, all(abs(a(:, pivots)-matmul(qred,rred))<tol), 'converged solution (reduced)')
156-
! if (allocated(error)) return
154+
! Check solution
155+
call check(error, all(abs(a(:, pivots)-matmul(qred,rred))<tol), 'converged solution (reduced)')
156+
if (allocated(error)) return
157157

158158
! 3) overwrite A
159159
call qr(a, qred, rred, pivots, overwrite_a=.true., err=state)
@@ -162,9 +162,9 @@ module test_linalg_pivoting_qr
162162
call check(error,state%ok(),state%print())
163163
if (allocated(error)) return
164164

165-
! ! Check solution
166-
! call check(error, all(abs(aorig(:, pivots)-matmul(qred,rred))<tol), 'converged solution (overwrite A)')
167-
! if (allocated(error)) return
165+
! Check solution
166+
call check(error, all(abs(aorig(:, pivots)-matmul(qred,rred))<tol), 'converged solution (overwrite A)')
167+
if (allocated(error)) return
168168

169169
! 4) External storage option
170170
a = aorig
@@ -176,9 +176,9 @@ module test_linalg_pivoting_qr
176176
call check(error,state%ok(),state%print())
177177
if (allocated(error)) return
178178

179-
! ! Check solution
180-
! call check(error, all(abs(a(:, pivots)-matmul(q,r))<tol), 'converged solution (external storage)')
181-
! if (allocated(error)) return
179+
! Check solution
180+
call check(error, all(abs(a(:, pivots)-matmul(q,r))<tol), 'converged solution (external storage)')
181+
if (allocated(error)) return
182182

183183
! Check that an invalid problem size returns an error
184184
a = aorig

0 commit comments

Comments
 (0)