Skip to content

Commit 2be3340

Browse files
perazzperazz
committed
indent OpenMP sentinels
Revert "indent OpenMP sentinels" This reverts commit 35b721b. indent OpenMP, do not strip EOL
1 parent d379e9c commit 2be3340

8 files changed

+146
-146
lines changed

Diff for: ‎src/stdlib_linalg_constants.fypp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
module stdlib_linalg_constants
33
use stdlib_kinds, only: sp, dp, qp, int32, int64, lk
44
use, intrinsic :: ieee_arithmetic, only: ieee_is_nan
5-
!$ use omp_lib
5+
!$ use omp_lib
66
implicit none(type,external)
77
public
88

Diff for: ‎src/stdlib_linalg_lapack_aux.fypp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1762,7 +1762,7 @@ module stdlib_linalg_lapack_aux
17621762
endif
17631763
! get the number of threads
17641764
nthreads = 1
1765-
!$ nthreads = omp_get_num_threads()
1765+
!$ nthreads = omp_get_num_threads()
17661766

17671767
! write(*,*) 'iparam voici nthreads ispec ',nthreads, ispec
17681768
if( ispec /= 19 ) then

Diff for: ‎src/stdlib_linalg_lapack_c.fypp

+24-24
Original file line numberDiff line numberDiff line change
@@ -36398,13 +36398,13 @@ module stdlib_linalg_lapack_c
3639836398
call stdlib_clacpy( "A", kd+1, n, ab, ldab, work( apos ), lda )
3639936399
call stdlib_claset( "A", kd, n, czero, czero, work( awpos ), lda )
3640036400
! openmp parallelisation start here
36401-
!$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND ) &
36402-
!$OMP& PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) &
36403-
!$OMP& PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND ) &
36404-
!$OMP& SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK) &
36405-
!$OMP& SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA ) &
36406-
!$OMP& SHARED ( STEPERCOL, THGRNB, THGRSIZ, GRSIZ, SHIFT )
36407-
!$OMP MASTER
36401+
!$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND ) &
36402+
!$OMP& PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) &
36403+
!$OMP& PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND ) &
36404+
!$OMP& SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK) &
36405+
!$OMP& SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA ) &
36406+
!$OMP& SHARED ( STEPERCOL, THGRNB, THGRSIZ, GRSIZ, SHIFT )
36407+
!$OMP MASTER
3640836408
! main bulge chasing loop
3640936409
loop_100: do thgrid = 1, thgrnb
3641036410
stt = (thgrid-1)*thgrsiz+1
@@ -36438,24 +36438,24 @@ module stdlib_linalg_lapack_c
3643836438
endif
3643936439
endif
3644036440
! call the kernel
36441-
!$ if( ttype/=1 ) then
36442-
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
36443-
!$OMP& DEPEND(in:WORK(MYID-1)) &
36444-
!$OMP& DEPEND(out:WORK(MYID))
36445-
!$ tid = omp_get_thread_num()
36446-
!$ call stdlib_chb2st_kernels( uplo, wantq, ttype,stind, edind, &
36447-
!$ sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
36448-
!$ indtau ), ldv,work( indw + tid*kd ) )
36449-
!$OMP END TASK
36450-
!$ else
36451-
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
36452-
!$OMP& DEPEND(out:WORK(MYID))
36453-
!$ tid = omp_get_thread_num()
36441+
!$ if( ttype/=1 ) then
36442+
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
36443+
!$OMP& DEPEND(in:WORK(MYID-1)) &
36444+
!$OMP& DEPEND(out:WORK(MYID))
36445+
!$ tid = omp_get_thread_num()
36446+
!$ call stdlib_chb2st_kernels( uplo, wantq, ttype,stind, edind, &
36447+
!$ sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
36448+
!$ indtau ), ldv,work( indw + tid*kd ) )
36449+
!$OMP END TASK
36450+
!$ else
36451+
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
36452+
!$OMP& DEPEND(out:WORK(MYID))
36453+
!$ tid = omp_get_thread_num()
3645436454
call stdlib_chb2st_kernels( uplo, wantq, ttype,stind, edind, &
3645536455
sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
3645636456
indtau ), ldv,work( indw + tid*kd ) )
36457-
!$OMP END TASK
36458-
!$ endif
36457+
!$OMP END TASK
36458+
!$ endif
3645936459
if ( blklastind>=(n-1) ) then
3646036460
stt = stt + 1
3646136461
exit
@@ -36465,8 +36465,8 @@ module stdlib_linalg_lapack_c
3646536465
end do loop_120
3646636466
end do loop_110
3646736467
end do loop_100
36468-
!$OMP END MASTER
36469-
!$OMP END PARALLEL
36468+
!$OMP END MASTER
36469+
!$OMP END PARALLEL
3647036470
! copy the diagonal from a to d. note that d is real thus only
3647136471
! the real part is needed, the imaginary part should be czero.
3647236472
do i = 1, n

Diff for: ‎src/stdlib_linalg_lapack_d.fypp

+24-24
Original file line numberDiff line numberDiff line change
@@ -41444,13 +41444,13 @@ module stdlib_linalg_lapack_d
4144441444
call stdlib_dlacpy( "A", kd+1, n, ab, ldab, work( apos ), lda )
4144541445
call stdlib_dlaset( "A", kd, n, zero, zero, work( awpos ), lda )
4144641446
! openmp parallelisation start here
41447-
!$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND ) &
41448-
!$OMP& PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) &
41449-
!$OMP& PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND ) &
41450-
!$OMP& SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK) &
41451-
!$OMP& SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA ) &
41452-
!$OMP& SHARED ( STEPERCOL, THGRNB, THGRSIZ, GRSIZ, SHIFT )
41453-
!$OMP MASTER
41447+
!$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND ) &
41448+
!$OMP& PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) &
41449+
!$OMP& PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND ) &
41450+
!$OMP& SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK) &
41451+
!$OMP& SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA ) &
41452+
!$OMP& SHARED ( STEPERCOL, THGRNB, THGRSIZ, GRSIZ, SHIFT )
41453+
!$OMP MASTER
4145441454
! main bulge chasing loop
4145541455
loop_100: do thgrid = 1, thgrnb
4145641456
stt = (thgrid-1)*thgrsiz+1
@@ -41484,24 +41484,24 @@ module stdlib_linalg_lapack_d
4148441484
endif
4148541485
endif
4148641486
! call the kernel
41487-
!$ if( ttype/=1 ) then
41488-
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
41489-
!$OMP& DEPEND(in:WORK(MYID-1)) &
41490-
!$OMP& DEPEND(out:WORK(MYID))
41491-
!$ tid = omp_get_thread_num()
41492-
!$ call stdlib_dsb2st_kernels( uplo, wantq, ttype,stind, edind, &
41493-
!$ sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
41494-
!$ indtau ), ldv,work( indw + tid*kd ) )
41495-
!$OMP END TASK
41496-
!$ else
41497-
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
41498-
!$OMP& DEPEND(out:WORK(MYID))
41499-
!$ tid = omp_get_thread_num()
41487+
!$ if( ttype/=1 ) then
41488+
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
41489+
!$OMP& DEPEND(in:WORK(MYID-1)) &
41490+
!$OMP& DEPEND(out:WORK(MYID))
41491+
!$ tid = omp_get_thread_num()
41492+
!$ call stdlib_dsb2st_kernels( uplo, wantq, ttype,stind, edind, &
41493+
!$ sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
41494+
!$ indtau ), ldv,work( indw + tid*kd ) )
41495+
!$OMP END TASK
41496+
!$ else
41497+
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
41498+
!$OMP& DEPEND(out:WORK(MYID))
41499+
!$ tid = omp_get_thread_num()
4150041500
call stdlib_dsb2st_kernels( uplo, wantq, ttype,stind, edind, &
4150141501
sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
4150241502
indtau ), ldv,work( indw + tid*kd ) )
41503-
!$OMP END TASK
41504-
!$ endif
41503+
!$OMP END TASK
41504+
!$ endif
4150541505
if ( blklastind>=(n-1) ) then
4150641506
stt = stt + 1
4150741507
exit
@@ -41511,8 +41511,8 @@ module stdlib_linalg_lapack_d
4151141511
end do loop_120
4151241512
end do loop_110
4151341513
end do loop_100
41514-
!$OMP END MASTER
41515-
!$OMP END PARALLEL
41514+
!$OMP END MASTER
41515+
!$OMP END PARALLEL
4151641516
! copy the diagonal from a to d. note that d is real thus only
4151741517
! the real part is needed, the imaginary part should be zero.
4151841518
do i = 1, n

Diff for: ‎src/stdlib_linalg_lapack_q.fypp

+24-24
Original file line numberDiff line numberDiff line change
@@ -72808,13 +72808,13 @@ module stdlib_linalg_lapack_q
7280872808
call stdlib_qlacpy( "A", kd+1, n, ab, ldab, work( apos ), lda )
7280972809
call stdlib_qlaset( "A", kd, n, zero, zero, work( awpos ), lda )
7281072810
! openmp parallelisation start here
72811-
!$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND ) &
72812-
!$OMP& PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) &
72813-
!$OMP& PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND ) &
72814-
!$OMP& SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK) &
72815-
!$OMP& SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA ) &
72816-
!$OMP& SHARED ( STEPERCOL, THGRNB, THGRSIZ, GRSIZ, SHIFT )
72817-
!$OMP MASTER
72811+
!$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND ) &
72812+
!$OMP& PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) &
72813+
!$OMP& PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND ) &
72814+
!$OMP& SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK) &
72815+
!$OMP& SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA ) &
72816+
!$OMP& SHARED ( STEPERCOL, THGRNB, THGRSIZ, GRSIZ, SHIFT )
72817+
!$OMP MASTER
7281872818
! main bulge chasing loop
7281972819
loop_100: do thgrid = 1, thgrnb
7282072820
stt = (thgrid-1)*thgrsiz+1
@@ -72848,24 +72848,24 @@ module stdlib_linalg_lapack_q
7284872848
endif
7284972849
endif
7285072850
! call the kernel
72851-
!$ if( ttype/=1 ) then
72852-
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
72853-
!$OMP& DEPEND(in:WORK(MYID-1)) &
72854-
!$OMP& DEPEND(out:WORK(MYID))
72855-
!$ tid = omp_get_thread_num()
72856-
!$ call stdlib_qsb2st_kernels( uplo, wantq, ttype,stind, edind, &
72857-
!$ sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
72858-
!$ indtau ), ldv,work( indw + tid*kd ) )
72859-
!$OMP END TASK
72860-
!$ else
72861-
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
72862-
!$OMP& DEPEND(out:WORK(MYID))
72863-
!$ tid = omp_get_thread_num()
72851+
!$ if( ttype/=1 ) then
72852+
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
72853+
!$OMP& DEPEND(in:WORK(MYID-1)) &
72854+
!$OMP& DEPEND(out:WORK(MYID))
72855+
!$ tid = omp_get_thread_num()
72856+
!$ call stdlib_qsb2st_kernels( uplo, wantq, ttype,stind, edind, &
72857+
!$ sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
72858+
!$ indtau ), ldv,work( indw + tid*kd ) )
72859+
!$OMP END TASK
72860+
!$ else
72861+
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
72862+
!$OMP& DEPEND(out:WORK(MYID))
72863+
!$ tid = omp_get_thread_num()
7286472864
call stdlib_qsb2st_kernels( uplo, wantq, ttype,stind, edind, &
7286572865
sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
7286672866
indtau ), ldv,work( indw + tid*kd ) )
72867-
!$OMP END TASK
72868-
!$ endif
72867+
!$OMP END TASK
72868+
!$ endif
7286972869
if ( blklastind>=(n-1) ) then
7287072870
stt = stt + 1
7287172871
exit
@@ -72875,8 +72875,8 @@ module stdlib_linalg_lapack_q
7287572875
end do loop_120
7287672876
end do loop_110
7287772877
end do loop_100
72878-
!$OMP END MASTER
72879-
!$OMP END PARALLEL
72878+
!$OMP END MASTER
72879+
!$OMP END PARALLEL
7288072880
! copy the diagonal from a to d. note that d is real thus only
7288172881
! the real part is needed, the imaginary part should be zero.
7288272882
do i = 1, n

Diff for: ‎src/stdlib_linalg_lapack_s.fypp

+24-24
Original file line numberDiff line numberDiff line change
@@ -41354,13 +41354,13 @@ module stdlib_linalg_lapack_s
4135441354
call stdlib_slacpy( "A", kd+1, n, ab, ldab, work( apos ), lda )
4135541355
call stdlib_slaset( "A", kd, n, zero, zero, work( awpos ), lda )
4135641356
! openmp parallelisation start here
41357-
!$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND ) &
41358-
!$OMP& PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) &
41359-
!$OMP& PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND ) &
41360-
!$OMP& SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK) &
41361-
!$OMP& SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA ) &
41362-
!$OMP& SHARED ( STEPERCOL, THGRNB, THGRSIZ, GRSIZ, SHIFT )
41363-
!$OMP MASTER
41357+
!$OMP PARALLEL PRIVATE( TID, THGRID, BLKLASTIND ) &
41358+
!$OMP& PRIVATE( THED, I, M, K, ST, ED, STT, SWEEPID ) &
41359+
!$OMP& PRIVATE( MYID, TTYPE, COLPT, STIND, EDIND ) &
41360+
!$OMP& SHARED ( UPLO, WANTQ, INDV, INDTAU, HOUS, WORK) &
41361+
!$OMP& SHARED ( N, KD, IB, NBTILES, LDA, LDV, INDA ) &
41362+
!$OMP& SHARED ( STEPERCOL, THGRNB, THGRSIZ, GRSIZ, SHIFT )
41363+
!$OMP MASTER
4136441364
! main bulge chasing loop
4136541365
loop_100: do thgrid = 1, thgrnb
4136641366
stt = (thgrid-1)*thgrsiz+1
@@ -41394,24 +41394,24 @@ module stdlib_linalg_lapack_s
4139441394
endif
4139541395
endif
4139641396
! call the kernel
41397-
!$ if( ttype/=1 ) then
41398-
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
41399-
!$OMP& DEPEND(in:WORK(MYID-1)) &
41400-
!$OMP& DEPEND(out:WORK(MYID))
41401-
!$ tid = omp_get_thread_num()
41402-
!$ call stdlib_ssb2st_kernels( uplo, wantq, ttype,stind, edind, &
41403-
!$ sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
41404-
!$ indtau ), ldv,work( indw + tid*kd ) )
41405-
!$OMP END TASK
41406-
!$ else
41407-
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
41408-
!$OMP& DEPEND(out:WORK(MYID))
41409-
!$ tid = omp_get_thread_num()
41397+
!$ if( ttype/=1 ) then
41398+
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
41399+
!$OMP& DEPEND(in:WORK(MYID-1)) &
41400+
!$OMP& DEPEND(out:WORK(MYID))
41401+
!$ tid = omp_get_thread_num()
41402+
!$ call stdlib_ssb2st_kernels( uplo, wantq, ttype,stind, edind, &
41403+
!$ sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
41404+
!$ indtau ), ldv,work( indw + tid*kd ) )
41405+
!$OMP END TASK
41406+
!$ else
41407+
!$OMP TASK DEPEND(in:WORK(MYID+SHIFT-1)) &
41408+
!$OMP& DEPEND(out:WORK(MYID))
41409+
!$ tid = omp_get_thread_num()
4141041410
call stdlib_ssb2st_kernels( uplo, wantq, ttype,stind, edind, &
4141141411
sweepid, n, kd, ib,work ( inda ), lda,hous( indv ), hous( &
4141241412
indtau ), ldv,work( indw + tid*kd ) )
41413-
!$OMP END TASK
41414-
!$ endif
41413+
!$OMP END TASK
41414+
!$ endif
4141541415
if ( blklastind>=(n-1) ) then
4141641416
stt = stt + 1
4141741417
exit
@@ -41421,8 +41421,8 @@ module stdlib_linalg_lapack_s
4142141421
end do loop_120
4142241422
end do loop_110
4142341423
end do loop_100
41424-
!$OMP END MASTER
41425-
!$OMP END PARALLEL
41424+
!$OMP END MASTER
41425+
!$OMP END PARALLEL
4142641426
! copy the diagonal from a to d. note that d is real thus only
4142741427
! the real part is needed, the imaginary part should be zero.
4142841428
do i = 1, n

0 commit comments

Comments
 (0)