Skip to content

Commit 81823e9

Browse files
committed
Fix -Werror=conversion problems in LAPACK with integer-8
1 parent ac2c568 commit 81823e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+321
-286
lines changed

SRC/cbbcsd.f

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P,
420420
*
421421
IF( INFO .EQ. 0 .AND. Q .EQ. 0 ) THEN
422422
LRWORKMIN = 1
423-
RWORK(1) = LRWORKMIN
423+
RWORK(1) = REAL( LRWORKMIN )
424424
RETURN
425425
END IF
426426
*
@@ -437,7 +437,7 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P,
437437
IV2TSN = IV2TCS + Q
438438
LRWORKOPT = IV2TSN + Q - 1
439439
LRWORKMIN = LRWORKOPT
440-
RWORK(1) = LRWORKOPT
440+
RWORK(1) = REAL( LRWORKOPT )
441441
IF( LRWORK .LT. LRWORKMIN .AND. .NOT. LQUERY ) THEN
442442
INFO = -28
443443
END IF
@@ -456,7 +456,7 @@ SUBROUTINE CBBCSD( JOBU1, JOBU2, JOBV1T, JOBV2T, TRANS, M, P,
456456
UNFL = SLAMCH( 'Safe minimum' )
457457
TOLMUL = MAX( TEN, MIN( HUNDRED, EPS**MEIGHTH ) )
458458
TOL = TOLMUL*EPS
459-
THRESH = MAX( TOL, MAXITR*Q*Q*UNFL )
459+
THRESH = MAX( TOL, REAL( MAXITR*Q*Q )*UNFL )
460460
*
461461
* Test for negligible sines or cosines
462462
*

SRC/cbdsqr.f

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,12 +404,14 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
404404
40 CONTINUE
405405
50 CONTINUE
406406
SMINOA = SMINOA / SQRT( REAL( N ) )
407-
THRESH = MAX( TOL*SMINOA, MAXITR*(N*(N*UNFL)) )
407+
THRESH = MAX( TOL*SMINOA,
408+
$ REAL(MAXITR)*(REAL(N)*(REAL(N)*UNFL)) )
408409
ELSE
409410
*
410411
* Absolute accuracy desired
411412
*
412-
THRESH = MAX( ABS( TOL )*SMAX, MAXITR*(N*(N*UNFL)) )
413+
THRESH = MAX( ABS( TOL )*SMAX,
414+
$ REAL(MAXITR)*(REAL(N)*(REAL(N)*UNFL)) )
413415
END IF
414416
*
415417
* Prepare for main iteration loop for the singular values
@@ -581,7 +583,7 @@ SUBROUTINE CBDSQR( UPLO, N, NCVT, NRU, NCC, D, E, VT, LDVT, U,
581583
* Compute shift. First, test if shifting would ruin relative
582584
* accuracy, and if so set the shift to zero.
583585
*
584-
IF( TOL.GE.ZERO .AND. N*TOL*( SMIN / SMAX ).LE.
586+
IF( TOL.GE.ZERO .AND. REAL( N )*TOL*( SMIN / SMAX ).LE.
585587
$ MAX( EPS, HNDRTH*TOL ) ) THEN
586588
*
587589
* Use a zero shift to avoid loss of relative accuracy

SRC/cgbrfs.f

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ SUBROUTINE CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
317317
NZ = MIN( KL+KU+2, N+1 )
318318
EPS = SLAMCH( 'Epsilon' )
319319
SAFMIN = SLAMCH( 'Safe minimum' )
320-
SAFE1 = NZ*SAFMIN
320+
SAFE1 = REAL( NZ )*SAFMIN
321321
SAFE2 = SAFE1 / EPS
322322
*
323323
* Do for each right hand side
@@ -426,10 +426,11 @@ SUBROUTINE CGBRFS( TRANS, N, KL, KU, NRHS, AB, LDAB, AFB,
426426
*
427427
DO 90 I = 1, N
428428
IF( RWORK( I ).GT.SAFE2 ) THEN
429-
RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
429+
RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
430+
$ EPS*RWORK( I )
430431
ELSE
431-
RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
432-
$ SAFE1
432+
RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
433+
$ EPS*RWORK( I ) + SAFE1
433434
END IF
434435
90 CONTINUE
435436
*

SRC/cgebal.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ SUBROUTINE CGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
267267
END DO
268268
*
269269
IF( CANSWAP ) THEN
270-
SCALE( L ) = I
270+
SCALE( L ) = REAL( I )
271271
IF( I.NE.L ) THEN
272272
CALL CSWAP( L, A( 1, I ), 1, A( 1, L ), 1 )
273273
CALL CSWAP( N-K+1, A( I, K ), LDA, A( L, K ),
@@ -304,7 +304,7 @@ SUBROUTINE CGEBAL( JOB, N, A, LDA, ILO, IHI, SCALE, INFO )
304304
END DO
305305
*
306306
IF( CANSWAP ) THEN
307-
SCALE( K ) = J
307+
SCALE( K ) = REAL( J )
308308
IF( J.NE.K ) THEN
309309
CALL CSWAP( L, A( 1, J ), 1, A( 1, K ), 1 )
310310
CALL CSWAP( N-K+1, A( J, K ), LDA, A( K, K ),

SRC/cgejsv.f

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,9 +952,9 @@ SUBROUTINE CGEJSV( JOBA, JOBU, JOBV, JOBR, JOBT, JOBP,
952952
CALL XERBLA( 'CGEJSV', - INFO )
953953
RETURN
954954
ELSE IF ( LQUERY ) THEN
955-
CWORK(1) = OPTWRK
956-
CWORK(2) = MINWRK
957-
RWORK(1) = MINRWRK
955+
CWORK(1) = CMPLX( OPTWRK )
956+
CWORK(2) = CMPLX( MINWRK )
957+
RWORK(1) = REAL( MINRWRK )
958958
IWORK(1) = MAX( 4, MINIWRK )
959959
RETURN
960960
END IF

SRC/cgelq.f

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,12 @@ SUBROUTINE CGELQ( M, N, A, LDA, T, TSIZE, WORK, LWORK,
289289
*
290290
IF( INFO.EQ.0 ) THEN
291291
IF( MINT ) THEN
292-
T( 1 ) = MINTSZ
292+
T( 1 ) = CMPLX( MINTSZ )
293293
ELSE
294-
T( 1 ) = MB*M*NBLCKS + 5
294+
T( 1 ) = CMPLX( MB*M*NBLCKS + 5 )
295295
END IF
296-
T( 2 ) = MB
297-
T( 3 ) = NB
296+
T( 2 ) = CMPLX( MB )
297+
T( 3 ) = CMPLX( NB )
298298
IF( MINW ) THEN
299299
WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
300300
ELSE

SRC/cgelsd.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
375375
MINWRK = MIN( MINWRK, MAXWRK )
376376
WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
377377
IWORK( 1 ) = LIWORK
378-
RWORK( 1 ) = LRWORK
378+
RWORK( 1 ) = REAL( LRWORK )
379379
*
380380
IF( LWORK.LT.MINWRK .AND. .NOT.LQUERY ) THEN
381381
INFO = -12
@@ -667,7 +667,7 @@ SUBROUTINE CGELSD( M, N, NRHS, A, LDA, B, LDB, S, RCOND, RANK,
667667
10 CONTINUE
668668
WORK( 1 ) = SROUNDUP_LWORK(MAXWRK)
669669
IWORK( 1 ) = LIWORK
670-
RWORK( 1 ) = LRWORK
670+
RWORK( 1 ) = REAL( LRWORK )
671671
RETURN
672672
*
673673
* End of CGELSD

SRC/cgelsy.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
357357
*
358358
CALL CGEQP3( M, N, A, LDA, JPVT, WORK( 1 ), WORK( MN+1 ),
359359
$ LWORK-MN, RWORK, INFO )
360-
WSIZE = MN + REAL( WORK( MN+1 ) )
360+
WSIZE = REAL( MN ) + REAL( WORK( MN+1 ) )
361361
*
362362
* complex workspace: MN+NB*(N+1). real workspace 2*N.
363363
* Details of Householder rotations stored in WORK(1:MN).
@@ -418,7 +418,7 @@ SUBROUTINE CGELSY( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
418418
CALL CUNMQR( 'Left', 'Conjugate transpose', M, NRHS, MN, A,
419419
$ LDA,
420420
$ WORK( 1 ), B, LDB, WORK( 2*MN+1 ), LWORK-2*MN, INFO )
421-
WSIZE = MAX( WSIZE, 2*MN+REAL( WORK( 2*MN+1 ) ) )
421+
WSIZE = MAX( WSIZE, REAL( 2*MN )+REAL( WORK( 2*MN+1 ) ) )
422422
*
423423
* complex workspace: 2*MN+NB*NRHS.
424424
*

SRC/cgeqr.f

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,12 @@ SUBROUTINE CGEQR( M, N, A, LDA, T, TSIZE, WORK, LWORK,
281281
*
282282
IF( INFO.EQ.0 ) THEN
283283
IF( MINT ) THEN
284-
T( 1 ) = MINTSZ
284+
T( 1 ) = CMPLX( MINTSZ )
285285
ELSE
286-
T( 1 ) = NB*N*NBLCKS + 5
286+
T( 1 ) = CMPLX( NB*N*NBLCKS + 5 )
287287
END IF
288-
T( 2 ) = MB
289-
T( 3 ) = NB
288+
T( 2 ) = CMPLX( MB )
289+
T( 3 ) = CMPLX( NB )
290290
IF( MINW ) THEN
291291
WORK( 1 ) = SROUNDUP_LWORK( LWMIN )
292292
ELSE

SRC/cgerfs.f

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ SUBROUTINE CGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
293293
NZ = N + 1
294294
EPS = SLAMCH( 'Epsilon' )
295295
SAFMIN = SLAMCH( 'Safe minimum' )
296-
SAFE1 = NZ*SAFMIN
296+
SAFE1 = REAL( NZ )*SAFMIN
297297
SAFE2 = SAFE1 / EPS
298298
*
299299
* Do for each right hand side
@@ -398,10 +398,11 @@ SUBROUTINE CGERFS( TRANS, N, NRHS, A, LDA, AF, LDAF, IPIV, B,
398398
*
399399
DO 90 I = 1, N
400400
IF( RWORK( I ).GT.SAFE2 ) THEN
401-
RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I )
401+
RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
402+
$ EPS*RWORK( I )
402403
ELSE
403-
RWORK( I ) = CABS1( WORK( I ) ) + NZ*EPS*RWORK( I ) +
404-
$ SAFE1
404+
RWORK( I ) = CABS1( WORK( I ) ) + REAL( NZ )*
405+
$ EPS*RWORK( I ) + SAFE1
405406
END IF
406407
90 CONTINUE
407408
*

0 commit comments

Comments
 (0)